Merge pull request #240 from DiamondLightSource/datachecker

Data checker function for GPU only

Author: dkazanc

httomolibgpu/__init__.py

@@ -1,3 +1,5 @@
+from httomolibgpu.misc.utils import data_checker
+
 from httomolibgpu.misc.corr import median_filter, remove_outlier
 from httomolibgpu.misc.denoise import total_variation_ROF, total_variation_PD
 from httomolibgpu.misc.morph import sino_360_to_180, data_resampler

httomolibgpu/misc/corr.py

@@ -36,8 +36,6 @@
 else:
     load_cuda_module = Mock()
 
-from httomolibgpu.misc.supp_func import data_checker
-
 __all__ = [
     "median_filter",
     "remove_outlier",
@@ -82,10 +80,6 @@ def median_filter(
     else:
         raise ValueError("The input array must be a 3D array")
 
-    data = data_checker(
-        data, verbosity=True, method_name="median_filter_or_remove_outlier"
-    )
-
     if kernel_size not in [3, 5, 7, 9, 11, 13]:
         raise ValueError("Please select a correct kernel size: 3, 5, 7, 9, 11, 13")
 

httomolibgpu/misc/denoise.py

@@ -29,8 +29,6 @@
 
 from unittest.mock import Mock
 
-from httomolibgpu.misc.supp_func import data_checker
-
 if cupy_run:
     from tomobar.regularisersCuPy import ROF_TV_cupy, PD_TV_cupy
 else:
@@ -84,8 +82,6 @@ def total_variation_ROF(
         If the input array is not float32 data type.
     """
 
-    data = data_checker(data, verbosity=True, method_name="total_variation_ROF")
-
     return ROF_TV_cupy(
         data,
         regularisation_parameter,
@@ -139,8 +135,6 @@ def total_variation_PD(
         If the input array is not float32 data type.
     """
 
-    data_checker(data, verbosity=True, method_name="total_variation_PD")
-
     methodTV = 0
     if not isotropic:
         methodTV = 1

httomolibgpu/misc/morph.py

@@ -35,8 +35,6 @@
 
 from typing import Literal
 
-from httomolibgpu.misc.supp_func import data_checker
-
 __all__ = [
     "sino_360_to_180",
     "data_resampler",
@@ -68,8 +66,6 @@ def sino_360_to_180(
     if data.ndim != 3:
         raise ValueError("only 3D data is supported")
 
-    data = data_checker(data, verbosity=True, method_name="sino_360_to_180")
-
     dx, dy, dz = data.shape
 
     overlap = int(np.round(overlap))
@@ -142,8 +138,6 @@ def data_resampler(
         data = cp.expand_dims(data, 1)
         axis = 1
 
-    data = data_checker(data, verbosity=True, method_name="data_resampler")
-
     N, M, Z = cp.shape(data)
 
     if axis == 0:

httomolibgpu/misc/rescale.py

@@ -27,8 +27,6 @@
 
 from typing import Literal, Optional, Tuple, Union
 
-from httomolibgpu.misc.supp_func import data_checker
-
 
 __all__ = [
     "rescale_to_int",
@@ -80,8 +78,6 @@ def rescale_to_int(
     else:
         output_dtype = np.uint32
 
-    data = data_checker(data, verbosity=True, method_name="rescale_to_int")
-
     # get the min and max integer values of the output type
     output_min = cp.iinfo(output_dtype).min
     output_max = cp.iinfo(output_dtype).max