fixing imports2

DiamondLightSource · May 1, 2024 · 959a3af · 959a3af
1 parent eb5da60
commit 959a3af
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/httomolibgpu/__init__.py b/httomolibgpu/__init__.py
@@ -3,7 +3,7 @@
 from httomolibgpu.misc.rescale import rescale_to_int
 from httomolibgpu.prep.alignment import distortion_correction_proj_discorpy
 from httomolibgpu.prep.normalize import normalize
-from httomolibgpu.prep.phase import paganin_filter_savu, paganin_filter_tomopy
+#from httomolibgpu.prep.phase import paganin_filter_savu, paganin_filter_tomopy
 # from httomolibgpu.prep.stripe import (
 #     remove_stripe_based_sorting,
 #     remove_stripe_ti,

diff --git a/httomolibgpu/prep/normalize.py b/httomolibgpu/prep/normalize.py
@@ -20,21 +20,25 @@
 # ---------------------------------------------------------------------------
 """Modules for raw projection data normalization"""
 
-
-import numpy as np
+cupy_run = False
 try:
-    import cupy as xp
-    from cupy import mean
+    import cupy as xp    
 
     try:
         xp.cuda.Device(0).compute_capability
+        cupy_run = True
     except xp.cuda.runtime.CUDARuntimeError:
         print("CuPy library is a major dependency for HTTomolibgpu, please install")
         import numpy as xp
 except ImportError:
     import numpy as xp
 
+if cupy_run:
+    from cupy import mean
+else:
+    from numpy import mean
 import nvtx
+import numpy as np
 from numpy import float32
 from typing import Tuple