#2302: Fix workflow template and update workflows

DARMA-tasking · Dec 12, 2024 · 87d1af5 · 87d1af5
1 parent be78940
commit 87d1af5
Show file tree

Hide file tree

Showing 22 changed files with 41 additions and 3 deletions.
diff --git a/ci/azure/azure-clang-10-ubuntu-mpich.yml b/ci/azure/azure-clang-10-ubuntu-mpich.yml
@@ -57,6 +57,8 @@ variables:
   VT_DEBUG_VERBOSE: 0
   VT_KOKKOS_ENABLED: 0
   VT_TV_ENABLED: 0
+  VT_PERF_ENABLED: 0
+  VT_PAPI_ENABLED: 0
   CMAKE_CXX_STANDARD: 17
   VT_CI_TEST_LB_SCHEMA: 0
   RUN_FULL_CI: true

diff --git a/ci/azure/azure-clang-11-ubuntu-mpich.yml b/ci/azure/azure-clang-11-ubuntu-mpich.yml
@@ -57,6 +57,8 @@ variables:
   VT_DEBUG_VERBOSE: 0
   VT_KOKKOS_ENABLED: 0
   VT_TV_ENABLED: 0
+  VT_PERF_ENABLED: 0
+  VT_PAPI_ENABLED: 0
   CMAKE_CXX_STANDARD: 17
   VT_CI_TEST_LB_SCHEMA: 0
   RUN_FULL_CI: true

diff --git a/ci/azure/azure-clang-12-ubuntu-mpich.yml b/ci/azure/azure-clang-12-ubuntu-mpich.yml
@@ -57,6 +57,8 @@ variables:
   VT_DEBUG_VERBOSE: 0
   VT_KOKKOS_ENABLED: 0
   VT_TV_ENABLED: 0
+  VT_PERF_ENABLED: 0
+  VT_PAPI_ENABLED: 0
   CMAKE_CXX_STANDARD: 17
   VT_CI_TEST_LB_SCHEMA: 0
   RUN_FULL_CI: true

diff --git a/ci/azure/azure-clang-13-ubuntu-mpich.yml b/ci/azure/azure-clang-13-ubuntu-mpich.yml
@@ -57,6 +57,8 @@ variables:
   VT_DEBUG_VERBOSE: 0
   VT_KOKKOS_ENABLED: 0
   VT_TV_ENABLED: 0
+  VT_PERF_ENABLED: 0
+  VT_PAPI_ENABLED: 0
   CMAKE_CXX_STANDARD: 17
   VT_CI_TEST_LB_SCHEMA: 0
   RUN_FULL_CI: true

diff --git a/ci/azure/azure-clang-14-ubuntu-mpich.yml b/ci/azure/azure-clang-14-ubuntu-mpich.yml
@@ -57,6 +57,8 @@ variables:
   VT_DEBUG_VERBOSE: 1
   VT_KOKKOS_ENABLED: 0
   VT_TV_ENABLED: 0
+  VT_PERF_ENABLED: 0
+  VT_PAPI_ENABLED: 0
   CMAKE_CXX_STANDARD: 17
   VT_CI_TEST_LB_SCHEMA: 0
   RUN_FULL_CI: true

diff --git a/ci/azure/azure-clang-16-ubuntu-mpich.yml b/ci/azure/azure-clang-16-ubuntu-mpich.yml
@@ -57,6 +57,8 @@ variables:
   VT_DEBUG_VERBOSE: 0
   VT_KOKKOS_ENABLED: 0
   VT_TV_ENABLED: 0
+  VT_PERF_ENABLED: 0
+  VT_PAPI_ENABLED: 0
   CMAKE_CXX_STANDARD: 17
   VT_CI_TEST_LB_SCHEMA: 1
   RUN_FULL_CI: true

diff --git a/ci/azure/azure-clang-9-ubuntu-mpich.yml b/ci/azure/azure-clang-9-ubuntu-mpich.yml
@@ -57,6 +57,8 @@ variables:
   VT_DEBUG_VERBOSE: 0
   VT_KOKKOS_ENABLED: 0
   VT_TV_ENABLED: 0
