MPI headers need some tweaking

neuronsimulator · Jan 13, 2025 · 44ef470 · 44ef470
1 parent de3fcc8
commit 44ef470
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/packaging/python/build_wheels.bash b/packaging/python/build_wheels.bash
@@ -193,7 +193,15 @@ coreneuron=$3
 case "$1" in
 
   linux)
-    MPI_INCLUDE_HEADERS="/usr/include/openmpi-$(uname -m);/usr/include/mpich-$(uname -m)"
+    MPI_POSSIBLE_INCLUDE_HEADERS="/usr/include/openmpi-$(uname -m) /usr/include/mpich-$(uname -m) /usr/lib/$(uname -m)-linux-gnu/openmpi/include /usr/include/$(uname -m)-linux-gnu/mpich"
+    MPI_INCLUDE_HEADERS=""
+    for dir in $MPI_POSSIBLE_INCLUDE_HEADERS
+    do
+        if [ -d "${dir}" ]; then
+            MPI_INCLUDE_HEADERS="${MPI_INCLUDE_HEADERS};${dir}"
+        fi
+    done
+
     # Check for MPT headers. On Azure, we extract them from a secure file and mount them in the docker image in:
     MPT_INCLUDE_PATH="/nrnwheel/mpt/include"
     if [ -d "$MPT_INCLUDE_PATH" ]; then
@@ -223,7 +231,14 @@ case "$1" in
     else
         # first two are for AlmaLinux 8 (default for manylinux_2_28);
         # second two are for Debian/Ubuntu derivatives
-        MPI_INCLUDE_HEADERS="/usr/include/openmpi-$(uname -m);/usr/include/mpich-$(uname -m);/usr/lib/$(uname -m)-linux-gnu/openmpi/include;/usr/include/$(uname -m)-linux-gnu/mpich"
+        MPI_POSSIBLE_INCLUDE_HEADERS="/usr/include/openmpi-$(uname -m) /usr/include/mpich-$(uname -m) /usr/lib/$(uname -m)-linux-gnu/openmpi/include /usr/include/$(uname -m)-linux-gnu/mpich"
+        MPI_INCLUDE_HEADERS=""
+        for dir in $MPI_POSSIBLE_INCLUDE_HEADERS
+        do
+            if [ -d "${dir}" ]; then
+                MPI_INCLUDE_HEADERS="${MPI_INCLUDE_HEADERS};${dir}"
+            fi
+        done
         build_wheel_linux $(which python3) "$coreneuron" "$MPI_INCLUDE_HEADERS"
     fi
     ls wheelhouse/