Skip to content

Commit

Permalink
Merge pull request #353 from xylar/switch_to_spack
Browse files Browse the repository at this point in the history
Switch to building system libraries with Spack
  • Loading branch information
xylar authored Apr 14, 2022
2 parents 2120fb9 + 876251c commit 6b95495
Show file tree
Hide file tree
Showing 35 changed files with 701 additions and 778 deletions.
8 changes: 6 additions & 2 deletions compass/machines/anvil.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,9 @@ mpi_intel = impi
# the system MPI library to use for gnu compiler
mpi_gnu = mvapich

# the base path to system libraries to be added as part of setting up compass
system_libs = /lcrc/soft/climate/compass/anvil/system
# the base path for spack environments used by compass
spack = /lcrc/soft/climate/compass/anvil/spack

# whether to use the same modules for hdf5, netcdf-c, netcdf-fortran and
# pnetcdf as E3SM (spack modules are used otherwise)
use_e3sm_hdf5_netcdf = True
8 changes: 6 additions & 2 deletions compass/machines/badger.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,9 @@ mpi_intel = impi
# the system MPI library to use for gnu compiler
mpi_gnu = mvapich

# the base path to system libraries to be added as part of setting up compass
system_libs = /usr/projects/climate/SHARED_CLIMATE/compass/badger/system
# the base path for spack environments used by compass
spack = /usr/projects/climate/SHARED_CLIMATE/compass/badger/spack

# whether to use the same modules for hdf5, netcdf-c, netcdf-fortran and
# pnetcdf as E3SM (spack modules are used otherwise)
use_e3sm_hdf5_netcdf = False
8 changes: 6 additions & 2 deletions compass/machines/chrysalis.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,9 @@ mpi_intel = impi
# the system MPI library to use for gnu compiler
mpi_gnu = openmpi

# the base path to system libraries to be added as part of setting up compass
system_libs = /lcrc/soft/climate/compass/chrysalis/system
# the base path for spack environments used by compass
spack = /lcrc/soft/climate/compass/chrysalis/spack

# whether to use the same modules for hdf5, netcdf-c, netcdf-fortran and
# pnetcdf as E3SM (spack modules are used otherwise)
use_e3sm_hdf5_netcdf = True
10 changes: 8 additions & 2 deletions compass/machines/compy.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,11 @@ mpi_intel = impi
# the system MPI library to use for gnu compiler
mpi_pgi = mvapich2

# the base path to system libraries to be added as part of setting up compass
system_libs = /share/apps/E3SM/conda_envs/compass/system
# the base path for spack environments used by compass
spack = /share/apps/E3SM/conda_envs/compass/spack

# whether to use the same modules for hdf5, netcdf-c, netcdf-fortran and
# pnetcdf as E3SM (spack modules are used otherwise)
#
# We don't use them on Compy because hdf5 and netcdf were build without MPI
use_e3sm_hdf5_netcdf = False
9 changes: 9 additions & 0 deletions compass/machines/conda-linux.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Options related to deploying a compass conda environment on supported
# machines
[deploy]

# the compiler set to use for system libraries and MPAS builds
compiler = gnu

# the system MPI library to use for gnu compiler
mpi_gnu = mpich
9 changes: 9 additions & 0 deletions compass/machines/conda-osx.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Options related to deploying a compass conda environment on supported
# machines
[deploy]

# the compiler set to use for system libraries and MPAS builds
compiler = clang

# the system MPI library to use for gnu compiler
mpi_gnu = mpich
8 changes: 6 additions & 2 deletions compass/machines/cori-haswell.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,12 @@ mpi_intel = mpt
# the system MPI library to use for gnu compiler
mpi_gnu = mpt

# the base path to system libraries to be added as part of setting up compass
system_libs = /global/cfs/cdirs/e3sm/software/compass/cori-haswell/system
# the base path for spack environments used by compass
spack = /global/cfs/cdirs/e3sm/software/compass/cori-haswell/spack

# whether to use the same modules for hdf5, netcdf-c, netcdf-fortran and
# pnetcdf as E3SM (spack modules are used otherwise)
use_e3sm_hdf5_netcdf = True

# the version of ESMF to build if using system compilers and MPI (don't build)
esmf = None
36 changes: 0 additions & 36 deletions compass/machines/cori-knl.cfg

This file was deleted.

33 changes: 0 additions & 33 deletions compass/machines/grizzly.cfg

This file was deleted.

7 changes: 7 additions & 0 deletions conda/albany_supported.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# a list of supported machine, compiler and mpi combinations for Albany

anvil, gnu, mvapich
anvil, gnu, openmpi
badger, gnu, mvapich
chrysalis, gnu, openmpi
cori-haswell, gnu, mpt
Loading

0 comments on commit 6b95495

Please sign in to comment.