Merge pull request #56 from DiamondLightSource/fbp2dastra

changes to accomodate fbp2d_astra method

Author: dkazanc

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

@@ -145,15 +145,24 @@ prep:
         method: module
 recon:
   algorithm:
-    FBP3d_tomobar:
+    FBP2d_astra:
       pattern: sinogram
       output_dims_change: True
-      implementation: gpu_cupy
+      implementation: gpu
       save_result_default: True
       padding: False
       memory_gpu:
         multiplier: None
         method: module
+    FBP3d_tomobar:
+      pattern: sinogram
+      output_dims_change: True
+      implementation: gpu_cupy
+      save_result_default: True
+      padding: False
+      memory_gpu:
+        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

@@ -29,6 +29,7 @@
     "_calc_memory_bytes_FBP3d_tomobar",
     "_calc_memory_bytes_SIRT3d_tomobar",
     "_calc_memory_bytes_CGLS3d_tomobar",
+    "_calc_output_dim_FBP2d_astra",
     "_calc_output_dim_FBP3d_tomobar",
     "_calc_output_dim_SIRT3d_tomobar",
     "_calc_output_dim_CGLS3d_tomobar",
@@ -49,6 +50,10 @@ def __calc_output_dim_recon(non_slice_dims_shape, **kwargs):
     return output_dims
 
 
+def _calc_output_dim_FBP2d_astra(non_slice_dims_shape, **kwargs):
+    return __calc_output_dim_recon(non_slice_dims_shape, **kwargs)
+
+
 def _calc_output_dim_FBP3d_tomobar(non_slice_dims_shape, **kwargs):
     return __calc_output_dim_recon(non_slice_dims_shape, **kwargs)
 

tests/test_httomolibgpu.py

@@ -728,3 +728,13 @@ def test_sino_360_to_180_memoryhook(
 
     assert estimated_bytes >= max_mem
     assert percentage_difference <= 35
+
+
+def test_FBP2d_astra_output_dim():
+    # Call memory estimator to estimate memory usage
+    recon_size = 300
+    output_dims = _calc_output_dim_FBP2d_astra(
+        non_slice_dims_shape=(10, 10),
+        recon_size=recon_size,
+    )
+    assert output_dims == (recon_size, recon_size)

tests/test_method_query.py

@@ -41,6 +41,11 @@ def test_httomolibgpu_implementation():
     assert query.get_implementation() == "gpu_cupy"
 
 
+def test_httomolibgpu_implementation2():
+    query = MethodsDatabaseQuery("httomolibgpu.recon.algorithm", "FBP2d_astra")
+    assert query.get_implementation() == "gpu"
+
+
 def test_httomolibgpu_output_dims_change():
     query = MethodsDatabaseQuery("httomolibgpu.prep.normalize", "normalize")
     assert query.get_output_dims_change() is False