Create template for unified environment, test install on orion and AWS parallelcluster

.github/actions/setup-spack-stack/action.yaml

@@ -171,6 +171,14 @@ runs:
       spack config add "packages:all:compiler:[${{ inputs.compiler }}]"
       # Set compiler as hard requirement for all packages
       spack config add "packages:all:require:one_of:['%${{ inputs.compiler }}']"
+      # DH* Add this in when switching to unified-dev
+      ## Modify the compiler matrix definition
+      #if [[ "$RUNNER_OS" == "macOS" ]]; then
+      #  sed -i '' "s/\['\%apple-clang', '\%gcc', '\%intel'\]/\['\%${{ inputs.compiler }}'\]/g" ${{ inputs.path }}/envs/${{ inputs.name }}/spack.yaml
+      #else
+      #  sed -i "s/\['\%apple-clang', '\%gcc', '\%intel'\]/\['\%${{ inputs.compiler }}'\]/g" ${{ inputs.path }}/envs/${{ inputs.name }}/spack.yaml
+      #fi
+      # *DH
 
       if [[ "$RUNNER_OS" == "macOS" ]]; then
         # Turn of SSL for ecflow CI builds for now

.github/workflows/macos-dom.yaml

@@ -13,7 +13,7 @@ on:
       template:
         description: 'Base spack.yaml template. Default is a complete JEDI-UFS environment.'
         required: true
-        default: 'skylab-dev'
+        default: 'unified-dev'
       specs:
         description: 'Which specs to add to the template. Default is none (empty string).'
         required: false
@@ -38,8 +38,8 @@ jobs:
       - name: create-env
         run: |
           source ./setup.sh
-          spack stack create env --site macos.default --template ${{ inputs.template || 'skylab-dev' }} --name ${{ inputs.template || 'skylab-dev' }}.macos-dom
-          spack env activate -d envs/${{ inputs.template || 'skylab-dev' }}.macos-dom
+          spack stack create env --site macos.default --template ${{ inputs.template || 'unified-dev' }} --name ${{ inputs.template || 'unified-dev' }}.macos-dom
+          spack env activate -d envs/${{ inputs.template || 'unified-dev' }}.macos-dom
           spack add ${{ inputs.specs || '' }}
 
           spack external find
@@ -49,8 +49,7 @@ jobs:
           PATH="/usr/local/opt/curl/bin:${PATH}" spack external find curl
           spack compiler find
 
-          ## https://github.com/dtcenter/MET/issues/2239
-          #spack remove global-workflow-env
+          sed -i '' "s/\['\%apple-clang', '\%gcc', '\%intel'\]/\['\%apple-clang'\]/g" envs/${{ inputs.template || 'unified-dev' }}.macos-dom/spack.yaml
 
           spack concretize
           spack install --fail-fast

.github/workflows/macos.yaml

@@ -62,7 +62,7 @@ jobs:
     strategy:
       matrix:
         compiler-mpi: [ {compiler: apple-clang@13.0.0, mpi: openmpi@4.1.4} ]
-        template: [skylab-dev, ufs-weather-model, ufs-srw-dev]
+        template: [skylab-dev, ufs-weather-model, ufs-srw-dev] # [unified-dev]
     runs-on: macos-11
     steps:
 

.github/workflows/ubuntu.yaml

@@ -62,7 +62,7 @@ jobs:
     strategy:
       matrix:
         compiler-mpi: [ {compiler: intel@2021.8.0, mpi: intel-oneapi-mpi@2021.8.0}, {compiler: gcc@9.4.0, mpi: mvapich2@2.3.7}, {compiler: gcc@10.3.0, mpi: mpich@4.0.2} ]
-        template: [skylab-dev, ufs-weather-model, ufs-srw-dev]
+        template: [skylab-dev, ufs-weather-model, ufs-srw-dev] # [unified-dev]
     runs-on: ubuntu-20.04
     steps:
 

.gitmodules

@@ -1,9 +1,11 @@
 [submodule "spack"]
   path = spack
-  #url = https://github.com/spack/spack
-  #branch = develop
-  url = https://github.com/NOAA-EMC/spack
-  branch = jcsda_emc_spack_stack
+  ##url = https://github.com/spack/spack
+  ##branch = develop
+  #url = https://github.com/NOAA-EMC/spack
+  #branch = jcsda_emc_spack_stack
+  url = https://github.com/climbfuji/spack
+  branch = feature/final_updates_for_unified_env
 [submodule "doc/CMakeModules"]
   path = doc/CMakeModules
   url = https://github.com/noaa-emc/cmakemodules

