adding a direct estimator for fbp2d_astra

Author: dkazanc

httomo_backends/methods_database/packages/backends/httomolibgpu/httomolibgpu.yaml

@@ -161,8 +161,8 @@ recon:
       save_result_default: True
       padding: False
       memory_gpu:
-        multiplier: None
-        method: module
+        multiplier: 1.0
+        method: direct
     SIRT3d_tomobar:
       pattern: sinogram
       output_dims_change: True

httomo_backends/methods_database/packages/backends/httomolibgpu/supporting_funcs/recon/algorithm.py

@@ -26,11 +26,10 @@
 from httomo_backends.cufft import CufftType, cufft_estimate_1d
 
 __all__ = [
-    "_calc_memory_bytes_FBP2d_astra",
     "_calc_memory_bytes_FBP3d_tomobar",
     "_calc_memory_bytes_SIRT3d_tomobar",
     "_calc_memory_bytes_CGLS3d_tomobar",
-    "_calc_output_dim_FBP2d_astra",  
+    "_calc_output_dim_FBP2d_astra",
     "_calc_output_dim_FBP3d_tomobar",
     "_calc_output_dim_SIRT3d_tomobar",
     "_calc_output_dim_CGLS3d_tomobar",
@@ -67,15 +66,6 @@ def _calc_output_dim_CGLS3d_tomobar(non_slice_dims_shape, **kwargs):
     return __calc_output_dim_recon(non_slice_dims_shape, **kwargs)
 
 
-def _calc_memory_bytes_FBP2d_astra(
-    non_slice_dims_shape: Tuple[int, int],
-    dtype: np.dtype,
-    **kwargs,
-) -> Tuple[int, int]:
-    # this is GPU-CPU slice-by-slice reconstruction function so it doesn't need a lot of GPU memory
-    return (1, 0)
-
-
 def _calc_memory_bytes_FBP3d_tomobar(
     non_slice_dims_shape: Tuple[int, int],
     dtype: np.dtype,

tests/test_httomolibgpu.py

@@ -25,7 +25,7 @@
 )
 from httomolibgpu.misc.corr import remove_outlier
 from httomolibgpu.misc.denoise import total_variation_ROF, total_variation_PD
-from httomolibgpu.recon.algorithm import FBP2d_astra, FBP3d_tomobar, SIRT3d_tomobar, CGLS3d_tomobar
+from httomolibgpu.recon.algorithm import FBP3d_tomobar, SIRT3d_tomobar, CGLS3d_tomobar
 from httomolibgpu.misc.rescale import rescale_to_int
 
 from httomo_backends.methods_database.packages.backends.httomolibgpu.supporting_funcs.misc.morph import *
@@ -730,16 +730,6 @@ def test_sino_360_to_180_memoryhook(
     assert percentage_difference <= 35
 
 
-def test_FBP2d_astra_memory_calc():
-    # Call memory estimator to estimate memory usage
-    (estimated_bytes, subtract_bytes) = _calc_memory_bytes_FBP2d_astra(
-        non_slice_dims_shape=(10, 10),
-        dtype=np.float32(),
-    )
-    assert estimated_bytes == 1
-    assert subtract_bytes == 0
-
-
 def test_FBP2d_astra_output_dim():
     # Call memory estimator to estimate memory usage
     recon_size = 300