diff --git a/scripts/firedrake-configure b/scripts/firedrake-configure index 099fe0be2d..a3d511c39b 100755 --- a/scripts/firedrake-configure +++ b/scripts/firedrake-configure @@ -462,7 +462,6 @@ OFFICIAL_ARCHS: Mapping[ArchKey, Arch] = { # PETSc external packages "libfftw3-dev", "libfftw3-mpi-dev", - "libhdf5-mpi-dev", "libhwloc-dev", "libhypre-dev", "libmumps-ptscotch-dev", @@ -480,14 +479,10 @@ OFFICIAL_ARCHS: Mapping[ArchKey, Arch] = { extra_petsc_configure_options=[ "--with-bison", "--with-fftw", - "--with-hdf5-include=/usr/include/hdf5/openmpi", - "--with-hdf5-lib=[/usr/lib/x86_64-linux-gnu/hdf5/openmpi/libhdf5.so,/usr/lib/x86_64-linux-gnu/hdf5/openmpi/libhdf5_hl.so]", "--with-hwloc", "--with-hypre", "--with-metis", "--with-mumps", - "--with-netcdf", - "--with-pnetcdf", "--with-ptscotch", "--with-ptscotch-lib='-lptesmumps -lptscotch -lptscotcherr -lesmumps -lscotch -lscotcherr'", "--with-ptscotch-include=/usr/include/scotch", @@ -495,6 +490,9 @@ OFFICIAL_ARCHS: Mapping[ArchKey, Arch] = { "--with-suitesparse", "--with-superlu_dist", "--with-zlib", + "--download-hdf5", + "--download-netcdf", + "--download-pnetcdf", ], coptflags=["-O3", "-march=native", "-mtune=native"], cxxoptflags=["-O3", "-march=native", "-mtune=native"], @@ -504,6 +502,10 @@ OFFICIAL_ARCHS: Mapping[ArchKey, Arch] = { "/usr/include/superlu", "/usr/include/superlu-dist", ], + extra_env_vars={ + "HDF5_DIR": "$PETSC_DIR/$PETSC_ARCH", + "CC": "mpicc", + }, ), (OS.UBUNTU_2604_X86_64, ScalarType.COMPLEX, IntType.INT32, GPUPlatform.NO_GPU): Arch(