Skip to content

Commit

Permalink
tweaks to build
Browse files Browse the repository at this point in the history
  • Loading branch information
gfardell authored Nov 16, 2021
1 parent 1fa2789 commit 843b899
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions Wrappers/Python/test/test_PluginsTigre.py
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ def compare_forward(self, direct_method, atol):
fp2 = fp.copy()
fp2.fill(0)
Op.direct(self.img_data,out=fp2)
np.testing.assert_array_equal(fp.as_array(), fp2.as_array())
np.testing.assert_allclose(fp.as_array(), fp2.as_array(),1e-8)

@unittest.skipUnless(has_tigre, "TIGRE not installed")
def test_backward(self):
Expand All @@ -327,7 +327,7 @@ def test_backward(self):
bp2 = bp.copy()
bp2.fill(0)
Op.adjoint(self.acq_data,out=bp2)
np.testing.assert_array_equal(bp.as_array(), bp2.as_array())
np.testing.assert_allclose(bp.as_array(), bp2.as_array(), 1e-8)


def compare_backward_FDK_matched(self):
Expand Down Expand Up @@ -389,7 +389,7 @@ def compare_FBP(self,atol):
reco2 = reco.copy()
reco2.fill(0)
fbp(self.acq_data,out=reco2)
np.testing.assert_array_equal(reco.as_array(), reco2.as_array())
np.testing.assert_allclose(reco.as_array(), reco2.as_array(),atol=1e-8)

def compare_norm(self,direct_method,norm):

Expand Down
10 changes: 5 additions & 5 deletions Wrappers/Python/test/test_reconstructors.py
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ def test_results_3D(self):
reco2 = reco.copy()
reco2.fill(0)
reconstructor.run(out=reco2, verbose=0)
np.testing.assert_array_equal(reco.as_array(), reco2.as_array())
np.testing.assert_allclose(reco.as_array(), reco2.as_array(), atol=1e-8)


@unittest.skipUnless(has_tigre and has_ipp, "TIGRE or IPP not installed")
Expand All @@ -508,7 +508,7 @@ def test_results_2D(self):
reco2 = reco.copy()
reco2.fill(0)
reconstructor.run(out=reco2, verbose=0)
np.testing.assert_array_equal(reco.as_array(), reco2.as_array())
np.testing.assert_allclose(reco.as_array(), reco2.as_array(), atol=1e-8)


@unittest.skipUnless(has_tigre and has_ipp, "TIGRE or IPP not installed")
Expand Down Expand Up @@ -571,7 +571,7 @@ def test_results_3D(self):
reco2 = reco.copy()
reco2.fill(0)
reconstructor.run(out=reco2, verbose=0)
np.testing.assert_array_equal(reco.as_array(), reco2.as_array())
np.testing.assert_allclose(reco.as_array(), reco2.as_array(), atol=1e-8)


@unittest.skipUnless(has_tigre and has_ipp, "TIGRE or IPP not installed")
Expand All @@ -586,7 +586,7 @@ def test_results_3D_split(self):
reco2 = reco.copy()
reco2.fill(0)
reconstructor.run(out=reco2, verbose=0)
np.testing.assert_array_equal(reco.as_array(), reco2.as_array())
np.testing.assert_allclose(reco.as_array(), reco2.as_array(), atol=1e-8)


@unittest.skipUnless(has_tigre and has_ipp, "TIGRE or IPP not installed")
Expand All @@ -602,7 +602,7 @@ def test_results_2D(self):
reco2 = reco.copy()
reco2.fill(0)
reconstructor.run(out=reco2, verbose=0)
np.testing.assert_array_equal(reco.as_array(), reco2.as_array())
np.testing.assert_allclose(reco.as_array(), reco2.as_array(), atol=1e-8)


@unittest.skipUnless(has_tigre and has_ipp, "TIGRE or IPP not installed")
Expand Down
2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ requirements:
run:
- python
- {{ pin_compatible('numpy', min_pin='x.x', max_pin='x.x') }}
- scipy
- scipy >=1.4.0
- matplotlib >=3.3.0
- h5py
- pillow
Expand Down

0 comments on commit 843b899

Please sign in to comment.