Does it work now?

firedrakeproject · Dec 13, 2024 · af6565f · af6565f
1 parent b655163
commit af6565f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -66,6 +66,7 @@ jobs:
             --mpicxx="$MPICH_DIR"/mpicxx \
             --mpif90="$MPICH_DIR"/mpif90 \
             --mpiexec="$MPICH_DIR"/mpiexec \
+            --mpihome="$MPICH_DIR"/.. \
             --venv-name firedrake_venv \
             --no-package-manager \
             --disable-ssh \

diff --git a/.github/workflows/pip-mac.yml b/.github/workflows/pip-mac.yml
@@ -82,6 +82,7 @@ jobs:
           export CXX=/opt/homebrew/bin/mpicxx
           export MPICC="$CC"
           source pip_venv/bin/activate
+          python -m pip install 'rtree>=1.2'
           cd pip_venv/src
           python -m pip install \
             --log=firedrake-install.log \

diff --git a/docker/Dockerfile.complex b/docker/Dockerfile.complex
@@ -18,5 +18,6 @@ RUN bash -c "python3 firedrake-install \
     --mpicxx=$MPICH_DIR/mpicxx \
     --mpif90=$MPICH_DIR/mpif90 \
     --mpiexec=$MPICH_DIR/mpiexec \
+    --mpihome=$MPICH_DIR/.. \
     --slepc \
     --documentation-dependencies"
diff --git a/docker/Dockerfile.vanilla b/docker/Dockerfile.vanilla
@@ -16,4 +16,5 @@ RUN bash -c "python3 firedrake-install \
     --mpicc=$MPICH_DIR/mpicc \
     --mpicxx=$MPICH_DIR/mpicxx \
     --mpif90=$MPICH_DIR/mpif90 \
-    --mpiexec=$MPICH_DIR/mpiexec"
+    --mpiexec=$MPICH_DIR/mpiexec \
+    --mpihome=$MPICH_DIR/.."
diff --git a/docs/source/parallelism.rst b/docs/source/parallelism.rst
@@ -45,11 +45,12 @@ firedrake installer to use it, by running:
 
 .. code-block:: shell
 
-   python3 firedrake-install --mpiexec=mpiexec --mpicc=mpicc --mpicxx=mpicxx --mpif90=mpif90
+   python3 firedrake-install --mpiexec=mpiexec --mpicc=mpicc --mpicxx=mpicxx --mpif90=mpif90 --mpihome mpihome
 
 where ``mpiexec``, ``mpicc``, ``mpicxx``, and ``mpif90`` are the
 commands to run an MPI job and to compile C, C++, and Fortran 90 code,
-respectively.
+respectively. ``mpihome`` is an extra variable that must point to the
+root directory of the MPI installation (e.g. ``/usr`` or ``/opt/mpich``).
 
 Printing in parallel
 ====================