httomo-backends 0.7__tar.gz → 0.7.2__tar.gz

{httomo_backends-0.7 → httomo_backends-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: httomo-backends
-Version: 0.7
+Version: 0.7.2
 Summary: Supplementary files for HTTomo backends.
 Author: Garry ODonnell, Jacob Williamson
 Author-email: Daniil Kazantsev <daniil.kazantsev@diamond.ac.uk>, Yousef Moazzam <yousef.moazzam@diamond.ac.uk>, Jessica Verschoyle <jessica.verschoyle@diamond.ac.uk>, Naman Gera <naman.gera@diamond.ac.uk>, scientificsoftware@diamond.ac.uk
@@ -22,7 +22,6 @@ Requires-Dist: h5py
 Requires-Dist: astra-toolbox
 Requires-Dist: tomobar
 Requires-Dist: scikit-image
-Requires-Dist: ccpi-regularisation-cupy
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-mock; extra == "dev"

{httomo_backends-0.7 → httomo_backends-0.7.2}/httomo_backends/methods_database/packages/backends/httomolibgpu/supporting_funcs/recon/algorithm.py

@@ -192,7 +192,14 @@ def _calc_memory_bytes_LPRec3d_tomobar(
         detector_pad = 0        
 
     min_mem_usage_filter = False
+    if "min_mem_usage_filter" in kwargs:
+        min_mem_usage_filter = kwargs["min_mem_usage_filter"]
     min_mem_usage_ifft2 = False
+    if "min_mem_usage_ifft2" in kwargs:
+        min_mem_usage_ifft2 = kwargs["min_mem_usage_ifft2"]
+    power_of_2_cropping = False
+    if "power_of_2_cropping" in kwargs:
+        power_of_2_cropping = kwargs["power_of_2_cropping"]
 
     angles_tot = non_slice_dims_shape[0]
     DetectorsLengthH_prepad = non_slice_dims_shape[1]
@@ -201,6 +208,10 @@ def _calc_memory_bytes_LPRec3d_tomobar(
     _CENTER_SIZE_MIN = 192  # must be divisible by 8
 
     n = DetectorsLengthH
+    if(power_of_2_cropping):
+        n_pow2 = 2 ** math.ceil(math.log2(n))
+        if( 0.9 < n / n_pow2 ):
+            n = n_pow2
 
     odd_horiz = False
     if (n % 2) != 0:
@@ -339,21 +350,21 @@ def _calc_memory_bytes_LPRec3d_tomobar(
 
     add_to_memory_counters(tmp_p_input_slice, True)
     if min_mem_usage_filter:
-        add_to_memory_counters(rfft_plan_slice_size / 4, False)
-        add_to_memory_counters(irfft_plan_slice_size / 4, False)
-        add_to_memory_counters(padded_tmp_p_input_slice, False)
+        add_to_memory_counters(rfft_plan_slice_size / 4 / projection_chunk_count, False)
+        add_to_memory_counters(irfft_plan_slice_size / 4 / projection_chunk_count, False)
+        add_to_memory_counters(padded_tmp_p_input_slice / projection_chunk_count, False)
 
-        add_to_memory_counters(rfft_result_size, False)
-        add_to_memory_counters(filtered_rfft_result_size, False)
-        add_to_memory_counters(-rfft_result_size, False)
-        add_to_memory_counters(-padded_tmp_p_input_slice, False)
+        add_to_memory_counters(rfft_result_size / projection_chunk_count, False)
+        add_to_memory_counters(filtered_rfft_result_size / projection_chunk_count, False)
+        add_to_memory_counters(-rfft_result_size / projection_chunk_count, False)
+        add_to_memory_counters(-padded_tmp_p_input_slice / projection_chunk_count, False)
 
-        add_to_memory_counters(irfft_scratch_memory_size, False)
-        add_to_memory_counters(-irfft_scratch_memory_size, False)
-        add_to_memory_counters(irfft_result_size, False)
-        add_to_memory_counters(-filtered_rfft_result_size, False)
+        add_to_memory_counters(irfft_scratch_memory_size / projection_chunk_count, False)
+        add_to_memory_counters(-irfft_scratch_memory_size / projection_chunk_count, False)
+        add_to_memory_counters(irfft_result_size / projection_chunk_count, False)
+        add_to_memory_counters(-filtered_rfft_result_size / projection_chunk_count, False)
 
-        add_to_memory_counters(-irfft_result_size, False)
+        add_to_memory_counters(-irfft_result_size / projection_chunk_count, False)
     else:
         add_to_memory_counters(rfft_plan_slice_size / chunk_count / projection_chunk_count * 2, True)
         add_to_memory_counters(irfft_plan_slice_size / chunk_count / projection_chunk_count * 2, True)
@@ -402,8 +413,10 @@ def _calc_memory_bytes_LPRec3d_tomobar(
     add_to_memory_counters(circular_mask_size, False)
     add_to_memory_counters(after_recon_swapaxis_slice, True)
 
-    if min_mem_usage_ifft2 and min_mem_usage_filter:
-        return (tot_memory_bytes * 1.1 + 30 * 1024 * 1024, fixed_amount)
+    if min_mem_usage_filter and min_mem_usage_ifft2:
+        return (tot_memory_bytes * 1.15, fixed_amount)
+    elif min_mem_usage_filter and not min_mem_usage_ifft2:
+        return (tot_memory_bytes + 60 * 1024 * 1024, fixed_amount)
     else:
         return (tot_memory_bytes * 1.1, fixed_amount)
 

{httomo_backends-0.7 → httomo_backends-0.7.2}/httomo_backends/yaml_templates/httomolibgpu/httomolibgpu.recon.algorithm/LPRec3d_tomobar.yaml

@@ -8,6 +8,7 @@
     recon_size: null
     recon_mask_radius: 0.95
     power_of_2_oversampling: true
+    power_of_2_cropping: true
     min_mem_usage_filter: false
     min_mem_usage_ifft2: false
     neglog: false

{httomo_backends-0.7 → httomo_backends-0.7.2}/httomo_backends.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: httomo-backends
-Version: 0.7
+Version: 0.7.2
 Summary: Supplementary files for HTTomo backends.
 Author: Garry ODonnell, Jacob Williamson
 Author-email: Daniil Kazantsev <daniil.kazantsev@diamond.ac.uk>, Yousef Moazzam <yousef.moazzam@diamond.ac.uk>, Jessica Verschoyle <jessica.verschoyle@diamond.ac.uk>, Naman Gera <naman.gera@diamond.ac.uk>, scientificsoftware@diamond.ac.uk
@@ -22,7 +22,6 @@ Requires-Dist: h5py
 Requires-Dist: astra-toolbox
 Requires-Dist: tomobar
 Requires-Dist: scikit-image
-Requires-Dist: ccpi-regularisation-cupy
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-mock; extra == "dev"

{httomo_backends-0.7 → httomo_backends-0.7.2}/httomo_backends.egg-info/requires.txt

@@ -8,7 +8,6 @@ h5py
 astra-toolbox
 tomobar
 scikit-image
-ccpi-regularisation-cupy
 
 [dev]
 pytest

{httomo_backends-0.7 → httomo_backends-0.7.2}/pyproject.toml

@@ -24,7 +24,7 @@ dev_template = "{tag}"
 
 [project]
 name = "httomo-backends"
-version = "0.7"
+version = "0.7.2"
 description = "Supplementary files for HTTomo backends."
 readme = "README.rst"
 license = {text = "BSD-3-Clause"}
@@ -55,7 +55,6 @@ dependencies = [
     "astra-toolbox",
     "tomobar",
     "scikit-image",
-    "ccpi-regularisation-cupy",
 ]
 
 [project.optional-dependencies]

{httomo_backends-0.7 → httomo_backends-0.7.2}/tests/test_httomolibgpu.py

@@ -543,6 +543,8 @@ def test_recon_FBP3d_tomobar_memoryhook(
 
 
 @pytest.mark.cupy
+@pytest.mark.parametrize("min_mem_usage_filter_ifft2", [(False, False)])
+@pytest.mark.parametrize("power_of_2_cropping", [False])
 @pytest.mark.parametrize("padding_detx", [0, 10, 50, 100])
 @pytest.mark.parametrize("projections", [1500, 1801, 2560])
 @pytest.mark.parametrize("detX_size", [2560])
@@ -553,7 +555,9 @@ def test_recon_LPRec3d_tomobar_0_pi_memoryhook(
     detX_size,
     projections,
     projection_angle_range,
+    min_mem_usage_filter_ifft2,
     padding_detx,
+    power_of_2_cropping,
     ensure_clean_memory,
 ):
     __test_recon_LPRec3d_tomobar_memoryhook_common(
@@ -562,12 +566,16 @@ def test_recon_LPRec3d_tomobar_0_pi_memoryhook(
         projections,
         projection_angle_range,
         padding_detx,
+        min_mem_usage_filter_ifft2,
+        power_of_2_cropping,
         ensure_clean_memory,
     )
 
 
 @pytest.mark.full
 @pytest.mark.cupy
+@pytest.mark.parametrize("min_mem_usage_filter_ifft2", [(False, False), (True, False), (True, True)])
+@pytest.mark.parametrize("power_of_2_cropping", [False, True])
 @pytest.mark.parametrize("padding_detx", [0, 10, 50, 100, 800])
 @pytest.mark.parametrize("projections", [1500, 1801, 2560, 3601])
 @pytest.mark.parametrize("detX_size", [2560])
@@ -579,6 +587,8 @@ def test_recon_LPRec3d_tomobar_0_pi_memoryhook_full(
     projections,
     projection_angle_range,
     padding_detx,
+    min_mem_usage_filter_ifft2,
+    power_of_2_cropping,
     ensure_clean_memory,
 ):
     __test_recon_LPRec3d_tomobar_memoryhook_common(
@@ -587,12 +597,16 @@ def test_recon_LPRec3d_tomobar_0_pi_memoryhook_full(
         projections,
         projection_angle_range,
         padding_detx,
+        min_mem_usage_filter_ifft2,
+        power_of_2_cropping,
         ensure_clean_memory,
     )
 
 
 @pytest.mark.full
 @pytest.mark.cupy
+@pytest.mark.parametrize("min_mem_usage_filter_ifft2", [(False, False), (True, False), (True, True)])
+@pytest.mark.parametrize("power_of_2_cropping", [False, True])
 @pytest.mark.parametrize("padding_detx", [0, 10, 50, 100, 800])
 @pytest.mark.parametrize("projections", [1500, 1801, 2560, 3601])
 @pytest.mark.parametrize("detX_size", [2560])
@@ -606,6 +620,8 @@ def test_recon_LPRec3d_tomobar_memoryhook_full(
     projections,
     projection_angle_range,
     padding_detx,
+    min_mem_usage_filter_ifft2,
+    power_of_2_cropping,
     ensure_clean_memory,
 ):
     __test_recon_LPRec3d_tomobar_memoryhook_common(
@@ -614,6 +630,8 @@ def test_recon_LPRec3d_tomobar_memoryhook_full(
         projections,
         projection_angle_range,
         padding_detx,
+        min_mem_usage_filter_ifft2,
+        power_of_2_cropping,
         ensure_clean_memory,
     )
 
@@ -624,6 +642,8 @@ def __test_recon_LPRec3d_tomobar_memoryhook_common(
     projections,
     projection_angle_range,
     padding_detx,
+    min_mem_usage_filter_ifft2,
+    power_of_2_cropping,
     ensure_clean_memory,
 ):
     angles_number = projections
@@ -634,6 +654,9 @@ def __test_recon_LPRec3d_tomobar_memoryhook_common(
     )
     kwargs["center"] = 1280
     kwargs["detector_pad"] = padding_detx
+    kwargs["min_mem_usage_filter"] = min_mem_usage_filter_ifft2[0]
+    kwargs["min_mem_usage_ifft2"] = min_mem_usage_filter_ifft2[1]
+    kwargs["power_of_2_cropping"] = power_of_2_cropping
     kwargs["recon_size"] = detX_size
     kwargs["recon_mask_radius"] = 0.8