#2082: Update NVCC CI to support host compiler version

DARMA-tasking · Mar 14, 2023 · 982eb83 · 982eb83
1 parent 8d017bc
commit 982eb83
Show file tree

Hide file tree

Showing 19 changed files with 28 additions and 6 deletions.
diff --git a/ci/azure/azure-clang-10-ubuntu-mpich.yml b/ci/azure/azure-clang-10-ubuntu-mpich.yml
@@ -28,6 +28,7 @@ variables:
   UBUNTU: 20.04
   COMPILER_TYPE: clang
   COMPILER: clang-10
+
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0

diff --git a/ci/azure/azure-clang-11-ubuntu-mpich.yml b/ci/azure/azure-clang-11-ubuntu-mpich.yml
@@ -28,6 +28,7 @@ variables:
   UBUNTU: 22.04
   COMPILER_TYPE: clang
   COMPILER: clang-11
+
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0

diff --git a/ci/azure/azure-clang-12-ubuntu-mpich.yml b/ci/azure/azure-clang-12-ubuntu-mpich.yml
@@ -28,6 +28,7 @@ variables:
   UBUNTU: 22.04
   COMPILER_TYPE: clang
   COMPILER: clang-12
+
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0

diff --git a/ci/azure/azure-clang-13-ubuntu-mpich.yml b/ci/azure/azure-clang-13-ubuntu-mpich.yml
@@ -28,6 +28,7 @@ variables:
   UBUNTU: 22.04
   COMPILER_TYPE: clang
   COMPILER: clang-13
+
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0

diff --git a/ci/azure/azure-clang-14-ubuntu-mpich.yml b/ci/azure/azure-clang-14-ubuntu-mpich.yml
@@ -28,6 +28,7 @@ variables:
   UBUNTU: 22.04
   COMPILER_TYPE: clang
   COMPILER: clang-14
+
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0

diff --git a/ci/azure/azure-clang-9-ubuntu-mpich.yml b/ci/azure/azure-clang-9-ubuntu-mpich.yml
@@ -28,6 +28,7 @@ variables:
   UBUNTU: 20.04
   COMPILER_TYPE: clang
   COMPILER: clang-9
+
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0

diff --git a/ci/azure/azure-clang-alpine-mpich.yml b/ci/azure/azure-clang-alpine-mpich.yml
@@ -28,6 +28,7 @@ variables:
 
   COMPILER_TYPE: clang
   COMPILER: clang-13
+
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0

diff --git a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml
@@ -28,6 +28,7 @@ variables:
   UBUNTU: 20.04
   COMPILER_TYPE: gnu
   COMPILER: gcc-10
+
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0

diff --git a/ci/azure/azure-gcc-11-ubuntu-mpich.yml b/ci/azure/azure-gcc-11-ubuntu-mpich.yml
@@ -28,6 +28,7 @@ variables:
   UBUNTU: 22.04
   COMPILER_TYPE: gnu
   COMPILER: gcc-11
+
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0

diff --git a/ci/azure/azure-gcc-12-ubuntu-mpich.yml b/ci/azure/azure-gcc-12-ubuntu-mpich.yml
@@ -28,6 +28,7 @@ variables:
   UBUNTU: 22.04
   COMPILER_TYPE: gnu
   COMPILER: gcc-12
+
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0

diff --git a/ci/azure/azure-gcc-7-ubuntu-mpich.yml b/ci/azure/azure-gcc-7-ubuntu-mpich.yml
@@ -28,6 +28,7 @@ variables:
   UBUNTU: 18.04
   COMPILER_TYPE: gnu
   COMPILER: gcc-7
+
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 1

diff --git a/ci/azure/azure-gcc-8-ubuntu-mpich.yml b/ci/azure/azure-gcc-8-ubuntu-mpich.yml
@@ -28,6 +28,7 @@ variables:
   UBUNTU: 18.04
   COMPILER_TYPE: gnu
   COMPILER: gcc-8
+
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0

