diff --git a/README.md b/README.md index 3c83b7e32..2c2048225 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,8 @@ Spack-stack is a framework for installing software libraries to support -NOAA's Unified Forecast System (UFS) applications and the -Joint Effort for Data assimilation Integration (JEDI) coupled to -several Earth system prediction models (MPAS, NEPTUNE, UM, FV3, GEOS, UFS). +a wide range of numerical weather prediction and data assimilation systems +developed by the spack-stack project partners: UFS, MPAS, NEPTUNE, FV3, GEOS, JEDI, ... Spack-stack supports installations on a range of R&D and operational platforms. It provides a set of installation templates (package lists), default package settings, @@ -29,6 +28,7 @@ Spack-stack is a collaborative effort between: * [UCAR Joint Center for Satellite Data Assimilation (JCSDA)](https://www.jcsda.org) * [Earth Prediction Innovation Center (EPIC)](https://epic.noaa.gov) * [U.S. Naval Research Laboratory (NRL)](https://https://www.nrl.navy.mil) +* [NASA Global Modeling and Assimilation Office (GMAO)](https://gmao.gsfc.nasa.gov) For more information about the organization of the spack-stack project, see the [Project Charter](project_charter.md). diff --git a/configs/sites/tier1/discover-scu17/compilers.yaml b/configs/sites/tier1/discover-scu17/compilers.yaml deleted file mode 100644 index a58e0b0b2..000000000 --- a/configs/sites/tier1/discover-scu17/compilers.yaml +++ /dev/null @@ -1,106 +0,0 @@ -compilers: -- compiler: - spec: intel@=2021.10.0 - paths: - cc: /usr/local/intel/oneapi/2021/compiler/2023.2.1/linux/bin/intel64/icc - cxx: /usr/local/intel/oneapi/2021/compiler/2023.2.1/linux/bin/intel64/icpc - f77: /usr/local/intel/oneapi/2021/compiler/2023.2.1/linux/bin/intel64/ifort - fc: /usr/local/intel/oneapi/2021/compiler/2023.2.1/linux/bin/intel64/ifort - flags: {} - operating_system: sles15 - target: x86_64 - modules: - - comp/intel/2023.2.1 - environment: - prepend_path: - PATH: '/usr/local/other/gcc/11.4.0/bin' - CPATH: '/usr/local/other/gcc/11.4.0/include' - LD_LIBRARY_PATH: '/usr/local/intel/oneapi/2021/compiler/2023.2.1/linux/compiler/lib/intel64_lin:/usr/local/other/gcc/11.4.0/lib64' - set: - # https://github.com/JCSDA/spack-stack/issues/1011 - I_MPI_SHM_HEAP_VSIZE: '512' - PSM2_MEMORY: 'large' - # https://github.com/JCSDA/spack-stack/issues/1012 - I_MPI_EXTRA_FILESYSTEM: '1' - I_MPI_EXTRA_FILESYSTEM_FORCE: 'gpfs' - I_MPI_FABRICS: 'ofi' - I_MPI_OFI_PROVIDER: 'psm3' - I_MPI_ADJUST_SCATTER: '2' - I_MPI_ADJUST_SCATTERV: '2' - I_MPI_ADJUST_GATHER: '2' - I_MPI_ADJUST_GATHERV: '3' - I_MPI_ADJUST_ALLGATHER: '3' - I_MPI_ADJUST_ALLGATHERV: '3' - I_MPI_ADJUST_ALLREDUCE: '12' - I_MPI_ADJUST_REDUCE: '10' - I_MPI_ADJUST_BCAST: '11' - I_MPI_ADJUST_REDUCE_SCATTER: '4' - I_MPI_ADJUST_BARRIER: '9' - extra_rpaths: [] -- compiler: - spec: oneapi@=2024.2.0 - paths: - cc: /usr/local/intel/oneapi/2024/compiler/2024.2/bin/icx - cxx: /usr/local/intel/oneapi/2024/compiler/2024.2/bin/icpx - f77: /usr/local/intel/oneapi/2024/compiler/2024.2/bin/ifort - fc: /usr/local/intel/oneapi/2024/compiler/2024.2/bin/ifort - flags: {} - operating_system: sles15 - target: x86_64 - modules: - - comp/intel/2024.2.0 - environment: - prepend_path: - PATH: '/usr/local/other/gcc/11.4.0/bin' - CPATH: '/usr/local/other/gcc/11.4.0/include' - LD_LIBRARY_PATH: '/usr/local/intel/oneapi/2024/compiler/2024.2/lib/:/usr/local/other/gcc/11.4.0/lib64' - set: - # https://github.com/JCSDA/spack-stack/issues/1011 - I_MPI_SHM_HEAP_VSIZE: '512' - PSM2_MEMORY: 'large' - # https://github.com/JCSDA/spack-stack/issues/1012 - I_MPI_EXTRA_FILESYSTEM: '1' - I_MPI_EXTRA_FILESYSTEM_FORCE: 'gpfs' - I_MPI_FABRICS: 'ofi' - I_MPI_OFI_PROVIDER: 'psm3' - I_MPI_ADJUST_SCATTER: '2' - I_MPI_ADJUST_SCATTERV: '2' - I_MPI_ADJUST_GATHER: '2' - I_MPI_ADJUST_GATHERV: '3' - I_MPI_ADJUST_ALLGATHER: '3' - I_MPI_ADJUST_ALLGATHERV: '3' - I_MPI_ADJUST_ALLREDUCE: '12' - I_MPI_ADJUST_REDUCE: '10' - I_MPI_ADJUST_BCAST: '11' - I_MPI_ADJUST_REDUCE_SCATTER: '4' - I_MPI_ADJUST_BARRIER: '9' - extra_rpaths: [] -- compiler: - spec: gcc@=12.3.0 - paths: - cc: /usr/local/other/gcc/12.3.0/bin/gcc - cxx: /usr/local/other/gcc/12.3.0/bin/g++ - f77: /usr/local/other/gcc/12.3.0/bin/gfortran - fc: /usr/local/other/gcc/12.3.0/bin/gfortran - flags: {} - operating_system: sles15 - target: x86_64 - modules: - - comp/gcc/12.3.0 - environment: {} - extra_rpaths: [] -# Needed for Intel backend -- compiler: - spec: gcc@=11.4.0 - paths: - cc: /usr/local/other/gcc/11.4.0/bin/gcc - cxx: /usr/local/other/gcc/11.4.0/bin/g++ - f77: /usr/local/other/gcc/11.4.0/bin/gfortran - fc: /usr/local/other/gcc/11.4.0/bin/gfortran - flags: {} - operating_system: sles15 - target: x86_64 - modules: - - comp/gcc/11.4.0 - environment: {} - extra_rpaths: [] diff --git a/configs/sites/tier1/discover-scu17/packages_intel.yaml b/configs/sites/tier1/discover-scu17/packages_intel.yaml deleted file mode 100644 index 1e1da57a1..000000000 --- a/configs/sites/tier1/discover-scu17/packages_intel.yaml +++ /dev/null @@ -1,22 +0,0 @@ -packages: - all: - compiler:: [intel@2021.10.0,gcc@11.4.0] - providers: - mpi:: [intel-oneapi-mpi@2021.10.0] - mpi: - buildable: False - intel-oneapi-mpi: - externals: - - spec: intel-oneapi-mpi@2021.10.0%intel@=2021.10.0 +classic-names - prefix: /usr/local/intel/oneapi/2021 - modules: - - mpi/impi/2021.10.0 - intel-oneapi-mkl: - externals: - - spec: intel-oneapi-mkl@2023.2.0%intel@2021.10.0 - prefix: /usr/local/intel/oneapi/2021 - wget: - buildable: False - externals: - - spec: wget@1.20.3 - prefix: /usr diff --git a/configs/sites/tier1/discover-scu17/packages_oneapi.yaml b/configs/sites/tier1/discover-scu17/packages_oneapi.yaml index 353f834a9..b1b2a3ab7 100644 --- a/configs/sites/tier1/discover-scu17/packages_oneapi.yaml +++ b/configs/sites/tier1/discover-scu17/packages_oneapi.yaml @@ -1,10 +1,32 @@ packages: all: - compiler:: [oneapi@2024.2.0,gcc@11.4.0] providers: mpi:: [intel-oneapi-mpi@2021.13] mpi: buildable: False + intel-oneapi-compilers: + buildable: False + externals: + - spec: intel-oneapi-compilers@2024.2.0 + prefix: /usr/local/intel/oneapi/2024 + modules: + - comp/intel/2024.2.0 + extra_attributes: + compilers: + c: /usr/local/intel/oneapi/2024/compiler/2024.2/bin/icx + cxx: /usr/local/intel/oneapi/2024/compiler/2024.2/bin/icpx + fortran: /usr/local/intel/oneapi/2024/compiler/2024.2/bin/ifort + f77: /usr/local/intel/oneapi/2024/compiler/2024.2/bin/ifort + environment: + set: + # Force ifort not ifx + INTEL_COMPILER_TYPE: 'RECOMMENDED' + prepend_path: + PATH: /usr/local/other/gcc/12.3.0/bin + CPATH: /usr/local/other/gcc/12.3.0/include + LD_LIBRARY_PATH: '/usr/local/intel/oneapi/2024/compiler/2024.2/lib/:/usr/local/other/gcc/12.3.0/lib64' + extra_rpaths: + - /usr/local/other/gcc/12.3.0/lib64 intel-oneapi-mpi: externals: - spec: intel-oneapi-mpi@2021.13%oneapi@2024.2.0 @@ -12,10 +34,26 @@ packages: modules: - mpi/impi/2021.13 intel-oneapi-mkl: + buildable: false externals: - - spec: intel-oneapi-mkl@2024.2.0 + - spec: intel-oneapi-mkl@2024.2.0%oneapi@2024.2.0 prefix: /usr/local/intel/oneapi/2024 intel-oneapi-runtime: + buildable: false externals: - spec: intel-oneapi-runtime@2024.2.0%oneapi@2024.2.0 prefix: /usr/local/intel/oneapi/2024 + gcc: + externals: + - spec: gcc@12.3.0 languages:='c,c++,fortran' + prefix: /usr/local/other/gcc/12.3.0 + modules: + - comp/gcc/12.3.0 + extra_attributes: + compilers: + c: /usr/local/other/gcc/12.3.0/bin/gcc + cxx: /usr/local/other/gcc/12.3.0/bin/g++ + fortran: /usr/local/other/gcc/12.3.0/bin/gfortran + flags: {} + environment: {} + extra_rpaths: [] diff --git a/repos/builtin b/repos/builtin index 58a2d586f..97141f461 160000 --- a/repos/builtin +++ b/repos/builtin @@ -1 +1 @@ -Subproject commit 58a2d586f9aa965d2257cc3a43633e94fec61405 +Subproject commit 97141f46107fc2524b70b005452e730d63cb838c