Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Temp fix for firedrake install on Mac for Xcode16 #3964

Merged
merged 2 commits into from
Jan 10, 2025
Merged

Temp fix for firedrake install on Mac for Xcode16 #3964

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29fe15a
Temp fix for firedrake install on Mac for Xcode16
Ig-dolci Jan 10, 2025
493d5f7
Back to the master build.yml
Ig-dolci Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ jobs:
rm -rf firedrake_venv
- name: Build Firedrake
run: |
unset PETSC_DIR PETSC_ARCH SLEPC_DIR
cd ..
# Linting should ignore unquoted shell variable $COMPLEX
# shellcheck disable=SC2086
./firedrake/scripts/firedrake-install \
$COMPLEX \
--honour-petsc-dir \
--mpicc="$MPICH_DIR"/mpicc \
--mpicxx="$MPICH_DIR"/mpicxx \
--mpif90="$MPICH_DIR"/mpif90 \
Expand All @@ -87,13 +87,15 @@ jobs:
|| (cat firedrake-install.log && /bin/false)
- name: Install test dependencies
run: |
unset PETSC_DIR PETSC_ARCH SLEPC_DIR
. ../firedrake_venv/bin/activate
python "$(which firedrake-clean)"
python -m pip install \
pytest-xdist pytest-timeout ipympl
python -m pip list
- name: Test Firedrake
run: |
unset PETSC_DIR PETSC_ARCH SLEPC_DIR
. ../firedrake_venv/bin/activate
echo OMP_NUM_THREADS is "$OMP_NUM_THREADS"
echo OPENBLAS_NUM_THREADS is "$OPENBLAS_NUM_THREADS"
Expand All @@ -119,6 +121,7 @@ jobs:
- name: Test pyadjoint
if: ${{ matrix.scalar-type == 'real' }}
run: |
unset PETSC_DIR PETSC_ARCH SLEPC_DIR
. ../firedrake_venv/bin/activate
cd ../firedrake_venv/src/pyadjoint
python -m pytest \
Expand Down
4 changes: 4 additions & 0 deletions scripts/firedrake-install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,6 +792,10 @@ def get_petsc_options(minimal=False):
# on macOS with parallel solvers. Its necessity is unclear, so a
# review in the future may be required.
petsc_options.add("--LDFLAGS=-Wl,-ld_classic,-dead_strip_dylibs")
if Version(clt["version"]) >= Version("16"):
# Should revisit this flag when the the issue https://gitlab.com/petsc/petsc/-/issues/1692
# is resolved.
petsc_options.add("--with-cxx-dialect=17")
elif options.get("with_blas") is not None:
petsc_options.add("--with-blaslapack-dir={}".format(options["with_blas"]))
if osname == "Darwin":
Expand Down
Loading