Fix support for Intel OneAPI MKL as installed on gadi.

COSIMA · Sep 11, 2023 · 0ff05f8 · 0ff05f8
1 parent 3a1aca7
commit 0ff05f8
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/config/system/packages.yaml b/config/system/packages.yaml
@@ -388,32 +388,40 @@ packages:
       - intel-mkl/2020.3.304
   intel-oneapi-mkl:
     externals:
-    - spec: intel-oneapi-mkl@2021.1.1
-      prefix: /apps/intel-oneapi/mkl/2021.1.1
+    - spec: "intel-oneapi-mkl@2021.1.1 +cluster mpi_family=openmpi"
+      prefix: /apps/intel-ct/2021.1.1
       modules:
       - intel-mkl/2021.1.1
-    - spec: intel-oneapi-mkl@2021.2.0
-      prefix: /apps/intel-oneapi/mkl/2021.2.0
+    - spec: "intel-oneapi-mkl@2021.2.0 +cluster mpi_family=openmpi"
+      prefix: /apps/intel-ct/2021.2.0
       modules:
       - intel-mkl/2021.2.0
-    - spec: intel-oneapi-mkl@2021.3.0
-      prefix: /apps/intel-oneapi/mkl/2021.3.0
+    - spec: "intel-oneapi-mkl@2021.3.0 +cluster mpi_family=openmpi"
+      prefix: /apps/intel-ct/2021.0.3
       modules:
       - intel-mkl/2021.3.0
-    - spec: intel-oneapi-mkl@2021.4.0
-      prefix: /apps/intel-oneapi/mkl/2021.4.0
+   - spec: "intel-oneapi-mkl@2021.4.0 +cluster mpi_family=openmpi"
+      prefix: /apps/intel-ct/2021.4.0
       modules:
       - intel-mkl/2021.4.0
-    - spec: intel-oneapi-mkl@2022.0.2
-      prefix: /apps/intel-oneapi/mkl/2022.0.2
+   - spec: "intel-oneapi-mkl@2022.0.2 +cluster mpi_family=openmpi"
+      prefix: /apps/intel-ct/2022.0.2
       modules:
       - intel-mkl/2022.0.2
-    - spec: intel-oneapi-mkl@2022.1.0
+   - spec: "intel-oneapi-mkl@2022.1.0 +cluster mpi_family=openmpi"
       prefix: /apps/intel-oneapi/mkl/2022.1.0
       modules:
       - intel-mkl/2022.1.0
-    - spec: intel-oneapi-mkl@2022.2.0
-      prefix: /apps/intel-oneapi/mkl/2022.2.0
+    - spec: "intel-oneapi-mkl@2022.2.0 +cluster mpi_family=openmpi"
+      prefix: /apps/intel-ct/2022.2.0
       modules:
       - intel-mkl/2022.2.0
+    - spec: "intel-oneapi-mkl@2023.0.0 +cluster mpi_family=openmpi"
+      prefix: /apps/intel-ct/2023.0.0
+      modules:
+      - intel-mkl/2023.0.0
+    - spec: "intel-oneapi-mkl@2023.2.0 +cluster mpi_family=openmpi"
+      prefix: /apps/intel-ct/2023.2.0
+      modules:
+      - intel-mkl/2023.2.0
     buildable: false
diff --git a/repos/cosima b/repos/cosima