diff --git a/ci/azure/azure-gcc-9-ubuntu-mpich.yml b/ci/azure/azure-gcc-9-ubuntu-mpich.yml
@@ -28,6 +28,7 @@ variables:
   UBUNTU: 20.04
   COMPILER_TYPE: gnu
   COMPILER: gcc-9
+
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0

diff --git a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml
@@ -28,6 +28,7 @@ variables:
   UBUNTU: 20.04
   COMPILER_TYPE: intel-oneapi
   COMPILER: icpc
+
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0

diff --git a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml
@@ -28,6 +28,7 @@ variables:
   UBUNTU: 20.04
   COMPILER_TYPE: intel-oneapi
   COMPILER: icpx
+
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0

diff --git a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml
@@ -2,7 +2,7 @@
 ############## Warning this is a generated file---do not modify ###############
 ###############################################################################
 
-name: PR tests (nvidia cuda 11.2, ubuntu, mpich)
+name: PR tests (nvidia cuda 11.2, gcc-9, ubuntu, mpich)
 
 trigger:
   branches:
@@ -28,6 +28,7 @@ variables:
   UBUNTU: 20.04
   COMPILER_TYPE: nvidia
   COMPILER: 11.2.0
+  HOST_COMPILER: gcc-9
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0

diff --git a/ci/azure/azure-nvidia-11-ubuntu-mpich.yml b/ci/azure/azure-nvidia-11-ubuntu-mpich.yml
@@ -2,7 +2,7 @@
 ############## Warning this is a generated file---do not modify ###############
 ###############################################################################
 
-name: PR tests (nvidia cuda 11.0, ubuntu, mpich)
+name: PR tests (nvidia cuda 11.0, gcc-9, ubuntu, mpich)
 
 trigger:
   branches:
@@ -28,6 +28,7 @@ variables:
   UBUNTU: 20.04
   COMPILER_TYPE: nvidia
   COMPILER: 11.0.3
+  HOST_COMPILER: gcc-9
   BUILD_TYPE: release
   ULIMIT_CORE: 0
   CODE_COVERAGE: 0

diff --git a/scripts/workflow-azure-template.yml b/scripts/workflow-azure-template.yml
@@ -16,6 +16,7 @@ variables:
 [% linux_env %]
   COMPILER_TYPE: [% compiler_type %]
   COMPILER: [% compiler %]
+[% host_compiler_line %]
   BUILD_TYPE: [% build_type %]
   ULIMIT_CORE: [% ulimit_core %]
   CODE_COVERAGE: [% code_coverage %]

diff --git a/scripts/workflows-azure.ini b/scripts/workflows-azure.ini
@@ -60,10 +60,12 @@ cache_name = ubuntu-intel-oneapi-icpc-cache
 output_name = ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml
 vt_extended_tests = 0
 
-[PR-tests-nvcc-11-0]
-test_configuration = "nvidia cuda 11.0, ubuntu, mpich"
+[PR-tests-nvcc-11-0-gcc-9]
+test_configuration = "nvidia cuda 11.0, gcc-9, ubuntu, mpich"
 compiler_type = nvidia
 compiler = 11.0.3
+host_compiler = gcc-9
+host_compiler_line = "  HOST_COMPILER: [% host_compiler %]"
 distro = 20.04
 cache_name = ubuntu-nvidia-11-cache
 output_name = ci/azure/azure-nvidia-11-ubuntu-mpich.yml
@@ -74,10 +76,12 @@ vt_trace = 1
 vt_pool = 0
 vt_tests_num_nodes = 4
 
-[PR-tests-nvcc-11-2]
-test_configuration = "nvidia cuda 11.2, ubuntu, mpich"
+[PR-tests-nvcc-11-2-gcc-9]
+test_configuration = "nvidia cuda 11.2, gcc-9, ubuntu, mpich"
 compiler_type = nvidia
 compiler = 11.2.0
+host_compiler = gcc-9
+host_compiler_line = "  HOST_COMPILER: [% host_compiler %]"
 distro = 20.04
 cache_name = ubuntu-nvidia-11.2-cache
 output_name = ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml