Merge remote-tracking branch 'jcsda/feature/update_to_spack_v1' into feature/new_atlas_and_dependency_versions

Author: fmahebert

configs/common/modules_lmod.yaml

@@ -23,6 +23,7 @@ modules:
       - berkeley-db
       - bison
       - bzip2
+      - compiler-wrapper
       - diffutils
       - expat
       - findutils
@@ -93,6 +94,7 @@ modules:
       - apple-clang
       - gcc
       - intel-oneapi-compilers
+      - intel-oneapi-compilers-classic
       - llvm
       # By default, do not create MPI modules
       - cray-mpich

configs/common/modules_tcl.yaml

@@ -42,6 +42,7 @@ modules:
       - berkeley-db
       - bison
       - bzip2
+      - compiler-wrapper
       - diffutils
       - expat
       - findutils
@@ -112,6 +113,7 @@ modules:
       - apple-clang
       - gcc
       - intel-oneapi-compilers
+      - intel-oneapi-compilers-classic
       - llvm
       # By default, do not create MPI modules
       - cray-mpich

configs/common/packages.yaml

@@ -1,10 +1,14 @@
 packages:
-    all:
-      providers:
-        jpeg: [libjpeg-turbo]
-        pkgconfig: [pkg-config]
-        yacc: [bison]
-        zlib-api: [zlib]
+    # Virtual provider settings
+    jpeg:
+      require: [libjpeg-turbo]
+    pkgconfig:
+      require: [pkg-config]
+    yacc:
+      require: [bison]
+    zlib-api:
+      require: [zlib]
+    # Individual package settings
     awscli-v2:
       require:
       - ~examples
@@ -139,6 +143,8 @@ packages:
     #glib:
     #  require:
     #  - '@:2.78.3'
+    global-workflow-env:
+      require: ['+uwtools']
     ## To avoid duplicate packages being built
     #gmake:
     #  require:

configs/common/packages_clang.yaml

@@ -2,17 +2,17 @@ packages:
     all:
       prefer:
       - '%clang'
-      providers:
-        blas: [openblas]
-        fftw-api: [fftw]
-        lapack: [openblas]
+    # Virtual provider settings
+    blas:
+      require: [openblas]
+    fftw-api:
+      require: [fftw]
+    lapack:
+      require: [openblas]
+    # Individual package settings
     ectrans:
       require:
-      - ~mkl +fftw
+      - +fftw
     ip:
       require:
-      - '^openblas'
       - '~openmp'
-    py-numpy:
-      require:
-      - '^openblas'

configs/common/packages_gcc.yaml

@@ -2,16 +2,14 @@ packages:
     all:
       prefer:
       - '%gcc'
-      providers:
-        blas: [openblas]
-        fftw-api: [fftw]
-        lapack: [openblas]
+    # Virtual provider settings
+    blas:
+      require: [openblas]
+    fftw-api:
+      require: [fftw]
+    lapack:
+      require: [openblas]
+    # Individual package settings
     ectrans:
       require:
-      - ~mkl +fftw
-    ip:
-      require:
-      - '^openblas'
-    py-numpy:
-      require:
-      - '^openblas'
+      - +fftw

configs/common/packages_oneapi.yaml

@@ -2,10 +2,14 @@ packages:
     all:
       prefer:
       - '%oneapi'
-      providers:
-        blas: [intel-oneapi-mkl]
-        fftw-api: [intel-oneapi-mkl]
-        lapack: [intel-oneapi-mkl]
+    # Virtual package settings
+    blas:
+      require: ['intel-oneapi-mkl']
+    fftw-api:
+      require: ['intel-oneapi-mkl']
+    lapack:
+      require: ['intel-oneapi-mkl']
+    # Individual package settings
     antlr:
       require:
       - '%gcc'
@@ -21,9 +25,6 @@ packages:
     gmake:
       require:
       - '%gcc'
-    ip:
-      require:
-      - '^intel-oneapi-mkl'
     libbsd:
       require:
       - '%gcc'
@@ -42,9 +43,6 @@ packages:
     py-maturin:
       require:
       - '%gcc'
-    py-numpy:
-      require:
-      - '^intel-oneapi-mkl'
     qt:
       require:
       - '%gcc'

