Commits

Anonymous committed dcb49c9 Merge

Merge from branch loadCULAlib.

  • Participants
  • Parent commits 172a329, 306a941

Comments (0)

Files changed (4)

File PyCULA/cula.py

 # -----------------------------------------------------------------------------
 
 if platform.system()=='Microsoft': libcula = ctypes.windll.LoadLibrary('cula.dll')
-if platform.system()=='Darwin':    libcula = ctypes.cdll.LoadLibrary('/usr/local/cuda/lib/libcula.dylib')
-if platform.system()=='Linux':     libcula = ctypes.cdll.LoadLibrary('/usr/local/cula/lib64/libcula.so')
+elif platform.system()=='Darwin':    libcula = ctypes.cdll.LoadLibrary('/usr/local/cuda/lib/libcula.dylib')
+elif platform.system()=='Linux':     libcula = ctypes.cdll.LoadLibrary('/usr/local/cula/lib64/libcula.so')
 else:                              libcula = ctypes.cdll.LoadLibrary('libcula.so')
 
 # ------------------------------------------------------------------------------

File PyCULA/cula.pyc

Binary file modified.

File PyCULA/my_init.py

 import cula
 import pycuda.driver as cuda
 from pycuda.tools import make_default_context
+import PyCUsp
 
 
 
 def mixed_init():
     '''Inits driver and runtime libs for transperant mixed mode cuda enviornment.'''
     import pycuda.autoinit #init driver bound to this host thread
-    #import scikits.cuda.cublas as cublas
-    #cublas.cublasInit() #init cublas bound to this driver context
+    import scikits.cuda.cublas as cublas
+    cublas.cublasInit() #init cublas bound to this driver context
     cula.culaInitialize() # init cula bount to this driver context
     atexit.register(cula.culaShutdown) #shutdown on exit
-    #atexit.register(cublas.cublasInit) #shutdown on exit
+    atexit.register(cublas.cublasInit) #shutdown on exit
 
-    #handle = PyCUsp.cuspInit()
-    #return handle
+    handle = PyCUsp.cusp_init()
+    return handle
     
 
 

File PyCULA/my_init.pyc

Binary file modified.