diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index a94ca5aa0..5bb61841a 100644 --- 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 index 6f93c5432..db7c9501d 100644 --- a/configs/containers/specs/jedi-ci.yaml +++ b/configs/containers/specs/jedi-ci.yaml @@ -15,7 +15,7 @@ eckit@1.28.3, ecmwf-atlas@0.40.0 +fckit +trans +tesselation +fftw, fiat@1.4.1, - ectrans@1.5.0 +fftw, + ectrans@1.2.0 +fftw, eigen@3.4.0, fckit@0.13.2, fms@2024.02, diff --git a/configs/sites/tier1/acorn/packages_intel.yaml b/configs/sites/tier1/acorn/packages_intel.yaml index a55cad6ad..b9cfc096c 100644 --- 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 index 7a7fec11c..7c04e9b9a 100644 --- 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 index 9d59b8bbd..7bbc7f43f 100644 --- 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 index 224b56831..7e8797f4b 100644 --- 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 index 514424a99..ad7ec6512 100644 --- 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 index d7c7dbe21..3642bdc7b 100644 --- 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 index 65092508b..380d51b6e 100644 --- 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 index c97a48ba8..2e47c9e0e 100644 --- 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 index 665c8aaa0..0700f2c4b 100644 --- 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 index 665c8aaa0..0700f2c4b 100644 --- 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 index 665c8aaa0..0700f2c4b 100644 --- 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 index d7c7dbe21..3642bdc7b 100644 --- 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 index 08acf079c..1981196d2 100644 --- 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'