further import changes

Author: dkazanc

httomolibgpu/cupywrapper.py

@@ -1,4 +1,3 @@
-cupy_run = False
 try:
     import cupy as cp
     import nvtx
@@ -15,5 +14,6 @@
     )
     from unittest.mock import Mock
     import numpy as cp
+    cupy_run = False
 
     nvtx = Mock()

httomolibgpu/misc/corr.py

@@ -29,13 +29,14 @@
 
 cp = cupywrapper.cp
 nvtx = cupywrapper.nvtx
+cupy_run = cupywrapper.cupy_run
 
 from numpy import float32
 from unittest.mock import Mock
 
-try:
+if cupy_run:
     from httomolibgpu.cuda_kernels import load_cuda_module
-except ImportError as e:
+else:
     load_cuda_module = Mock()
 
 
@@ -45,6 +46,7 @@
 ]
 
 
+@nvtx.annotate()
 def median_filter(
     data: cp.ndarray,
     kernel_size: int = 3,
@@ -73,19 +75,6 @@ def median_filter(
     ValueError
         If the input array is not three dimensional.
     """
-    if cupywrapper.cupy_run:
-        return __median_filter(data, kernel_size, dif)
-    else:
-        print("median_filter won't be executed because CuPy is not installed")
-        return data
-
-
-@nvtx.annotate()
-def __median_filter(
-    data: cp.ndarray,
-    kernel_size: int = 3,
-    dif: float = 0.0,
-) -> cp.ndarray:
     input_type = data.dtype
 
     if input_type not in ["float32", "uint16"]:
@@ -154,8 +143,4 @@ def remove_outlier(
     if dif <= 0.0:
         raise ValueError("Threshold value (dif) must be positive and nonzero.")
 
-    if cupywrapper.cupy_run:
-        return __median_filter(data, kernel_size, dif)
-    else:
-        print("remove_outlier won't be executed because CuPy is not installed")
-        return data
+    return median_filter(data, kernel_size, dif)

httomolibgpu/misc/morph.py

@@ -25,12 +25,13 @@
 
 cp = cupywrapper.cp
 nvtx = cupywrapper.nvtx
+cupy_run = cupywrapper.cupy_run
 
 from unittest.mock import Mock
 
-try:
+if cupy_run:
     from cupyx.scipy.interpolate import interpn
-except ImportError as e:
+else:
     interpn = Mock()
 
 from typing import Literal

httomolibgpu/misc/rescale.py

@@ -23,8 +23,8 @@
 from httomolibgpu import cupywrapper
 
 cp = cupywrapper.cp
-
 nvtx = cupywrapper.nvtx
+
 from typing import Literal, Optional, Tuple, Union
 
 __all__ = [

httomolibgpu/prep/alignment.py

@@ -25,12 +25,13 @@
 
 cp = cupywrapper.cp
 nvtx = cupywrapper.nvtx
+cupy_run = cupywrapper.cupy_run
 
 from unittest.mock import Mock
 
-try:
+if cupy_run:
     from cupyx.scipy.ndimage import map_coordinates
-except ImportError as e:
+else:
     map_coordinates = Mock()
 
 from typing import Dict, List

httomolibgpu/prep/normalize.py

@@ -25,12 +25,13 @@
 
 cp = cupywrapper.cp
 nvtx = cupywrapper.nvtx
+cupy_run = cupywrapper.cupy_run
 
 from unittest.mock import Mock
 
-try:
+if cupy_run:
     from cupy import mean
-except ImportError as e:
+else:
     mean = Mock()
 
 from numpy import float32

httomolibgpu/prep/phase.py

@@ -25,12 +25,13 @@
 
 cp = cupywrapper.cp
 nvtx = cupywrapper.nvtx
+cupy_run = cupywrapper.cupy_run
 
 from unittest.mock import Mock
-try:
+if cupy_run:
     from httomolibgpu.cuda_kernels import load_cuda_module
     from cupyx.scipy.fft import fft2, ifft2, fftshift
-except ImportError as e:
+else:
     load_cuda_module = Mock()
     fft2 = Mock()
     ifft2 = Mock()

httomolibgpu/prep/stripe.py

@@ -25,11 +25,12 @@
 
 cp = cupywrapper.cp
 nvtx = cupywrapper.nvtx
+cupy_run = cupywrapper.cupy_run
 
 from unittest.mock import Mock
-try:
+if cupy_run:
     from cupyx.scipy.ndimage import median_filter, binary_dilation, uniform_filter1d    
-except ImportError as e:
+else:
     median_filter = Mock()
     binary_dilation = Mock()
     uniform_filter1d = Mock()

httomolibgpu/recon/algorithm.py

@@ -25,12 +25,13 @@
 
 cp = cupywrapper.cp
 nvtx = cupywrapper.nvtx
+cupy_run = cupywrapper.cupy_run
 
 from unittest.mock import Mock
-try:
+if cupy_run:
     from tomobar.methodsDIR_CuPy import RecToolsDIRCuPy
     from tomobar.methodsIR_CuPy import RecToolsIRCuPy
-except ImportError as e:
+else:
     RecToolsDIRCuPy = Mock()
     RecToolsIRCuPy = Mock()
 

httomolibgpu/recon/rotation.py

@@ -25,16 +25,16 @@
 
 cp = cupywrapper.cp
 nvtx = cupywrapper.nvtx
-
+cupy_run = cupywrapper.cupy_run
 
 from unittest.mock import Mock
-try:
+if cupy_run:
     from httomolibgpu.cuda_kernels import load_cuda_module
     from cupyx.scipy.ndimage import shift, gaussian_filter
     from skimage.registration import phase_cross_correlation
     from cupyx.scipy.fftpack import get_fft_plan
     from cupyx.scipy.fft import rfft2    
-except ImportError as e:
+else:
     load_cuda_module = Mock()
     shift = Mock()
     gaussian_filter = Mock()