configs/sites/tier1/acorn/config.yaml

@@ -1,3 +1,6 @@
 config:
   build_jobs: 6
   build_stage: $tempdir/$user/spack-stage
+  template_dirs:
+  - $env/site/templates
+  - $spack/share/spack/templates

configs/sites/tier1/acorn/deployments.yaml

@@ -0,0 +1,51 @@
+deployments:
+  - template: "unified-dev"
+    compilers: ["oneapi-2024.2.1", "intel-19.1.3.304"]
+    packages_to_install:
+    - ufs-weather-model-env
+    - global-workflow-env
+    - gsi-env
+    - madis
+    only_concretize_requested_packages: true
+    duplicates_to_ignore: ["esmf", "mapl", "py-cython"]
+    allowed_gcc_packages:
+    - antlr
+    - bison
+    - cmake
+    - gcc
+    - gettext
+    - gmake
+    - go
+    - ninja
+    - py-numpy
+
+  - template: "nco"
+    compilers: ["oneapi-2024.2.1", "intel-19.1.3.304"]
+    duplicates_to_ignore: ["crtm", "crtm-fix", "boost", "harfbuzz"]
+    allowed_gcc_packages:
+    - antlr
+    - apr
+    - bison
+    - boost
+    - cmake
+    - gcc
+    - gettext
+    - glib
+    - gmake
+    - go
+    - harfbuzz
+    - icu4c
+    - libbsd
+    - ninja
+    - pixman
+    - py-numpy
+    - qt
+    - subversion
+    walltime: 03:15:00
+    site: wcoss2
+
+batch_config:
+  scheduler: pbspro
+  account: NCEPLIBS-DEV
+  queue: dev
+  default_walltime: 02:30:00

configs/sites/tier1/acorn/packages.yaml

@@ -1,47 +1,47 @@
-  packages:
-    ip:
-      require: '+alltests'
-    git:
-      buildable: false
-      externals:
-      - spec: [email protected]
-        prefix: /usr
-    git-lfs:
-      buildable: false
-      externals:
-      - spec: [email protected]
-        modules: [git-lfs/2.11.0]
-    mysql:
-      buildable: false
-      externals:
-      - spec: [email protected]
-        prefix: /lfs/h1/emc/nceplibs/noscrub/spack-stack/externals/mysql/mysql-8.0.31-linux-glibc2.17-x86_64-minimal
-    ecflow::
-      buildable: false
-      externals:
-      - spec: [email protected]
-        modules: [ecflow/5.6.0.13]
-    pkg-config:
-      buildable: false
-      externals:
-      - spec: [email protected]
-        prefix: /usr
-    patchelf:
-      version: ['0.13.1']
-    gettext:
-      version: ['0.19.7']
-    rhash:
-      version: ['1.3.5']
-    gdal:
-      variants: ~curl
-    flex:
-      buildable: false
-      externals:
-      - spec: [email protected]+lex
-        prefix: /usr
-    grep:
-      externals:
-      - spec: [email protected]
-        prefix: /usr
-    libxslt:
-      require: '~crypto'
+packages:
+  # Don't build compilers
+  c:
+    buildable: false
+  cxx:
+    buildable: false
+  fortran:
+    buildable: false
+  #
+  ### Providers
+  #
+  blas:
+    require:: ['openblas']
+  fftw-api:
+    require: ['fftw']
+  jpeg:
+    require: ['libjpeg-turbo']
+  lapack:
+    require:: ['openblas']
+  mkl:
+    buildable: false
+  mpi:
+    buildable: false
+    require: ['cray-mpich']
+  #
+  ### Individual package settings
+  #
+  curl:
+    require: ['~nghttp2']
+  flex:
+    require: ['@2.6.4']
+  gdal:
+    require: ['~curl']
+  global-workflow-env:
+    require:: ['~uwtools']
+  icu4c:
+    require: ['%gcc']
+  libxslt:
+    require: ['~crypto']
+  nco:
+    require:: ['%oneapi']
+  py-pandas:
+    require:: ['~excel']
+  subversion:
+    require: ['~serf', '+pic']
+  zlib-ng:
+    require: ['+compat', '~new_strategies']