Skip to content

Commit d6ad4c4

Browse files
committed
removes cupy regularisers from pyproject
1 parent 5e29c82 commit d6ad4c4

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

httomolibgpu/recon/rotation.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ def find_center_vo(
6060
ind: Optional[int] = None,
6161
average_radius: int = 0,
6262
cor_initialisation_value: Optional[float] = None,
63-
smin: int = -100,
64-
smax: int = 100,
63+
smin: int = -50,
64+
smax: int = 50,
6565
srad: float = 6.0,
66-
step: float = 0.25,
66+
step: float = 0.5,
6767
ratio: float = 0.5,
6868
drop: int = 20,
6969
) -> np.float32:
@@ -117,7 +117,7 @@ def find_center_vo(
117117
average_radius = ind
118118
if ind > 0:
119119
_sino = cp.mean(
120-
data[:, ind - average_radius : ind + average_radius, :], axis=1
120+
data[:, ind - average_radius : ind + average_radius + 1, :], axis=1
121121
)
122122
else:
123123
_sino = data[:, ind, :]

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ dependencies = [
4444
"pillow",
4545
"scikit-image",
4646
"tomobar",
47-
"ccpi-regularisation-cupy"
4847
]
4948

5049
[project.optional-dependencies]

tests/test_recon/test_rotation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def test_find_center_vo_ones(ensure_clean_memory):
3535
mat = cp.ones(shape=(103, 450, 230), dtype=cp.float32)
3636
cor = find_center_vo(mat)
3737

38-
assert_allclose(cor, 8)
38+
assert_allclose(cor, 58)
3939
mat = None #: free up GPU memory
4040

4141

@@ -44,7 +44,7 @@ def test_find_center_vo_random(ensure_clean_memory):
4444
data_host = np.random.random_sample(size=(900, 1, 1280)).astype(np.float32) * 2.0
4545
data = cp.asarray(data_host, dtype=np.float32)
4646
cent = find_center_vo(data)
47-
assert_allclose(cent, 550.25)
47+
assert_allclose(cent, 680.5)
4848

4949

5050
def test_find_center_vo_calculate_chunks():

0 commit comments

Comments
 (0)