diff --git a/config/packages.json b/config/packages.json index 436226d..266b0d1 100644 --- a/config/packages.json +++ b/config/packages.json @@ -4,7 +4,12 @@ "issm" ], "injection": [ - "openmpi", - "access-triangle" + "access-triangle", + "open-mpi", + "petsc", + "netcdf", + "hdf5", + "intel-mkl", + "python" ] } diff --git a/config/versions.json b/config/versions.json index 2e0bd08..7cb7b7b 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "$schema": "https://raw.githubusercontent.com/ACCESS-NRI/schema/main/au.org.access-nri/model/deployment/config/versions/3-0-0.json", "spack": "0.22", - "spack-packages": "2025.04.001" + "spack-packages": "142f9ce2a10f4d3445e06c8b98c198f2ebdb4a15" } diff --git a/spack.yaml b/spack.yaml index 3075665..8648db3 100644 --- a/spack.yaml +++ b/spack.yaml @@ -1,29 +1,44 @@ spack: specs: - - access-issm@git.2025.03.0 + - access-issm@git.2025.06.0 + + # Create a unified view of all installed packages + view: true + # Make the solver unify dependencies + concretizer: + unify: true + packages: + all: + require: + - 'target=x86_64' + issm: require: - - '@git.2025.04.11' + - '@git.d52ab3f049920f1a5b0432938f1279ba09c3a8cf' - +wrappers - # Mark Python 3.9.2 as external so Spack reuses the system module - python: - externals: - - spec: python@3.9.2 - modules: - - python3/3.9.2 - prefix: /apps/python3/3.9.2 - buildable: false + - +py-tools + openmpi: require: - - '@4.1.7' - # “all” can remain empty if you aren’t forcing any particular compiler / MPI - all: + - '@4.1.3' + + petsc: require: - - '%gcc@13' - - 'target=x86_64' - # Create a unified view of all installed packages - view: true - # Make the solver unify dependencies - concretizer: - unify: true + - '@3.17.4' + + netcdf-c: + require: + - '@4.8.0p' + + hdf5: + require: + - '@1.10.7p' + + intel-mkl: + require: + - '@2020.3.304' + + python: + require: + - '@3.11.7' \ No newline at end of file