From 959a3af96405af2077c9b0c0263f86ca65ed1ed6 Mon Sep 17 00:00:00 2001 From: dkazanc Date: Wed, 1 May 2024 10:21:32 +0100 Subject: [PATCH] fixing imports2 --- httomolibgpu/__init__.py | 2 +- httomolibgpu/prep/normalize.py | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/httomolibgpu/__init__.py b/httomolibgpu/__init__.py index 15a49d24..9585d4d4 100644 --- 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 index c2e65993..d8c1625a 100644 --- 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