From af6565f1a5b0d177319016dafef7367bcee73fe1 Mon Sep 17 00:00:00 2001 From: Connor Ward Date: Fri, 13 Dec 2024 13:59:29 +0000 Subject: [PATCH] Does it work now? --- .github/workflows/build.yml | 1 + .github/workflows/pip-mac.yml | 1 + docker/Dockerfile.complex | 1 + docker/Dockerfile.vanilla | 3 ++- docs/source/parallelism.rst | 5 +++-- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 909db6990a..0eb616c24d 100644 --- 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 index 1410a2f383..3188279a3e 100644 --- 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 index 1528f5c4ac..6aa73f280c 100644 --- 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 index 2de26b1916..eee3ef53e3 100644 --- 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 index 70fc119e98..d71b3d9305 100644 --- 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 ====================