configs/common/modules.yaml

@@ -6,7 +6,7 @@ modules:
     arch_folder: false
     tcl:
       # Core compiler is a dummy that is not used to build the stack, do not change.
-      # Hopefully nobody is trying to build software with gcc-4.6 in 2022 ...
+      # Hopefully nobody is trying to build software with gcc-4.6 in 2023 ...
       core_compilers::
       - gcc@4.6
       projections:
@@ -233,7 +233,7 @@ modules:
 
     lmod:
       # Core compiler is a dummy that is not used to build the stack, do not change.
-      # Hopefully nobody is trying to build software with gcc-4.6 in 2022 ...
+      # Hopefully nobody is trying to build software with gcc-4.6 in 2023 ...
       core_compilers::
       - gcc@4.6
       projections:

configs/common/packages.yaml

@@ -18,8 +18,6 @@
     # Attention - when updating also check orion site config
     boost:
       version: [1.78.0]
-      # Install only the minimum needed (JEDI packages need headers only,
-      # but ecflow needs several libraries)
       variants: ~atomic +chrono +date_time +exception +filesystem ~graph ~iostreams ~locale ~log ~math ~mpi ~numpy +pic +program_options +python ~random +regex +serialization ~signals +system +test +thread +timer ~wave cxxstd=14 visibility=hidden
     bufr:
       version: [11.7.1]
@@ -34,15 +32,13 @@
     # Attention - when updating also check the various jcsda-emc-bundles env packages
     crtm:
       version: [2.4.0]
-    diffutils:
-      version: [3.7]
+      variants: +fix
     ecbuild:
       version: [3.6.5]
     eccodes:
       version: [2.27.0]
-      #variants: +netcdf
     ecflow:
-      version: [5.8.3]
+      version: [5.8.4]
       variants: +ui
     eckit:
       version: [1.20.2]
@@ -67,11 +63,6 @@
       version: [3.3.10]
     fiat:
       version: [1.1.0]
-    findutils:
-      version: [4.8.0]
-    flex:
-      version: [2.6.4]
-    # Attention - when updating also check the various jcsda-emc-bundles env packages
     fms:
       version: [2022.04]
       variants: +64bit +quad_precision +gfs_phys +openmp +fpic constants=GFS
@@ -80,7 +71,7 @@
     g2c:
       version: [1.6.4]
     g2tmpl:
-      version: [1.10.0]
+      version: [1.10.2]
     gfsio:
       version: [1.4.1]
     gftl-shared:
@@ -101,8 +92,8 @@
       version: [4.2.15]
       variants: ~fortran ~netcdf
     hdf5:
-      version: [1.12.1]
-      variants: +hl +fortran +mpi +threadsafe
+      version: [1.14.0]
+      variants: +hl +fortran +mpi +threadsafe +szip
     ip:
       version: [3.3.3]
     ip2:
@@ -142,12 +133,13 @@
     ncio:
       version: [1.1.2]
     netcdf-c:
-      version: [4.8.1]
-      variants: +dap +mpi +parallel-netcdf
+      version: [4.9.0]
+      # If using 4.9.1, turn off byterange variant to fix compile error: ~byterange
+      variants: +dap +mpi ~parallel-netcdf
     netcdf-cxx4:
       version: [4.3.1]
     netcdf-fortran:
-      version: [4.5.4]
+      version: [4.6.0]
     # ninja - when adding information here, also check Cheyenne
     # and Discover site configs
     nlohmann-json:
@@ -163,7 +155,7 @@
     openmpi:
       variants: +internal-hwloc +two_level_namespace
     parallelio:
-      version: [2.5.7]
+      version: [2.5.9]
       variants: +pnetcdf
     parallel-netcdf:
       version: [1.12.2]
@@ -174,7 +166,6 @@
       version: [1.2.2]
     proj:
       version: [8.1.0]
-      # don't really need tiff ...
       variants: ~tiff
     python:
       version: [3.10.8]

configs/sites/macos.default/packages.yaml