+  VT_PERF_ENABLED: 0
+  VT_PAPI_ENABLED: 0
   CMAKE_CXX_STANDARD: 17
   VT_CI_TEST_LB_SCHEMA: 0
   RUN_FULL_CI: true

diff --git a/ci/azure/azure-clang-alpine-mpich.yml b/ci/azure/azure-clang-alpine-mpich.yml
@@ -57,6 +57,8 @@ variables:
   VT_DEBUG_VERBOSE: 0
   VT_KOKKOS_ENABLED: 0
   VT_TV_ENABLED: 0
+  VT_PERF_ENABLED: 0
+  VT_PAPI_ENABLED: 0
   CMAKE_CXX_STANDARD: 17
   VT_CI_TEST_LB_SCHEMA: 0
   RUN_FULL_CI: true

diff --git a/ci/azure/azure-gcc-10-ubuntu-openmpi-spack.yml b/ci/azure/azure-gcc-10-ubuntu-openmpi-spack.yml
@@ -50,6 +50,8 @@ variables:
   VT_DEBUG_VERBOSE: 0
   VT_KOKKOS_ENABLED: 0
   VT_TV_ENABLED: 0
+  VT_PERF_ENABLED: 0
+  VT_PAPI_ENABLED: 0
   CMAKE_CXX_STANDARD: 17
   VT_CI_TEST_LB_SCHEMA: 0
   RUN_FULL_CI: false

diff --git a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml
@@ -57,6 +57,8 @@ variables:
   VT_DEBUG_VERBOSE: 0
   VT_KOKKOS_ENABLED: 0
   VT_TV_ENABLED: 0
+  VT_PERF_ENABLED: 0
+  VT_PAPI_ENABLED: 0
   CMAKE_CXX_STANDARD: 17
   VT_CI_TEST_LB_SCHEMA: 0
   RUN_FULL_CI: true

diff --git a/ci/azure/azure-gcc-11-ubuntu-mpich.yml b/ci/azure/azure-gcc-11-ubuntu-mpich.yml
@@ -57,6 +57,8 @@ variables:
   VT_DEBUG_VERBOSE: 0
   VT_KOKKOS_ENABLED: 0
   VT_TV_ENABLED: 0
+  VT_PERF_ENABLED: 0
+  VT_PAPI_ENABLED: 0
   CMAKE_CXX_STANDARD: 17
   VT_CI_TEST_LB_SCHEMA: 0
   RUN_FULL_CI: true

diff --git a/ci/azure/azure-gcc-12-ubuntu-mpich.yml b/ci/azure/azure-gcc-12-ubuntu-mpich.yml
@@ -57,6 +57,8 @@ variables:
   VT_DEBUG_VERBOSE: 1
   VT_KOKKOS_ENABLED: 1
   VT_TV_ENABLED: 0
+  VT_PERF_ENABLED: 0
+  VT_PAPI_ENABLED: 0
   CMAKE_CXX_STANDARD: 17
   VT_CI_TEST_LB_SCHEMA: 0
   RUN_FULL_CI: true

diff --git a/ci/azure/azure-gcc-12-ubuntu-papi.yml b/ci/azure/azure-gcc-12-ubuntu-papi.yml
@@ -143,7 +143,7 @@ stages:
           containerregistrytype: 'Container Registry'
           dockerComposeFile: '**/docker-compose.yml'
           action: 'Run a Docker Compose command'
-          dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean '
+          dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean'
       - task: DockerCompose@1
         displayName: Build container
         inputs:

diff --git a/ci/azure/azure-gcc-12-ubuntu-perf.yml b/ci/azure/azure-gcc-12-ubuntu-perf.yml
@@ -143,7 +143,7 @@ stages:
           containerregistrytype: 'Container Registry'
           dockerComposeFile: '**/docker-compose.yml'
           action: 'Run a Docker Compose command'
-          dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean '
+          dockerComposeCommand: '$(compose_command) ubuntu-cpp-clean'
       - task: DockerCompose@1
         displayName: Build container
         inputs:

