WIP Merge release/2.0 to develop

.gitmodules

@@ -2,11 +2,9 @@
   path = spack
   url = https://github.com/jcsda/spack
   branch = spack-stack-dev
-[submodule "doc/CMakeModules"]
-  path = doc/CMakeModules
-  url = https://github.com/noaa-emc/cmakemodules
-  branch = v1.3.0
 [submodule "repos/builtin"]
   path = repos/builtin
-  url = https://github.com/jcsda/spack-packages
-  branch = spack-stack-dev
+  #url = https://github.com/jcsda/spack-packages
+  #branch = spack-stack-dev
+  url = https://github.com/climbfuji/spack-packages
+  branch = feature/merge_rel20_to_spack_stack_dev

configs/common/modules_lmod.yaml

@@ -266,6 +266,12 @@ modules:
           set:
             'UPP_INC': '{prefix}/include'
             'UPP_LIB': '{prefix}/lib/libupp.a'
+      # NOTE: This will be fixed upstream in udunits Spack package
+      # Once this is done, remove this section
+      udunits:
+        environment:
+          set:
+            'UDUNITS2_XML_PATH': '{prefix}/share/udunits/udunits2.xml'
 
       hierarchy:
       - mpi

configs/common/modules_tcl.yaml

@@ -285,3 +285,9 @@ modules:
           set:
             'UPP_INC': '{prefix}/include'
             'UPP_LIB': '{prefix}/lib/libupp.a'
+      # NOTE: This will be fixed upstream in udunits Spack package
+      # Once this is done, remove this section
+      udunits:
+        environment:
+          set:
+            'UDUNITS2_XML_PATH': '{prefix}/share/udunits/udunits2.xml'

configs/common/packages.yaml

@@ -161,6 +161,10 @@ packages:
     #gsl-lite:
     #  require:
     #  - '@0.37.0'
+    harfbuzz:
+      # cmake-based harfbuzz fails during build
+      require:
+      - one_of: ['build_system=meson', 'build_system=autotools']
     hdf:
       require:
       - '@4.2.15'

configs/common/packages_clang.yaml

@@ -13,6 +13,3 @@ packages:
     ectrans:
       require:
       - +fftw
-    ip:
-      require:
-      - '~openmp'

configs/common/packages_oneapi.yaml

@@ -43,6 +43,9 @@ packages:
     py-maturin:
       require:
       - '%gcc'
+    py-scipy:
+      require:
+      - 'cxxflags="-O1"'
     qt:
       require:
       - '%gcc'

configs/sites/tier1/acorn/deployments.yaml

@@ -1,6 +1,6 @@
 deployments:
   - template: "unified-dev"
-    compilers: ["oneapi-2024.2.1", "intel-19.1.3.304"]
+    compilers: ["oneapi@2024.2.1", "intel@19.1.3.304"]
     packages_to_install:
     - ufs-weather-model-env
     - global-workflow-env
@@ -20,7 +20,7 @@ deployments:
     - py-numpy
 
   - template: "nco"
-    compilers: ["oneapi-2024.2.1", "intel-19.1.3.304"]
+    compilers: ["oneapi@2024.2.1", "intel@19.1.3.304"]
     duplicates_to_ignore: ["crtm", "crtm-fix", "boost", "harfbuzz"]
     allowed_gcc_packages:
     - antlr

configs/sites/tier1/acorn/modules.yaml

@@ -5,3 +5,5 @@ modules:
     lmod:
       include:
       - python
+      all:
+        autoload: run

configs/sites/tier1/acorn/packages.yaml

@@ -12,7 +12,7 @@ packages:
   blas:
     require:: ['openblas']
   fftw-api:
-    require: ['fftw']
+    require:: ['fftw']
   jpeg:
     require: ['libjpeg-turbo']
   lapack:
@@ -39,6 +39,7 @@ packages:
     require: ['~crypto']
   nco:
     require:: ['%oneapi']
+  py-colorama:: {}
   py-pandas:
     require:: ['~excel']
   subversion:

configs/sites/tier1/discover-scu17/packages_oneapi.yaml

@@ -1,21 +1,59 @@
 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
       prefix: /usr/local/intel/oneapi/2024
       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: []