More fixes to AlmaLinux CI.

BioDynaMo · Feb 28, 2024 · 48499e9 · 48499e9
1 parent 17f4125
commit 48499e9
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/.github/workflows/almalinux-ci.yml b/.github/workflows/almalinux-ci.yml
@@ -79,8 +79,8 @@ jobs:
         eval "$(pyenv init --path)"
         eval "$(pyenv init -)"
         pyenv shell 3.9.1
-        #. /etc/profile.d/modules.sh || true
-        #module load mpi
+        . /etc/profile.d/modules.sh || true
+        module load mpi
         cmake -G Ninja \
           -Dparaview=OFF \
           -Dbenchmark=ON \

diff --git a/.github/workflows/almalinux-system-ci.yml b/.github/workflows/almalinux-system-ci.yml
@@ -118,8 +118,8 @@ jobs:
         eval "$(pyenv init --path)"
         eval "$(pyenv init -)"
         pyenv shell 3.9.1
-        #. /etc/profile.d/modules.sh || true
-        #module load mpi
+        . /etc/profile.d/modules.sh || true
+        module load mpi
         cmake \
           -Dparaview=OFF \
           -Dbenchmark=ON \
@@ -139,7 +139,6 @@ jobs:
     #     eval "$(pyenv init --path)"
     #     eval "$(pyenv init -)"
     #     pyenv shell 3.9.1
-    #     . scl_source enable devtoolset-10 || true
     #     . /etc/profile.d/modules.sh || true
     #     module load mpi
     #     cmake \

diff --git a/cmake/external/SHA256Digests.cmake b/cmake/external/SHA256Digests.cmake
@@ -92,4 +92,5 @@ SET(centos-7-ParaView 45d545e75baf32c9fe30944781b4f6b172d4efd7d6cd794dcd19ec671c
 SET(centos-7-Qt 4308621ff9ec84585c3aead92a9d2de787b3c700323333b6e78ed45d04a0d2a4)
 SET(centos-7-ROOT 54298aa5f13dc2942925c10d755768f81f53d7135ac1a3e698e9b7ef1a3dfd1e)
 
+SET(almalinux-9.3-ROOT 9231fdebcce4794623bfa4f703ad7ba51da01acf6ed3ccfa8fe65bf26e5958ef)
 SET(almalinux-9.3-aarch64-ROOT f72e4abbfcaeca16cba862310d4dada2d6a7eda16e1044bcdaea9321e50ae48a)
diff --git a/util/installation/common/install.sh b/util/installation/common/install.sh
@@ -51,6 +51,21 @@ if [ $BDM_OS = "centos-7" ]; then
   module load mpi
 fi
 
+if [ $BDM_OS = "almalinux-9.3" ]; then
+  # Turn of NUMA for Github Actions CentOS runner, because we get "mbind
+  # operation not permitted errors", due to docker security constraints
+  if [ ! -z ${GITHUB_ACTIONS+x} ]; then
+    BDM_CMAKE_FLAGS="$BDM_CMAKE_FLAGS -Dnuma=off"
+  fi
+
+  #if [ -z ${CXX} ] && [ -z ${CC} ] ; then
+  #  . scl_source enable devtoolset-10
+  #fi
+
+  . /etc/profile.d/modules.sh
+  module load mpi
+fi
+
 if [ "$BDM_OS" != "osx" ]; then
   export PYENV_ROOT="$HOME/.pyenv"
   export PATH="$PYENV_ROOT/bin:$PATH"