diff --git a/ci/azure/azure-gcc-12-ubuntu-vttv.yml b/ci/azure/azure-gcc-12-ubuntu-vttv.yml
@@ -57,6 +57,8 @@ variables:
   VT_DEBUG_VERBOSE: 0
   VT_KOKKOS_ENABLED: 0
   VT_TV_ENABLED: 1
+  VT_PERF_ENABLED: 0
+  VT_PAPI_ENABLED: 0
   CMAKE_CXX_STANDARD: 17
   VT_CI_TEST_LB_SCHEMA: 0
   RUN_FULL_CI: true

diff --git a/ci/azure/azure-gcc-13-ubuntu-mpich.yml b/ci/azure/azure-gcc-13-ubuntu-mpich.yml
@@ -57,6 +57,8 @@ variables:
   VT_DEBUG_VERBOSE: 0
   VT_KOKKOS_ENABLED: 0
   VT_TV_ENABLED: 0
+  VT_PERF_ENABLED: 0
+  VT_PAPI_ENABLED: 0
   CMAKE_CXX_STANDARD: 17
   VT_CI_TEST_LB_SCHEMA: 0
   RUN_FULL_CI: true

diff --git a/ci/azure/azure-gcc-9-ubuntu-mpich.yml b/ci/azure/azure-gcc-9-ubuntu-mpich.yml
@@ -57,6 +57,8 @@ variables:
   VT_DEBUG_VERBOSE: 0
   VT_KOKKOS_ENABLED: 0
   VT_TV_ENABLED: 0
+  VT_PERF_ENABLED: 0
+  VT_PAPI_ENABLED: 0
   CMAKE_CXX_STANDARD: 17
   VT_CI_TEST_LB_SCHEMA: 0
   RUN_FULL_CI: true

diff --git a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml
@@ -57,6 +57,8 @@ variables:
   VT_DEBUG_VERBOSE: 0
   VT_KOKKOS_ENABLED: 0
   VT_TV_ENABLED: 0
+  VT_PERF_ENABLED: 0
+  VT_PAPI_ENABLED: 0
   CMAKE_CXX_STANDARD: 17
   VT_CI_TEST_LB_SCHEMA: 0
   RUN_FULL_CI: true

diff --git a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml
@@ -57,6 +57,8 @@ variables:
   VT_DEBUG_VERBOSE: 1
   VT_KOKKOS_ENABLED: 0
   VT_TV_ENABLED: 0
+  VT_PERF_ENABLED: 0
+  VT_PAPI_ENABLED: 0
   CMAKE_CXX_STANDARD: 17
   VT_CI_TEST_LB_SCHEMA: 0
   RUN_FULL_CI: true

diff --git a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml
@@ -57,6 +57,8 @@ variables:
   VT_DEBUG_VERBOSE: 0
   VT_KOKKOS_ENABLED: 0
   VT_TV_ENABLED: 0
+  VT_PERF_ENABLED: 0
+  VT_PAPI_ENABLED: 0
   CMAKE_CXX_STANDARD: 17
   VT_CI_TEST_LB_SCHEMA: 0
   RUN_FULL_CI: true

diff --git a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml
@@ -57,6 +57,8 @@ variables:
   VT_DEBUG_VERBOSE: 1
   VT_KOKKOS_ENABLED: 0
   VT_TV_ENABLED: 0
+  VT_PERF_ENABLED: 0
+  VT_PAPI_ENABLED: 0
   CMAKE_CXX_STANDARD: 17
   VT_CI_TEST_LB_SCHEMA: 0
   RUN_FULL_CI: true

diff --git a/scripts/workflow-azure-template.yml b/scripts/workflow-azure-template.yml
@@ -131,7 +131,7 @@ stages:
           containerregistrytype: 'Container Registry'
           dockerComposeFile: '**/docker-compose.yml'
           action: 'Run a Docker Compose command'
-          dockerComposeCommand: '$(compose_command) [% docker_target %] [% IF privileged %]--privileged[% END %]'
+          dockerComposeCommand: '$(compose_command) [% docker_target %][% IF privileged %] --privileged[% END %]'
       - task: DockerCompose@1
         displayName: Build container
         inputs: