Skip to content
Draft
Changes from all commits
Commits
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
16 changes: 6 additions & 10 deletions scripts/firedrake-configure
Original file line number Diff line number Diff line change
Expand Up @@ -845,6 +845,7 @@ OFFICIAL_ARCHS: Mapping[ArchKey, Arch] = {
"cmake",
"fftw",
"hwloc",
"hdf5-mpi",
"metis",
"openblas",
"openmpi",
Expand All @@ -855,13 +856,13 @@ OFFICIAL_ARCHS: Mapping[ArchKey, Arch] = {
extra_petsc_configure_options=[
# External packages
"--with-fftw-dir=/opt/homebrew",
"--with-hdf5-dir=/opt/homebrew",
"--with-hwloc-dir=/opt/homebrew",
"--with-metis-dir=/opt/homebrew",
"--with-scalapack-dir=/opt/homebrew",
"--with-suitesparse-dir=/opt/homebrew",
"--with-zlib-dir=/opt/homebrew",
"--download-bison",
"--download-hdf5",
"--download-hypre",
"--download-mumps",
"--download-netcdf",
Expand All @@ -876,10 +877,7 @@ OFFICIAL_ARCHS: Mapping[ArchKey, Arch] = {
coptflags=["-O3", "-march=native", "-mtune=native"],
cxxoptflags=["-O3", "-march=native", "-mtune=native"],
foptflags=["-O3"],
extra_env_vars={
"HDF5_DIR": "$PETSC_DIR/$PETSC_ARCH",
"CC": "mpicc",
},
extra_env_vars={"HDF5_DIR": "/opt/homebrew"},
),

(OS.MACOS_ARM64, ScalarType.COMPLEX, IntType.INT32, GPUPlatform.NO_GPU): Arch(
Expand All @@ -899,6 +897,7 @@ OFFICIAL_ARCHS: Mapping[ArchKey, Arch] = {
"cmake",
"fftw",
"hwloc",
"hdf5-mpi",
"metis",
"openblas",
"openmpi",
Expand All @@ -911,13 +910,13 @@ OFFICIAL_ARCHS: Mapping[ArchKey, Arch] = {

# External packages
"--with-fftw-dir=/opt/homebrew",
"--with-hdf5-dir=/opt/homebrew",
"--with-hwloc-dir=/opt/homebrew",
"--with-metis-dir=/opt/homebrew",
"--with-scalapack-dir=/opt/homebrew",
"--with-suitesparse-dir=/opt/homebrew",
"--with-zlib-dir=/opt/homebrew",
"--download-bison",
"--download-hdf5",
"--download-mumps",
"--download-netcdf",
"--download-pnetcdf",
Expand All @@ -931,10 +930,7 @@ OFFICIAL_ARCHS: Mapping[ArchKey, Arch] = {
coptflags=["-O3", "-march=native", "-mtune=native"],
cxxoptflags=["-O3", "-march=native", "-mtune=native"],
foptflags=["-O3"],
extra_env_vars={
"HDF5_DIR": "$PETSC_DIR/$PETSC_ARCH",
"CC": "mpicc",
},
extra_env_vars={"HDF5_DIR": "/opt/homebrew"},
),

# Sane default configurations for unknown platforms
Expand Down
Loading