better way to avoid rl_cleanup import fail

tlambert03 · Mar 5, 2019 · 52655df · 52655df
1 parent ff4a80b
commit 52655df
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/pycudadecon/__init__.py b/pycudadecon/__init__.py
@@ -1,7 +1,7 @@
 from .version import __version__
 from .deconvolution import decon, TemporaryOTF
-from .libcudawrapper import RLContext, rl_decon, rl_init
+from .libcudawrapper import RLContext, rl_decon, rl_init, rl_cleanup
 from .affine import affineGPU, deskewGPU, rotateGPU
 
-__all__ = (decon, TemporaryOTF, RLContext, rl_decon, rl_init,
+__all__ = (decon, TemporaryOTF, RLContext, rl_decon, rl_init, rl_cleanup,
            affineGPU, deskewGPU, rotateGPU)
diff --git a/pycudadecon/libcudawrapper.py b/pycudadecon/libcudawrapper.py
@@ -81,6 +81,8 @@
         cuda_reset = cudaLib.cuda_reset
 
     except AttributeError as e:
+        rl_cleanup = None
+        cuda_reset = None
         logger.warning('Failed to properly import libcudaDeconv')
         print(e)
 

diff --git a/test/test_decon.py b/test/test_decon.py
@@ -1,8 +1,7 @@
 import unittest
 import os
 import numpy as np
-from pycudadecon import decon, RLContext, rl_init, rl_decon
-from pycudadecon.libcudawrapper import rl_cleanup
+from pycudadecon import decon, RLContext, rl_init, rl_decon, rl_cleanup
 from pycudadecon.util import imread