Merge branch 'develop' of https://github.com/jcsda/spack-stack into f…

…eature/unpin_update_common_packages_PLUS_cylc
JCSDA · Dec 19, 2024 · f7990ce · f7990ce
2 parents c113381 + 491b30f
commit f7990ce
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 15 deletions.
diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml
@@ -55,7 +55,7 @@ packages:
     require: '@0.40.0 +fckit +trans +tesselation +fftw'
   ectrans:
     require:
-    - '@1.5.0'
+    - '@1.2.0'
   eigen:
     require: '@3.4.0'
   # Attention - when updating the version also check the common modules.yaml

diff --git a/configs/containers/specs/jedi-ci.yaml b/configs/containers/specs/jedi-ci.yaml
@@ -15,7 +15,7 @@
     [email protected],
     [email protected] +fckit +trans +tesselation +fftw,
     [email protected],
-    ectrans@1.5.0 +fftw,
+    ectrans@1.2.0 +fftw,
     [email protected],
     [email protected],
     [email protected],

diff --git a/configs/sites/tier1/acorn/packages_intel.yaml b/configs/sites/tier1/acorn/packages_intel.yaml
@@ -25,7 +25,7 @@
     # DH* Remove this section to switch to intel-oneapi-mkl
     ectrans:
       require::
-      - '@1.5.0 ~mkl +fftw'
+      - '@1.2.0 ~mkl +fftw'
     gsibec:
       require::
       - '@1.2.1 ~mkl'

diff --git a/configs/sites/tier1/aws-pcluster/packages_intel.yaml b/configs/sites/tier1/aws-pcluster/packages_intel.yaml
@@ -25,7 +25,7 @@ packages:
   # DH* Remove this section to switch to intel-oneapi-mkl
   ectrans:
     require::
-    - '@1.5.0 ~mkl +fftw'
+    - '@1.2.0 ~mkl +fftw'
   gsibec:
     require::
     - '@1.2.1 ~mkl'

diff --git a/configs/sites/tier1/gaea-c5/packages.yaml b/configs/sites/tier1/gaea-c5/packages.yaml
@@ -29,7 +29,7 @@ packages:
   # DH* Remove this section to switch to intel-oneapi-mkl
   ectrans:
     require::
-    - '@1.5.0 ~mkl +fftw'
+    - '@1.2.0 ~mkl +fftw'
   gsibec:
     require::
     - '@1.2.1 ~mkl'

diff --git a/configs/sites/tier1/gaea-c6/packages.yaml b/configs/sites/tier1/gaea-c6/packages.yaml
@@ -28,7 +28,7 @@ packages:
   # DH* Remove this section to switch to intel-oneapi-mkl
   ectrans:
     require::
-    - '@1.5.0 ~mkl +fftw'
+    - '@1.2.0 ~mkl +fftw'
   gsibec:
     require::
     - '@1.2.1 ~mkl'

diff --git a/configs/sites/tier1/hera/packages_intel.yaml b/configs/sites/tier1/hera/packages_intel.yaml
@@ -24,7 +24,7 @@ packages:
   # DH* Remove this section to switch to intel-oneapi-mkl
   ectrans:
     require::
-    - '@1.5.0 ~mkl +fftw'
+    - '@1.2.0 ~mkl +fftw'
   gsibec:
     require::
     - '@1.2.1 ~mkl'

diff --git a/configs/sites/tier1/hercules/packages_intel.yaml b/configs/sites/tier1/hercules/packages_intel.yaml
@@ -24,7 +24,7 @@ packages:
   # Remove this section to switch to intel-oneapi-mkl
   ectrans:
     require::
-    - '@1.5.0 ~mkl +fftw'
+    - '@1.2.0 ~mkl +fftw'
   gsibec:
     require::
     - '@1.2.1 ~mkl'

diff --git a/configs/sites/tier1/nautilus/packages_aocc.yaml b/configs/sites/tier1/nautilus/packages_aocc.yaml
@@ -26,7 +26,7 @@ packages:
     buildable: False
   ectrans:
     require::
-    - '@1.5.0 +mkl ~fftw'
+    - '@1.2.0 +mkl ~fftw'
   gsibec:
     require::
     - '@1.2.1 +mkl'

diff --git a/configs/sites/tier1/nautilus/packages_gcc.yaml b/configs/sites/tier1/nautilus/packages_gcc.yaml
@@ -25,7 +25,7 @@ packages:
     buildable: False
   ectrans:
     require::
-    - '@1.5.0 +mkl ~fftw'
+    - '@1.2.0 +mkl ~fftw'
   gsibec:
     require::
     - '@1.2.1 +mkl'

diff --git a/configs/sites/tier1/noaa-aws/packages_intel.yaml b/configs/sites/tier1/noaa-aws/packages_intel.yaml
@@ -24,7 +24,7 @@ packages:
   # DH* Remove this section to switch to intel-oneapi-mkl
   ectrans:
     require::
-    - '@1.5.0 ~mkl +fftw'
+    - '@1.2.0 ~mkl +fftw'
   gsibec:
     require::
     - '@1.2.1 ~mkl'

diff --git a/configs/sites/tier1/noaa-azure/packages_intel.yaml b/configs/sites/tier1/noaa-azure/packages_intel.yaml
@@ -24,7 +24,7 @@ packages:
   # DH* Remove this section to switch to intel-oneapi-mkl
   ectrans:
     require::
-    - '@1.5.0 ~mkl +fftw'
+    - '@1.2.0 ~mkl +fftw'
   gsibec:
     require::
     - '@1.2.1 ~mkl'

diff --git a/configs/sites/tier1/noaa-gcloud/packages_intel.yaml b/configs/sites/tier1/noaa-gcloud/packages_intel.yaml
@@ -24,7 +24,7 @@ packages:
   # DH* Remove this section to switch to intel-oneapi-mkl
   ectrans:
     require::
-    - '@1.5.0 ~mkl +fftw'
+    - '@1.2.0 ~mkl +fftw'
   gsibec:
     require::
     - '@1.2.1 ~mkl'

diff --git a/configs/sites/tier1/orion/packages_intel.yaml b/configs/sites/tier1/orion/packages_intel.yaml
@@ -24,7 +24,7 @@ packages:
   # Remove this section to switch to intel-oneapi-mkl
   ectrans:
     require::
-    - '@1.5.0 ~mkl +fftw'
+    - '@1.2.0 ~mkl +fftw'
   gsibec:
     require::
     - '@1.2.1 ~mkl'

diff --git a/configs/sites/tier1/s4/packages.yaml b/configs/sites/tier1/s4/packages.yaml
@@ -31,7 +31,7 @@ packages:
   # Remove this section to switch to intel-oneapi-mkl
   ectrans:
     require::
-    - '@1.5.0 ~mkl +fftw'
+    - '@1.2.0 ~mkl +fftw'
   gsibec:
     require::
     - '@1.2.1 ~mkl'