From 08012d38f0b2fa741aa07e1c72f4b22a5f1125c9 Mon Sep 17 00:00:00 2001 From: dkazanc Date: Tue, 30 Apr 2024 16:03:22 +0100 Subject: [PATCH] working version for corr module --- httomolibgpu/misc/corr.py | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/httomolibgpu/misc/corr.py b/httomolibgpu/misc/corr.py index 819c2481..8c043742 100644 --- a/httomolibgpu/misc/corr.py +++ b/httomolibgpu/misc/corr.py @@ -20,45 +20,32 @@ # --------------------------------------------------------------------------- """ Module for data correction """ - import numpy as xp cupy_run = False - try: - import cupy as cp + import cupy as xp try: - cp.cuda.Device(0).compute_capability + xp.cuda.Device(0).compute_capability cupy_run = True - except cp.cuda.runtime.CUDARuntimeError: - print("Cupy library is a required dependency for HTTomolibgpu, please install") + except xp.cuda.runtime.CUDARuntimeError: + print("CuPy library is a major dependency for HTTomolibgpu, please install") import numpy as np except ImportError: import numpy as np -# cupy_run = False -# try: -# import cupy as cp - -# # import nvtx -# cupy_run = True -# except ImportError: -# print("Cupy library is a required dependency for HTTomolibgpu, please install") - try: from cucim.skimage.filters import median from cucim.skimage.morphology import disk except ImportError: print( - "Cucim library of RapidsAI is a required dependency for HTTomolibgpu, please install" + "Cucim library of RapidsAI is a required dependency for some modules, please install" ) -from typing import Tuple - -# import numpy as np from numpy import float32 +import nvtx if cupy_run: from httomolibgpu.cuda_kernels import load_cuda_module @@ -69,7 +56,7 @@ ] -# @nvtx.annotate() +@nvtx.annotate() def median_filter( data: xp.ndarray, kernel_size: int = 3,