httomo-backends 0.7__py3-none-any.whl → 0.7.2__py3-none-any.whl

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/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.dist-info → httomo_backends-0.7.2.dist-info}/METADATA

@@ -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.dist-info → httomo_backends-0.7.2.dist-info}/RECORD

@@ -20,7 +20,7 @@ httomo_backends/methods_database/packages/backends/httomolibgpu/supporting_funcs
 httomo_backends/methods_database/packages/backends/httomolibgpu/supporting_funcs/prep/phase.py,sha256=kYznizW0jMVJdGyuE10McVLsWWggUsP5bvJiHEVvSSM,4075
 httomo_backends/methods_database/packages/backends/httomolibgpu/supporting_funcs/prep/stripe.py,sha256=KnS8IpcXaLeiIWr4qAKwOrcK1vS9zrU6u5gOITZ159k,4623
 httomo_backends/methods_database/packages/backends/httomolibgpu/supporting_funcs/recon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-httomo_backends/methods_database/packages/backends/httomolibgpu/supporting_funcs/recon/algorithm.py,sha256=ztqcHihOoprL0xYggv8pkF3AS9mQ1L6o0AICszdvTfg,20656
+httomo_backends/methods_database/packages/backends/httomolibgpu/supporting_funcs/recon/algorithm.py,sha256=Jq4gp0NDuixGcOD1oHGJg0Vjg58JPVwisaMIb5JYqX8,21529
 httomo_backends/methods_database/packages/backends/httomolibgpu/supporting_funcs/recon/peak_memory_line_profile_hook.py,sha256=hb-CyqD5TKxDg6Rg5fvFeXIO2nvjbp_XMTeRdJZ8ONo,6347
 httomo_backends/methods_database/packages/backends/tomopy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 httomo_backends/methods_database/packages/backends/tomopy/tomopy.yaml,sha256=URe18BAV1EbGLil53t88T42BuKSiUHz6r3uzs_wo8Ug,11215
@@ -79,7 +79,7 @@ httomo_backends/yaml_templates/httomolibgpu/httomolibgpu.recon.algorithm/CGLS3d_
 httomo_backends/yaml_templates/httomolibgpu/httomolibgpu.recon.algorithm/FBP2d_astra.yaml,sha256=MxUbW-dMxMrI4Exn5mgh2ovie4Ldv1Eb-zS68ETsNCU,301
 httomo_backends/yaml_templates/httomolibgpu/httomolibgpu.recon.algorithm/FBP3d_tomobar.yaml,sha256=H9-PTd8qW2qXqgHYw-NfZGgy2yut7ReKsbsR3x0_OOA,261
 httomo_backends/yaml_templates/httomolibgpu/httomolibgpu.recon.algorithm/FISTA3d_tomobar.yaml,sha256=i2K7Yc19VY6uZZR8bVjb85jpWIShlM_yCGD-Z5Eb-5E,442
-httomo_backends/yaml_templates/httomolibgpu/httomolibgpu.recon.algorithm/LPRec3d_tomobar.yaml,sha256=X_qcuTOcFW_rXaXU-XhZYQUaPkOgKe5r7uX5stpf1mE,382
+httomo_backends/yaml_templates/httomolibgpu/httomolibgpu.recon.algorithm/LPRec3d_tomobar.yaml,sha256=mm3vUiZbLm-KtxjN1VL0LtMaWHdHHolpFFQc1OPkuZk,412
 httomo_backends/yaml_templates/httomolibgpu/httomolibgpu.recon.algorithm/SIRT3d_tomobar.yaml,sha256=oom622LQ8xAZbZiHm4t0PSKKsMkX5G743vVBqRbMQek,277
 httomo_backends/yaml_templates/httomolibgpu/httomolibgpu.recon.rotation/find_center_360.yaml,sha256=nXjbgTBDQcIlBWvXwMd8FoNimtq-8QabgNWAI-fiFU8,322
 httomo_backends/yaml_templates/httomolibgpu/httomolibgpu.recon.rotation/find_center_pc.yaml,sha256=g3CNIaLhhBI6igluIMwytFqVXzrDlv8A1EU1C7ey4FE,208
@@ -144,8 +144,8 @@ httomo_backends/yaml_templates/tomopy/tomopy.sim.project/add_zingers.yaml,sha256
 httomo_backends/yaml_templates/tomopy/tomopy.sim.project/project.yaml,sha256=XBVhW5ZxT9C89tHcwDG7OOgcWNdNtQq97mqlBEoiMnU,202
 httomo_backends/yaml_templates/tomopy/tomopy.sim.project/project2.yaml,sha256=5raeQ-w9nS9mbAzn2ZqhPjdcyfLOkkJflKNStdEnYRA,238
 httomo_backends/yaml_templates/tomopy/tomopy.sim.project/project3.yaml,sha256=oyofKSMi-_dSpfjrKVMNDqoBhBCCSYbEVRz2Lsc8uTI,257
-httomo_backends-0.7.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-httomo_backends-0.7.dist-info/METADATA,sha256=i2Lo2q21-TN8TYwVmhkDVRbIgb3Vysu4HylmcME7nrM,2310
-httomo_backends-0.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-httomo_backends-0.7.dist-info/top_level.txt,sha256=v4x8d4CeEyMwo8QoqIvL_p-WoXAVD1bVnASPIrLjSTg,16
-httomo_backends-0.7.dist-info/RECORD,,
+httomo_backends-0.7.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+httomo_backends-0.7.2.dist-info/METADATA,sha256=F0PpEdrCwHMrpibOI1lUZczembzVccVwj_-j1mtbu4E,2272
+httomo_backends-0.7.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+httomo_backends-0.7.2.dist-info/top_level.txt,sha256=v4x8d4CeEyMwo8QoqIvL_p-WoXAVD1bVnASPIrLjSTg,16
+httomo_backends-0.7.2.dist-info/RECORD,,