Re-enable MPI for windows.

davidt0x · Oct 2, 2024 · 748be1e · 748be1e
1 parent 5225f31
commit 748be1e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -26,7 +26,7 @@ jobs:
       - uses: mpi4py/setup-mpi@v1
         if: ${{ contains(matrix.os, 'windows') }}
         with:
-          mpi: intel
+          mpi: intelmpi
 
       # Else, use the default for the OS and setup-mpi action
       - uses: mpi4py/setup-mpi@v1
@@ -55,7 +55,16 @@ jobs:
       fail-fast: false
     steps:
       - uses: actions/checkout@v4
+
+      # Use intel mpi on windows
+      - uses: mpi4py/setup-mpi@v1
+        if: ${{ contains(matrix.os, 'windows') }}
+        with:
+          mpi: intelmpi
+
+      # Else, use the default for the OS and setup-mpi action
       - uses: mpi4py/setup-mpi@v1
+        if: ${{ !contains(matrix.os, 'windows') }}
 
       # Used to host cibuildwheel
       - uses: actions/setup-python@v5

diff --git a/pyproject.toml b/pyproject.toml
@@ -171,7 +171,7 @@ before-all = "python -m pip install mpi4py --extra-index-url https://pypi.anacon
 before-test = [
     "python -m pip install mpi4py --extra-index-url https://pypi.anaconda.org/mpi4py/simple",
 ]
-test-command = "python -m mpi4py -m pytest {project}/tests"
+#test-command = "mpiexec python -m mpi4py -m pytest {project}/tests"
 
 [tool.cibuildwheel.macos]
 before-all = [