Fix: Windows add_dll_directory Expand (#272)

Expand paths in `PATH` environment variable before adding them and make them absolute paths.
AMReX-Codes · Mar 1, 2024 · bfb599f · bfb599f
1 parent 1b50287
commit bfb599f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/amrex/space1d/__init__.py b/src/amrex/space1d/__init__.py
@@ -14,8 +14,9 @@
     # add anything in PATH
     paths = os.environ.get("PATH", "")
     for p in paths.split(";"):
-        if os.path.exists(p):
-            os.add_dll_directory(p)
+        p_abs = os.path.abspath(os.path.expanduser(os.path.expandvars(p)))
+        if os.path.exists(p_abs):
+            os.add_dll_directory(p_abs)
 
 # import core bindings to C++
 from . import amrex_1d_pybind

diff --git a/src/amrex/space2d/__init__.py b/src/amrex/space2d/__init__.py
@@ -14,8 +14,9 @@
     # add anything in PATH
     paths = os.environ.get("PATH", "")
     for p in paths.split(";"):
-        if os.path.exists(p):
-            os.add_dll_directory(p)
+        p_abs = os.path.abspath(os.path.expanduser(os.path.expandvars(p)))
+        if os.path.exists(p_abs):
+            os.add_dll_directory(p_abs)
 
 # import core bindings to C++
 from . import amrex_2d_pybind

diff --git a/src/amrex/space3d/__init__.py b/src/amrex/space3d/__init__.py
@@ -14,8 +14,9 @@
     # add anything in PATH
     paths = os.environ.get("PATH", "")
     for p in paths.split(";"):
-        if os.path.exists(p):
-            os.add_dll_directory(p)
+        p_abs = os.path.abspath(os.path.expanduser(os.path.expandvars(p)))
+        if os.path.exists(p_abs):
+            os.add_dll_directory(p_abs)
 
 # import core bindings to C++
 from . import amrex_3d_pybind