Try loading CDLL on Windows / Python 3.8 by using os.add_dll_directory

jobovy · Mar 17, 2020 · 2c0e676 · 2c0e676
1 parent c97a40e
commit 2c0e676
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 6 deletions.
diff --git a/galpy/actionAngle/actionAngleAdiabatic_c.py b/galpy/actionAngle/actionAngleAdiabatic_c.py
@@ -16,8 +16,13 @@
 else: #pragma: no cover
     _ext_suffix= '.so'
 for path in sys.path:
+    if not os.path.isdir(path): continue
     try:
-        _lib = ctypes.CDLL(os.path.join(path,'galpy_actionAngle_c%s' % _ext_suffix))
+        if sys.platform == 'win32' and sys.version_info >= (3,8):
+            with os.add_dll_directory(path):
+                _lib = ctypes.CDLL(os.path.join(path,'galpy_integrate_c%s' % _ext_suffix))
+        else:
+            _lib = ctypes.CDLL(os.path.join(path,'galpy_actionAngle_c%s' % _ext_suffix))
     except OSError as e:
         if os.path.exists(os.path.join(path,'galpy_actionAngle_c%s' % _ext_suffix)): #pragma: no cover
             outerr= e

diff --git a/galpy/actionAngle/actionAngleStaeckel_c.py b/galpy/actionAngle/actionAngleStaeckel_c.py
@@ -17,8 +17,13 @@
 else: #pragma: no cover
     _ext_suffix= '.so'
 for path in sys.path:
+    if not os.path.isdir(path): continue
     try:
-        _lib = ctypes.CDLL(os.path.join(path,'galpy_actionAngle_c%s' % _ext_suffix))
+        if sys.platform == 'win32' and sys.version_info >= (3,8):
+            with os.add_dll_directory(path):
+                _lib = ctypes.CDLL(os.path.join(path,'galpy_integrate_c%s' % _ext_suffix))
+        else:
+            _lib = ctypes.CDLL(os.path.join(path,'galpy_actionAngle_c%s' % _ext_suffix))
     except OSError as e:
         if os.path.exists(os.path.join(path,'galpy_actionAngle_c%s' % _ext_suffix)): #pragma: no cover
             outerr= e

diff --git a/galpy/actionAngle/actionAngleTorus_c.py b/galpy/actionAngle/actionAngleTorus_c.py
@@ -16,8 +16,13 @@
 else: #pragma: no cover
     _ext_suffix= '.so'
 for path in sys.path:
+    if not os.path.isdir(path): continue
     try:
-        _lib = ctypes.CDLL(os.path.join(path,'galpy_actionAngleTorus_c%s' % _ext_suffix))
+        if sys.platform == 'win32' and sys.version_info >= (3,8):
+            with os.add_dll_directory(path):
+                _lib = ctypes.CDLL(os.path.join(path,'galpy_integrate_c%s' % _ext_suffix))
+        else:
+            _lib = ctypes.CDLL(os.path.join(path,'galpy_actionAngleTorus_c%s' % _ext_suffix))
     except OSError as e:
         if os.path.exists(os.path.join(path,'galpy_actionAngleTorus_c%s' % _ext_suffix)): #pragma: no cover
             outerr= e

diff --git a/galpy/orbit/integrateFullOrbit.py b/galpy/orbit/integrateFullOrbit.py
@@ -24,8 +24,13 @@
 else: #pragma: no cover
     _ext_suffix= '.so'
 for path in sys.path:
+    if not os.path.isdir(path): continue
     try:
-        _lib = ctypes.CDLL(os.path.join(path,'galpy_integrate_c%s' % _ext_suffix))
+        if sys.platform == 'win32' and sys.version_info >= (3,8):
+            with os.add_dll_directory(path):
+                _lib = ctypes.CDLL(os.path.join(path,'galpy_integrate_c%s' % _ext_suffix))
+        else:
+            _lib = ctypes.CDLL(os.path.join(path,'galpy_integrate_c%s' % _ext_suffix))
     except OSError as e:
         if os.path.exists(os.path.join(path,'galpy_integrate_c%s' % _ext_suffix)): #pragma: no cover
             outerr= e

diff --git a/galpy/orbit/integratePlanarOrbit.py b/galpy/orbit/integratePlanarOrbit.py
@@ -26,8 +26,13 @@
 else: #pragma: no cover
     _ext_suffix= '.so'
 for path in sys.path:
+    if not os.path.isdir(path): continue
     try:
-        _lib = ctypes.CDLL(os.path.join(path,'galpy_integrate_c%s' % _ext_suffix))
+        if sys.platform == 'win32' and sys.version_info >= (3,8):
+            with os.add_dll_directory(path):
+                _lib = ctypes.CDLL(os.path.join(path,'galpy_integrate_c%s' % _ext_suffix))
+        else:
+            _lib = ctypes.CDLL(os.path.join(path,'galpy_integrate_c%s' % _ext_suffix))            
     except OSError as e:
         if os.path.exists(os.path.join(path,'galpy_integrate_c%s' % _ext_suffix)): #pragma: no cover
             outerr= e

diff --git a/galpy/potential/interpRZPotential.py b/galpy/potential/interpRZPotential.py
@@ -22,8 +22,13 @@
 else: #pragma: no cover
     _ext_suffix= '.so'
 for path in sys.path:
+    if not os.path.isdir(path): continue
     try:
-        _lib = ctypes.CDLL(os.path.join(path,'galpy_interppotential_c%s' % _ext_suffix))
+        if sys.platform == 'win32' and sys.version_info >= (3,8):
+            with os.add_dll_directory(path):
+                _lib = ctypes.CDLL(os.path.join(path,'galpy_integrate_c%s' % _ext_suffix))
+        else:
+            _lib = ctypes.CDLL(os.path.join(path,'galpy_interppotential_c%s' % _ext_suffix))
     except OSError as e:
         if os.path.exists(os.path.join(path,'galpy_interppotential_c%s' % _ext_suffix)): #pragma: no cover
             outerr= e