Skip to content

Commit

Permalink
Merge branch 'master' into build/unconstraint-all-dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
matthewfeickert authored Nov 16, 2021
2 parents 9c2a966 + d5b73c0 commit c36087f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
2 changes: 2 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ ignore = [
'AUTHORS',
]

[tool.pytest]
xfail_strict = true

[tool.pytest.ini_options]
minversion = "6.0"
Expand Down
12 changes: 6 additions & 6 deletions tests/test_tensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,8 @@ def test_shape(backend):
)


@pytest.mark.skip_pytorch
@pytest.mark.skip_pytorch64
@pytest.mark.fail_pytorch
@pytest.mark.fail_pytorch64
def test_pdf_calculations(backend):
tb = pyhf.tensorlib
assert tb.tolist(tb.normal_cdf(tb.astensor([0.8]))) == pytest.approx(
Expand Down Expand Up @@ -376,7 +376,7 @@ def test_boolean_mask(backend):
)


@pytest.mark.skip_jax
@pytest.mark.fail_jax
def test_percentile(backend):
tb = pyhf.tensorlib
a = tb.astensor([[10, 7, 4], [3, 2, 1]])
Expand All @@ -390,9 +390,9 @@ def test_percentile(backend):
# FIXME: PyTorch doesn't yet support interpolation schemes other than "linear"
# c.f. https://github.com/pytorch/pytorch/pull/59397
# c.f. https://github.com/scikit-hep/pyhf/issues/1693
@pytest.mark.skip_pytorch
@pytest.mark.skip_pytorch64
@pytest.mark.skip_jax
@pytest.mark.fail_pytorch
@pytest.mark.fail_pytorch64
@pytest.mark.fail_jax
def test_percentile_interpolation(backend):
tb = pyhf.tensorlib
a = tb.astensor([[10, 7, 4], [3, 2, 1]])
Expand Down

0 comments on commit c36087f

Please sign in to comment.