@@ -3,3 +3,5 @@ packages:
     variants: ~openmp
   cairo:
     variants: ~png ~svg
+  global-workflow-env:
+    variants: ~ncl

configs/sites/orion/compilers.yaml

@@ -17,6 +17,24 @@ compilers:
         LD_LIBRARY_PATH: '/apps/gcc-10.2.0/gcc-10.2.0/lib64:/apps/gcc-10.2.0/gcc-10.2.0/contrib/lib'
         CPATH: '/apps/gcc-10.2.0/gcc-10.2.0/include'
     extra_rpaths: []
+- compiler:
+    spec: intel@18.0.5
+    paths:
+      cc: /apps/intel-2018/intel-2018.u4/compilers_and_libraries_2018.5.274/linux/bin/intel64/icc
+      cxx: /apps/intel-2018/intel-2018.u4/compilers_and_libraries_2018.5.274/linux/bin/intel64/icpc
+      f77: /apps/intel-2018/intel-2018.u4/compilers_and_libraries_2018.5.274/linux/bin/intel64/ifort
+      fc: /apps/intel-2018/intel-2018.u4/compilers_and_libraries_2018.5.274/linux/bin/intel64/ifort
+    flags: {}
+    operating_system: centos7
+    target: x86_64
+    modules:
+    - intel/2018.4
+    environment:
+      prepend_path:
+        PATH: '/apps/gcc-8/gcc-8.3.0/bin'
+        LD_LIBRARY_PATH: '/apps/gcc-8/gcc-8.3.0/lib64:/apps/gcc-8/gcc-8.3.0//lib:/apps/gcc-8/gcc-8.3.0/mpfr-4.0.2/lib:/apps/gcc-8/gcc-8.3.0/mpc-1.1.0/lib:/apps/gcc-8/gcc-8.3.0/gmp-6.1.2/lib'
+        CPATH: '/apps/gcc-8/gcc-8.3.0/include'
+    extra_rpaths: []
 - compiler:
     spec: gcc@10.2.0
     paths:

configs/sites/orion/packages.yaml

@@ -1,10 +1,8 @@
 packages:
   all:
-    compiler:: [intel@2022.0.2]
-    #compiler:: [gcc@10.2.0]
+    compiler:: [intel@2022.0.2, intel@18.0.5, gcc@10.2.0]
     providers:
-      mpi:: [intel-oneapi-mpi@2021.5.1]
-      #mpi:: [openmpi@4.0.4]
+      mpi:: [intel-oneapi-mpi@2021.5.1, intel-mpi@2018.5.274, openmpi@4.0.4]
 
 ### MPI, Python, MKL
   mpi:
@@ -15,22 +13,12 @@ packages:
       prefix: /apps/intel-2022.1.2/intel-2022.1.2
       modules:
       - impi/2022.1.2
-    - spec: intel-oneapi-mpi@2021.2.0%intel@2021.2.0
-      prefix: /apps/intel-2021.2/intel-2021.2
+  intel-mpi:
+    externals:
+    - spec: intel-mpi@2018.5.274%intel@18.0.5
+      prefix: /apps/intel-2018/intel-2018.u4/compilers_and_libraries_2018.5.274/linux/mpi
       modules:
-      - impi/2021.2
-  #intel-oneapi-tbb:
-  #  externals:
-  #  - spec: intel-oneapi-tbb@2021.2.0%intel@2021.2.0
-  #    prefix: /apps/intel-2021.2/intel-2021.2
-  #    modules:
-  #    - intel/2021.2
-  #intel-oneapi-mkl:
-  #  externals:
-  #  - spec: intel-oneapi-mkl@2021.2.0%intel@2021.2.0
-  #    prefix: /apps/intel-2021.2/intel-2021.2
-  #    modules:
-  #    - intel/2021.2
+      - impi/2018.4
   openmpi:
     externals:
     - spec: openmpi@4.0.4%gcc@10.2.0~cuda~cxx~cxx_exceptions~java~memchecker+pmi~static~wrapper-rpath
@@ -82,10 +70,6 @@ packages:
       prefix: /apps/cmake-3.22.1
       modules:
       - cmake/3.22.1
-    - spec: cmake@3.18.1
-      prefix: /apps/cmake-3.18.1
-      modules:
-      - cmake/3.18.1
   cpio:
     externals:
     - spec: cpio@2.11