centaur test

broadinstitute · Nov 8, 2023 · 6306c0b · 6306c0b
1 parent f7a0e20
commit 6306c0b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/centaur/src/main/resources/standardTestCases/papi_cpu_platform.test b/centaur/src/main/resources/standardTestCases/papi_cpu_platform.test
@@ -8,9 +8,11 @@ files {
 
 metadata {
   status: Succeeded
-  "outputs.cpus.cascadeLake.cpuPlatform": "Intel Cascade Lake"
   "outputs.cpus.broadwell.cpuPlatform": "Intel Broadwell"
   "outputs.cpus.haswell.cpuPlatform": "Intel Haswell"
+  "outputs.cpus.cascadeLake.cpuPlatform": "Intel Cascade Lake"
+  "outputs.cpus.iceLake.cpuPlatform": "Intel Ice Lake"
+  "outputs.cpus.sapphireRapids.cpuPlatform": "Intel Sapphire Rapids"
   "outputs.cpus.rome.cpuPlatform": "AMD Rome"
 }
 

diff --git a/centaur/src/main/resources/standardTestCases/papi_cpu_platform/papi_cpu_platform.wdl b/centaur/src/main/resources/standardTestCases/papi_cpu_platform/papi_cpu_platform.wdl
@@ -24,8 +24,10 @@ task cpu_platform {
 }
 
 workflow cpus {
-   call cpu_platform as haswell { input: cpu_platform = "Intel Haswell" }
-   call cpu_platform as broadwell { input: cpu_platform = "Intel Broadwell" }
-   call cpu_platform as cascadeLake { input: cpu_platform = "Intel Cascade Lake" }
-   call cpu_platform as rome {input: cpu_platform = "AMD Rome" }
+    call cpu_platform as haswell { input: cpu_platform = "Intel Haswell" }
+    call cpu_platform as broadwell { input: cpu_platform = "Intel Broadwell" }
+    call cpu_platform as cascadeLake { input: cpu_platform = "Intel Cascade Lake" }
+    call cpu_platform as iceLake { input: cpu_platform = "Intel Ice Lake" }
+    call cpu_platform as sapphireRapids { input: cpu_platform = "Intel Sapphire Rapids" }
+    call cpu_platform as rome { input: cpu_platform = "AMD Rome" }
 }
diff --git a/...s/common/src/main/scala/cromwell/backend/google/pipelines/common/MachineConstraints.scala b/...s/common/src/main/scala/cromwell/backend/google/pipelines/common/MachineConstraints.scala
@@ -25,7 +25,7 @@ object MachineConstraints {
       // The below logic infers the machine type from the requested CPU. We're assuming that users want  the newest
       // "General Purpose" machine type that is compatible with the requested CPU. For example, if someone requests
       // Intel Cascade Lake as their CPU platform, then infer the n2 machine type. AMD Rome -> n2d.
-      // The heuristic we're using is "find the newest 'General Purpose' type that supports the given CPU.
+      // The heuristic we're using is: find the newest 'General Purpose' type that supports the given CPU.
       // https://cloud.google.com/compute/docs/machine-resource
       val customMachineType =
         cpuPlatformOption match {