From a6c82ba398868b5fed27bb10011e2fb3339f8376 Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Wed, 27 Mar 2024 16:28:07 +0100 Subject: [PATCH 01/13] #2260: Enable one verbose build for each compiler type --- ci/azure/azure-clang-10-ubuntu-mpich.yml | 1 + ci/azure/azure-clang-11-ubuntu-mpich.yml | 1 + ci/azure/azure-clang-12-ubuntu-mpich.yml | 1 + ci/azure/azure-clang-13-ubuntu-mpich.yml | 1 + ci/azure/azure-clang-14-ubuntu-mpich.yml | 3 ++- ci/azure/azure-clang-9-ubuntu-mpich.yml | 1 + ci/azure/azure-clang-alpine-mpich.yml | 1 + ci/azure/azure-gcc-10-ubuntu-openmpi.yml | 1 + ci/azure/azure-gcc-11-ubuntu-mpich.yml | 3 ++- ci/azure/azure-gcc-12-ubuntu-mpich.yml | 1 + ci/azure/azure-gcc-8-ubuntu-mpich.yml | 1 + ci/azure/azure-gcc-9-ubuntu-mpich.yml | 1 + ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml | 1 + ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml | 3 ++- ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml | 1 + ci/azure/azure-nvidia-12-ubuntu-mpich.yml | 3 ++- scripts/workflow-azure-template.yml | 1 + scripts/workflows-azure.ini | 13 +++++++++---- 18 files changed, 30 insertions(+), 8 deletions(-) diff --git a/ci/azure/azure-clang-10-ubuntu-mpich.yml b/ci/azure/azure-clang-10-ubuntu-mpich.yml index 6ae86de340..02547331cf 100644 --- a/ci/azure/azure-clang-10-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-10-ubuntu-mpich.yml @@ -53,6 +53,7 @@ variables: VT_NO_COLOR: 1 VT_BUILD_SHARED_LIBS: 0 VT_INCLUSION: TPL + VT_DEBUG_VERBOSE: 0 CMAKE_CXX_STANDARD: 17 TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" diff --git a/ci/azure/azure-clang-11-ubuntu-mpich.yml b/ci/azure/azure-clang-11-ubuntu-mpich.yml index 3279ca6a19..e90e10a42f 100644 --- a/ci/azure/azure-clang-11-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-11-ubuntu-mpich.yml @@ -53,6 +53,7 @@ variables: VT_NO_COLOR: 1 VT_BUILD_SHARED_LIBS: 0 VT_INCLUSION: TPL + VT_DEBUG_VERBOSE: 0 CMAKE_CXX_STANDARD: 17 TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" diff --git a/ci/azure/azure-clang-12-ubuntu-mpich.yml b/ci/azure/azure-clang-12-ubuntu-mpich.yml index 7ae2127cac..d55c882e27 100644 --- a/ci/azure/azure-clang-12-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-12-ubuntu-mpich.yml @@ -53,6 +53,7 @@ variables: VT_NO_COLOR: 1 VT_BUILD_SHARED_LIBS: 0 VT_INCLUSION: TPL + VT_DEBUG_VERBOSE: 0 CMAKE_CXX_STANDARD: 17 TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" diff --git a/ci/azure/azure-clang-13-ubuntu-mpich.yml b/ci/azure/azure-clang-13-ubuntu-mpich.yml index a837a737f5..866b7ee5b7 100644 --- a/ci/azure/azure-clang-13-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-13-ubuntu-mpich.yml @@ -53,6 +53,7 @@ variables: VT_NO_COLOR: 1 VT_BUILD_SHARED_LIBS: 0 VT_INCLUSION: TPL + VT_DEBUG_VERBOSE: 0 CMAKE_CXX_STANDARD: 17 TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" diff --git a/ci/azure/azure-clang-14-ubuntu-mpich.yml b/ci/azure/azure-clang-14-ubuntu-mpich.yml index 07e5483fdd..e7e6c983d4 100644 --- a/ci/azure/azure-clang-14-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-14-ubuntu-mpich.yml @@ -2,7 +2,7 @@ ############## Warning this is a generated file---do not modify ############### ############################################################################### -name: PR tests (clang-14, ubuntu, mpich) +name: PR tests (clang-14, ubuntu, mpich, verbose) trigger: branches: @@ -53,6 +53,7 @@ variables: VT_NO_COLOR: 1 VT_BUILD_SHARED_LIBS: 0 VT_INCLUSION: TPL + VT_DEBUG_VERBOSE: 1 CMAKE_CXX_STANDARD: 17 TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" diff --git a/ci/azure/azure-clang-9-ubuntu-mpich.yml b/ci/azure/azure-clang-9-ubuntu-mpich.yml index e51536e582..cbaf5c4cf8 100644 --- a/ci/azure/azure-clang-9-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-9-ubuntu-mpich.yml @@ -53,6 +53,7 @@ variables: VT_NO_COLOR: 1 VT_BUILD_SHARED_LIBS: 1 VT_INCLUSION: EXT_LIB + VT_DEBUG_VERBOSE: 0 CMAKE_CXX_STANDARD: 17 TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" diff --git a/ci/azure/azure-clang-alpine-mpich.yml b/ci/azure/azure-clang-alpine-mpich.yml index b6feb83488..6319e67306 100644 --- a/ci/azure/azure-clang-alpine-mpich.yml +++ b/ci/azure/azure-clang-alpine-mpich.yml @@ -53,6 +53,7 @@ variables: VT_NO_COLOR: 1 VT_BUILD_SHARED_LIBS: 0 VT_INCLUSION: TPL + VT_DEBUG_VERBOSE: 0 CMAKE_CXX_STANDARD: 17 TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" diff --git a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml index ddd10dde62..b9c0f8f350 100644 --- a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml +++ b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml @@ -53,6 +53,7 @@ variables: VT_NO_COLOR: 1 VT_BUILD_SHARED_LIBS: 0 VT_INCLUSION: TPL + VT_DEBUG_VERBOSE: 0 CMAKE_CXX_STANDARD: 17 TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" diff --git a/ci/azure/azure-gcc-11-ubuntu-mpich.yml b/ci/azure/azure-gcc-11-ubuntu-mpich.yml index a814387d00..a5ab699323 100644 --- a/ci/azure/azure-gcc-11-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-11-ubuntu-mpich.yml @@ -2,7 +2,7 @@ ############## Warning this is a generated file---do not modify ############### ############################################################################### -name: PR tests (gcc-11, ubuntu, mpich, trace runtime, coverage) +name: PR tests (gcc-11, ubuntu, mpich, trace runtime, coverage, verbose) trigger: branches: @@ -53,6 +53,7 @@ variables: VT_NO_COLOR: 1 VT_BUILD_SHARED_LIBS: 0 VT_INCLUSION: TPL + VT_DEBUG_VERBOSE: 1 CMAKE_CXX_STANDARD: 17 TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" diff --git a/ci/azure/azure-gcc-12-ubuntu-mpich.yml b/ci/azure/azure-gcc-12-ubuntu-mpich.yml index 3962de310e..10f0f77c3b 100644 --- a/ci/azure/azure-gcc-12-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-12-ubuntu-mpich.yml @@ -53,6 +53,7 @@ variables: VT_NO_COLOR: 1 VT_BUILD_SHARED_LIBS: 0 VT_INCLUSION: TPL + VT_DEBUG_VERBOSE: 0 CMAKE_CXX_STANDARD: 17 TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" diff --git a/ci/azure/azure-gcc-8-ubuntu-mpich.yml b/ci/azure/azure-gcc-8-ubuntu-mpich.yml index f0bc5b2feb..4cc5bb1b83 100644 --- a/ci/azure/azure-gcc-8-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-8-ubuntu-mpich.yml @@ -53,6 +53,7 @@ variables: VT_NO_COLOR: 1 VT_BUILD_SHARED_LIBS: 0 VT_INCLUSION: TPL + VT_DEBUG_VERBOSE: 0 CMAKE_CXX_STANDARD: 17 TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" diff --git a/ci/azure/azure-gcc-9-ubuntu-mpich.yml b/ci/azure/azure-gcc-9-ubuntu-mpich.yml index c2b352056d..d954595cc7 100644 --- a/ci/azure/azure-gcc-9-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-9-ubuntu-mpich.yml @@ -53,6 +53,7 @@ variables: VT_NO_COLOR: 1 VT_BUILD_SHARED_LIBS: 0 VT_INCLUSION: TPL + VT_DEBUG_VERBOSE: 0 CMAKE_CXX_STANDARD: 17 TEST_LB_SCHEMA: 1 CACHE: "$(Agent.TempDirectory)/cache/" diff --git a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml index 271c3d0922..d71c493346 100644 --- a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml @@ -53,6 +53,7 @@ variables: VT_NO_COLOR: 1 VT_BUILD_SHARED_LIBS: 0 VT_INCLUSION: TPL + VT_DEBUG_VERBOSE: 0 CMAKE_CXX_STANDARD: 17 TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" diff --git a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml index 5624f7e1e7..225c5260b9 100644 --- a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml @@ -2,7 +2,7 @@ ############## Warning this is a generated file---do not modify ############### ############################################################################### -name: PR tests (intel icpx, ubuntu, mpich) +name: PR tests (intel icpx, ubuntu, mpich, verbose) trigger: branches: @@ -53,6 +53,7 @@ variables: VT_NO_COLOR: 1 VT_BUILD_SHARED_LIBS: 0 VT_INCLUSION: TPL + VT_DEBUG_VERBOSE: 1 CMAKE_CXX_STANDARD: 17 TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" diff --git a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml index e06dc01a16..8d2d9ae717 100644 --- a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml @@ -53,6 +53,7 @@ variables: VT_NO_COLOR: 1 VT_BUILD_SHARED_LIBS: 0 VT_INCLUSION: TPL + VT_DEBUG_VERBOSE: 0 CMAKE_CXX_STANDARD: 17 TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" diff --git a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml index 7d1117f8e8..7dce80b3c8 100644 --- a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml @@ -2,7 +2,7 @@ ############## Warning this is a generated file---do not modify ############### ############################################################################### -name: PR tests (nvidia cuda 12.2.0, gcc-9, ubuntu, mpich) +name: PR tests (nvidia cuda 12.2.0, gcc-9, ubuntu, mpich, verbose) trigger: branches: @@ -53,6 +53,7 @@ variables: VT_NO_COLOR: 1 VT_BUILD_SHARED_LIBS: 0 VT_INCLUSION: TPL + VT_DEBUG_VERBOSE: 1 CMAKE_CXX_STANDARD: 17 TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" diff --git a/scripts/workflow-azure-template.yml b/scripts/workflow-azure-template.yml index 7ae91d3fd9..a43cb56658 100644 --- a/scripts/workflow-azure-template.yml +++ b/scripts/workflow-azure-template.yml @@ -41,6 +41,7 @@ variables: VT_NO_COLOR: [% vt_no_color %] VT_BUILD_SHARED_LIBS: [% vt_build_shared_libs %] VT_INCLUSION: [% vt_inclusion %] + VT_DEBUG_VERBOSE: [% vt_debug_verbose %] CMAKE_CXX_STANDARD: [% cmake_cxx_standard %] TEST_LB_SCHEMA: [% test_lb_schema %] CACHE: "$(Agent.TempDirectory)/cache/" diff --git a/scripts/workflows-azure.ini b/scripts/workflows-azure.ini index 352a842e4b..17219eae50 100644 --- a/scripts/workflows-azure.ini +++ b/scripts/workflows-azure.ini @@ -42,9 +42,10 @@ vt_no_color = 1 vt_build_shared_libs = 0 vt_inclusion = TPL cmake_cxx_standard = 17 +vt_debug_verbose = 0 [PR-tests-intel-oneAPI] -test_configuration = "intel icpx, ubuntu, mpich" +test_configuration = "intel icpx, ubuntu, mpich, verbose" compiler_type = intel-oneapi compiler = icpx cache_name = ubuntu-intel-oneapi-icpx-cache @@ -52,6 +53,7 @@ output_name = ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml vt_trace = 1 vt_pool = 0 vt_extended_tests = 0 +vt_debug_verbose = 1 [PR-tests-intel-classic] test_configuration = "intel icpc, ubuntu, mpich" @@ -62,7 +64,7 @@ output_name = ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml vt_extended_tests = 0 [PR-tests-nvcc-12-2-gcc-9] -test_configuration = "nvidia cuda 12.2.0, gcc-9, ubuntu, mpich" +test_configuration = "nvidia cuda 12.2.0, gcc-9, ubuntu, mpich, verbose" compiler_type = nvidia compiler = 12.2.0 host_compiler = gcc-9 @@ -75,6 +77,7 @@ vt_diagnostics = 0 vt_trace = 1 vt_pool = 0 vt_tests_num_nodes = 4 +vt_debug_verbose = 1 [PR-tests-nvcc-11-2-gcc-9] test_configuration = "nvidia cuda 11.2, gcc-9, ubuntu, mpich" @@ -121,7 +124,7 @@ vt_lb = 0 vt_tests_num_nodes = 4 [PR-tests-gcc-11] -test_configuration = "gcc-11, ubuntu, mpich, trace runtime, coverage" +test_configuration = "gcc-11, ubuntu, mpich, trace runtime, coverage, verbose" compiler_type = gnu compiler = gcc-11 distro = 22.04 @@ -129,6 +132,7 @@ vt_trace = 1 vt_trace_rt = 1 vt_unity_build = 0 vt_code_coverage = 1 +vt_debug_verbose = 1 docker_target = "[% linux %]-cpp-clean-noinstall" output_name = ci/azure/azure-gcc-11-ubuntu-mpich.yml @@ -193,9 +197,10 @@ distro = 22.04 output_name = ci/azure/azure-clang-13-ubuntu-mpich.yml [PR-tests-clang-14] -test_configuration = "clang-14, ubuntu, mpich" +test_configuration = "clang-14, ubuntu, mpich, verbose" compiler_type = clang compiler = clang-14 distro = 22.04 output_name = ci/azure/azure-clang-14-ubuntu-mpich.yml vt_trace = 1 +vt_debug_verbose = 1 From a17faf317db056fac742cbd95af9ce8b153ebafd Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Tue, 2 Apr 2024 18:24:29 +0200 Subject: [PATCH 02/13] #2260: Enable verbose logs on CI job which runs for draft PRs. --- ci/azure/azure-gcc-11-ubuntu-mpich.yml | 4 ++-- ci/azure/azure-gcc-12-ubuntu-mpich.yml | 4 ++-- scripts/workflows-azure.ini | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ci/azure/azure-gcc-11-ubuntu-mpich.yml b/ci/azure/azure-gcc-11-ubuntu-mpich.yml index a5ab699323..f8e86e08ac 100644 --- a/ci/azure/azure-gcc-11-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-11-ubuntu-mpich.yml @@ -2,7 +2,7 @@ ############## Warning this is a generated file---do not modify ############### ############################################################################### -name: PR tests (gcc-11, ubuntu, mpich, trace runtime, coverage, verbose) +name: PR tests (gcc-11, ubuntu, mpich, trace runtime, coverage) trigger: branches: @@ -53,7 +53,7 @@ variables: VT_NO_COLOR: 1 VT_BUILD_SHARED_LIBS: 0 VT_INCLUSION: TPL - VT_DEBUG_VERBOSE: 1 + VT_DEBUG_VERBOSE: 0 CMAKE_CXX_STANDARD: 17 TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" diff --git a/ci/azure/azure-gcc-12-ubuntu-mpich.yml b/ci/azure/azure-gcc-12-ubuntu-mpich.yml index 10f0f77c3b..330ab04925 100644 --- a/ci/azure/azure-gcc-12-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-12-ubuntu-mpich.yml @@ -2,7 +2,7 @@ ############## Warning this is a generated file---do not modify ############### ############################################################################### -name: PR tests (gcc-12, ubuntu, mpich) +name: PR tests (gcc-12, ubuntu, mpich, verbose) trigger: branches: @@ -53,7 +53,7 @@ variables: VT_NO_COLOR: 1 VT_BUILD_SHARED_LIBS: 0 VT_INCLUSION: TPL - VT_DEBUG_VERBOSE: 0 + VT_DEBUG_VERBOSE: 1 CMAKE_CXX_STANDARD: 17 TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" diff --git a/scripts/workflows-azure.ini b/scripts/workflows-azure.ini index 17219eae50..5543f6116c 100644 --- a/scripts/workflows-azure.ini +++ b/scripts/workflows-azure.ini @@ -124,7 +124,7 @@ vt_lb = 0 vt_tests_num_nodes = 4 [PR-tests-gcc-11] -test_configuration = "gcc-11, ubuntu, mpich, trace runtime, coverage, verbose" +test_configuration = "gcc-11, ubuntu, mpich, trace runtime, coverage" compiler_type = gnu compiler = gcc-11 distro = 22.04 @@ -132,17 +132,17 @@ vt_trace = 1 vt_trace_rt = 1 vt_unity_build = 0 vt_code_coverage = 1 -vt_debug_verbose = 1 docker_target = "[% linux %]-cpp-clean-noinstall" output_name = ci/azure/azure-gcc-11-ubuntu-mpich.yml [PR-tests-gcc-12] -test_configuration = "gcc-12, ubuntu, mpich" +test_configuration = "gcc-12, ubuntu, mpich, verbose" compiler_type = gnu compiler = gcc-12 distro = 22.04 output_name = ci/azure/azure-gcc-12-ubuntu-mpich.yml pr_pattern = "pr:\\n drafts: true\\n autoCancel: true\\n branches:\\n include:\\n - '*'\\n" +vt_debug_verbose = 1 [PR-tests-clang-13-alpine] test_configuration = "clang-13, alpine, mpich" From 80eef2d9f90e79c9863f7299fa5a216693debdb7 Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Thu, 4 Apr 2024 12:21:21 +0200 Subject: [PATCH 03/13] #2260: Disable CI flag for gcc-12 build --- ci/azure/azure-gcc-12-ubuntu-mpich.yml | 2 +- scripts/workflows-azure.ini | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/azure/azure-gcc-12-ubuntu-mpich.yml b/ci/azure/azure-gcc-12-ubuntu-mpich.yml index 330ab04925..755a9151e8 100644 --- a/ci/azure/azure-gcc-12-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-12-ubuntu-mpich.yml @@ -48,7 +48,7 @@ variables: VT_PRODUCTION_BUILD: 0 VT_FCONTEXT: 0 VT_ZOLTAN: 0 - VT_CI_BUILD: 1 + VT_CI_BUILD: 0 VT_DIAGNOSTICS: 1 VT_NO_COLOR: 1 VT_BUILD_SHARED_LIBS: 0 diff --git a/scripts/workflows-azure.ini b/scripts/workflows-azure.ini index 5543f6116c..dac80afb3b 100644 --- a/scripts/workflows-azure.ini +++ b/scripts/workflows-azure.ini @@ -143,6 +143,7 @@ distro = 22.04 output_name = ci/azure/azure-gcc-12-ubuntu-mpich.yml pr_pattern = "pr:\\n drafts: true\\n autoCancel: true\\n branches:\\n include:\\n - '*'\\n" vt_debug_verbose = 1 +vt_ci_build = 0 [PR-tests-clang-13-alpine] test_configuration = "clang-13, alpine, mpich" From d154e6f036f1668bd064fc8cb8c385883b33dec3 Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Tue, 9 Apr 2024 12:50:31 +0200 Subject: [PATCH 04/13] #2260: Enable verbose logging for all unit tests --- tests/unit/test_parallel_harness.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/unit/test_parallel_harness.h b/tests/unit/test_parallel_harness.h index a8c95c3eda..bf7cbfc8ae 100644 --- a/tests/unit/test_parallel_harness.h +++ b/tests/unit/test_parallel_harness.h @@ -70,6 +70,13 @@ struct TestParallelHarnessAny : TestHarnessAny { addArgs(traceon); #endif +#if vt_feature_cmake_debug_verbose and !vt_feature_cmake_ci_build + static char verbose_on[]{"--vt_debug_level=verbose"}; + static char debug_all[]{"--vt_debug_all"}; + static char verbose_flush[]{"--vt_debug_print_flush"}; + addArgs(verbose_on, debug_all, verbose_flush); +#endif + static char throw_on_abort[]{"--vt_throw_on_abort=1"}; addArgs(throw_on_abort); From 7d61fb649b252a6a9ee2bb04780a776f43031cd8 Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Tue, 9 Apr 2024 12:52:59 +0200 Subject: [PATCH 05/13] #2260: Modify CI to properly enable verbose logging --- ci/azure/azure-clang-14-ubuntu-mpich.yml | 4 ++-- ci/azure/azure-gcc-12-ubuntu-mpich.yml | 2 +- ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml | 4 ++-- ci/azure/azure-nvidia-12-ubuntu-mpich.yml | 4 ++-- scripts/workflows-azure.ini | 7 +++++++ 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ci/azure/azure-clang-14-ubuntu-mpich.yml b/ci/azure/azure-clang-14-ubuntu-mpich.yml index e7e6c983d4..634500c978 100644 --- a/ci/azure/azure-clang-14-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-14-ubuntu-mpich.yml @@ -29,7 +29,7 @@ variables: COMPILER_TYPE: clang COMPILER: clang-14 HOST_COMPILER: clang-14 - BUILD_TYPE: release + BUILD_TYPE: debug ULIMIT_CORE: 0 VT_CODE_COVERAGE: 0 VT_LB: 1 @@ -48,7 +48,7 @@ variables: VT_PRODUCTION_BUILD: 0 VT_FCONTEXT: 0 VT_ZOLTAN: 0 - VT_CI_BUILD: 1 + VT_CI_BUILD: 0 VT_DIAGNOSTICS: 1 VT_NO_COLOR: 1 VT_BUILD_SHARED_LIBS: 0 diff --git a/ci/azure/azure-gcc-12-ubuntu-mpich.yml b/ci/azure/azure-gcc-12-ubuntu-mpich.yml index 755a9151e8..c98242230e 100644 --- a/ci/azure/azure-gcc-12-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-12-ubuntu-mpich.yml @@ -29,7 +29,7 @@ variables: COMPILER_TYPE: gnu COMPILER: gcc-12 HOST_COMPILER: gcc-12 - BUILD_TYPE: release + BUILD_TYPE: debug ULIMIT_CORE: 0 VT_CODE_COVERAGE: 0 VT_LB: 1 diff --git a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml index 225c5260b9..daa5707f83 100644 --- a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml @@ -29,7 +29,7 @@ variables: COMPILER_TYPE: intel-oneapi COMPILER: icpx HOST_COMPILER: icpx - BUILD_TYPE: release + BUILD_TYPE: debug ULIMIT_CORE: 0 VT_CODE_COVERAGE: 0 VT_LB: 1 @@ -48,7 +48,7 @@ variables: VT_PRODUCTION_BUILD: 0 VT_FCONTEXT: 0 VT_ZOLTAN: 0 - VT_CI_BUILD: 1 + VT_CI_BUILD: 0 VT_DIAGNOSTICS: 1 VT_NO_COLOR: 1 VT_BUILD_SHARED_LIBS: 0 diff --git a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml index 7dce80b3c8..2e3eea97eb 100644 --- a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml @@ -29,7 +29,7 @@ variables: COMPILER_TYPE: nvidia COMPILER: 12.2.0 HOST_COMPILER: gcc-9 - BUILD_TYPE: release + BUILD_TYPE: debug ULIMIT_CORE: 0 VT_CODE_COVERAGE: 0 VT_LB: 1 @@ -48,7 +48,7 @@ variables: VT_PRODUCTION_BUILD: 0 VT_FCONTEXT: 0 VT_ZOLTAN: 0 - VT_CI_BUILD: 1 + VT_CI_BUILD: 0 VT_DIAGNOSTICS: 0 VT_NO_COLOR: 1 VT_BUILD_SHARED_LIBS: 0 diff --git a/scripts/workflows-azure.ini b/scripts/workflows-azure.ini index dac80afb3b..5c02b7083d 100644 --- a/scripts/workflows-azure.ini +++ b/scripts/workflows-azure.ini @@ -54,6 +54,8 @@ vt_trace = 1 vt_pool = 0 vt_extended_tests = 0 vt_debug_verbose = 1 +vt_ci_build = 0 +build_type = debug [PR-tests-intel-classic] test_configuration = "intel icpc, ubuntu, mpich" @@ -78,6 +80,8 @@ vt_trace = 1 vt_pool = 0 vt_tests_num_nodes = 4 vt_debug_verbose = 1 +vt_ci_build = 0 +build_type = debug [PR-tests-nvcc-11-2-gcc-9] test_configuration = "nvidia cuda 11.2, gcc-9, ubuntu, mpich" @@ -144,6 +148,7 @@ output_name = ci/azure/azure-gcc-12-ubuntu-mpich.yml pr_pattern = "pr:\\n drafts: true\\n autoCancel: true\\n branches:\\n include:\\n - '*'\\n" vt_debug_verbose = 1 vt_ci_build = 0 +build_type = debug [PR-tests-clang-13-alpine] test_configuration = "clang-13, alpine, mpich" @@ -205,3 +210,5 @@ distro = 22.04 output_name = ci/azure/azure-clang-14-ubuntu-mpich.yml vt_trace = 1 vt_debug_verbose = 1 +vt_ci_build = 0 +build_type = debug From 5923dc05a09fb60601aec2150c929476e28c7423 Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Fri, 12 Apr 2024 11:04:11 +0200 Subject: [PATCH 06/13] #2260: Change build type for verbose jobs to release --- ci/azure/azure-clang-14-ubuntu-mpich.yml | 2 +- ci/azure/azure-gcc-12-ubuntu-mpich.yml | 2 +- ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml | 2 +- ci/azure/azure-nvidia-12-ubuntu-mpich.yml | 2 +- scripts/workflows-azure.ini | 4 ---- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ci/azure/azure-clang-14-ubuntu-mpich.yml b/ci/azure/azure-clang-14-ubuntu-mpich.yml index 634500c978..46a90c90d4 100644 --- a/ci/azure/azure-clang-14-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-14-ubuntu-mpich.yml @@ -29,7 +29,7 @@ variables: COMPILER_TYPE: clang COMPILER: clang-14 HOST_COMPILER: clang-14 - BUILD_TYPE: debug + BUILD_TYPE: release ULIMIT_CORE: 0 VT_CODE_COVERAGE: 0 VT_LB: 1 diff --git a/ci/azure/azure-gcc-12-ubuntu-mpich.yml b/ci/azure/azure-gcc-12-ubuntu-mpich.yml index c98242230e..755a9151e8 100644 --- a/ci/azure/azure-gcc-12-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-12-ubuntu-mpich.yml @@ -29,7 +29,7 @@ variables: COMPILER_TYPE: gnu COMPILER: gcc-12 HOST_COMPILER: gcc-12 - BUILD_TYPE: debug + BUILD_TYPE: release ULIMIT_CORE: 0 VT_CODE_COVERAGE: 0 VT_LB: 1 diff --git a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml index daa5707f83..178efe5a77 100644 --- a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml @@ -29,7 +29,7 @@ variables: COMPILER_TYPE: intel-oneapi COMPILER: icpx HOST_COMPILER: icpx - BUILD_TYPE: debug + BUILD_TYPE: release ULIMIT_CORE: 0 VT_CODE_COVERAGE: 0 VT_LB: 1 diff --git a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml index 2e3eea97eb..13bb74579f 100644 --- a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml @@ -29,7 +29,7 @@ variables: COMPILER_TYPE: nvidia COMPILER: 12.2.0 HOST_COMPILER: gcc-9 - BUILD_TYPE: debug + BUILD_TYPE: release ULIMIT_CORE: 0 VT_CODE_COVERAGE: 0 VT_LB: 1 diff --git a/scripts/workflows-azure.ini b/scripts/workflows-azure.ini index 5c02b7083d..8fde9aca22 100644 --- a/scripts/workflows-azure.ini +++ b/scripts/workflows-azure.ini @@ -55,7 +55,6 @@ vt_pool = 0 vt_extended_tests = 0 vt_debug_verbose = 1 vt_ci_build = 0 -build_type = debug [PR-tests-intel-classic] test_configuration = "intel icpc, ubuntu, mpich" @@ -81,7 +80,6 @@ vt_pool = 0 vt_tests_num_nodes = 4 vt_debug_verbose = 1 vt_ci_build = 0 -build_type = debug [PR-tests-nvcc-11-2-gcc-9] test_configuration = "nvidia cuda 11.2, gcc-9, ubuntu, mpich" @@ -148,7 +146,6 @@ output_name = ci/azure/azure-gcc-12-ubuntu-mpich.yml pr_pattern = "pr:\\n drafts: true\\n autoCancel: true\\n branches:\\n include:\\n - '*'\\n" vt_debug_verbose = 1 vt_ci_build = 0 -build_type = debug [PR-tests-clang-13-alpine] test_configuration = "clang-13, alpine, mpich" @@ -211,4 +208,3 @@ output_name = ci/azure/azure-clang-14-ubuntu-mpich.yml vt_trace = 1 vt_debug_verbose = 1 vt_ci_build = 0 -build_type = debug From 10a063489f7624b8efdd8375b45d679a18f9f8ce Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Fri, 12 Apr 2024 12:29:59 +0200 Subject: [PATCH 07/13] #2260: Remove unneded flush from test parameters --- tests/unit/test_parallel_harness.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/unit/test_parallel_harness.h b/tests/unit/test_parallel_harness.h index bf7cbfc8ae..bb2e6458db 100644 --- a/tests/unit/test_parallel_harness.h +++ b/tests/unit/test_parallel_harness.h @@ -73,8 +73,7 @@ struct TestParallelHarnessAny : TestHarnessAny { #if vt_feature_cmake_debug_verbose and !vt_feature_cmake_ci_build static char verbose_on[]{"--vt_debug_level=verbose"}; static char debug_all[]{"--vt_debug_all"}; - static char verbose_flush[]{"--vt_debug_print_flush"}; - addArgs(verbose_on, debug_all, verbose_flush); + addArgs(verbose_on, debug_all); #endif static char throw_on_abort[]{"--vt_throw_on_abort=1"}; From ac0683600cda1d8076d7b0d4343ccfc0170c6dfc Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Fri, 12 Apr 2024 14:33:22 +0200 Subject: [PATCH 08/13] #2260: Add flushing of verbose logs in tests --- tests/unit/test_parallel_harness.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/unit/test_parallel_harness.h b/tests/unit/test_parallel_harness.h index bb2e6458db..bf7cbfc8ae 100644 --- a/tests/unit/test_parallel_harness.h +++ b/tests/unit/test_parallel_harness.h @@ -73,7 +73,8 @@ struct TestParallelHarnessAny : TestHarnessAny { #if vt_feature_cmake_debug_verbose and !vt_feature_cmake_ci_build static char verbose_on[]{"--vt_debug_level=verbose"}; static char debug_all[]{"--vt_debug_all"}; - addArgs(verbose_on, debug_all); + static char verbose_flush[]{"--vt_debug_print_flush"}; + addArgs(verbose_on, debug_all, verbose_flush); #endif static char throw_on_abort[]{"--vt_throw_on_abort=1"}; From 66312293d8df446d84f07863bc0db9a4df5cbae2 Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Tue, 16 Apr 2024 13:51:24 +0200 Subject: [PATCH 09/13] #2260: Remove flush to stdout parameter --- tests/unit/test_parallel_harness.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/unit/test_parallel_harness.h b/tests/unit/test_parallel_harness.h index bf7cbfc8ae..bb2e6458db 100644 --- a/tests/unit/test_parallel_harness.h +++ b/tests/unit/test_parallel_harness.h @@ -73,8 +73,7 @@ struct TestParallelHarnessAny : TestHarnessAny { #if vt_feature_cmake_debug_verbose and !vt_feature_cmake_ci_build static char verbose_on[]{"--vt_debug_level=verbose"}; static char debug_all[]{"--vt_debug_all"}; - static char verbose_flush[]{"--vt_debug_print_flush"}; - addArgs(verbose_on, debug_all, verbose_flush); + addArgs(verbose_on, debug_all); #endif static char throw_on_abort[]{"--vt_throw_on_abort=1"}; From dad9d25cd754d02ee4b54971a23c0b8ece3698f7 Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Tue, 16 Apr 2024 15:11:34 +0200 Subject: [PATCH 10/13] #2260: Remove debug_all flag --- tests/unit/test_parallel_harness.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/unit/test_parallel_harness.h b/tests/unit/test_parallel_harness.h index bb2e6458db..4a88ac3739 100644 --- a/tests/unit/test_parallel_harness.h +++ b/tests/unit/test_parallel_harness.h @@ -72,8 +72,7 @@ struct TestParallelHarnessAny : TestHarnessAny { #if vt_feature_cmake_debug_verbose and !vt_feature_cmake_ci_build static char verbose_on[]{"--vt_debug_level=verbose"}; - static char debug_all[]{"--vt_debug_all"}; - addArgs(verbose_on, debug_all); + addArgs(verbose_on); #endif static char throw_on_abort[]{"--vt_throw_on_abort=1"}; From 6bbcc2a9aaa0a43f7ad540c292a52cfde910d0eb Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Wed, 17 Apr 2024 12:31:20 +0200 Subject: [PATCH 11/13] #2260: Explicitly pass debug verbose and ci build flags --- ci/build_cpp.sh | 2 +- ci/docker/alpine-cpp.dockerfile | 6 +++++- ci/docker/develop.dockerfile | 8 +++++++- ci/docker/ubuntu-20.04-gnu-openmpi-cpp.dockerfile | 6 +++++- ci/docker/ubuntu-clang-cpp.dockerfile | 6 +++++- ci/docker/ubuntu-gnu-cpp.dockerfile | 6 +++++- ci/docker/ubuntu-gnu-docs.dockerfile | 6 +++++- ci/docker/ubuntu-intel-oneapi-cpp.dockerfile | 6 +++++- ci/docker/ubuntu-nvidia-cpp.dockerfile | 6 +++++- docker-compose.yml | 4 ++-- 10 files changed, 45 insertions(+), 11 deletions(-) diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 006f7eb557..3ea13e9ced 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -124,7 +124,7 @@ cmake -G "${CMAKE_GENERATOR:-Ninja}" \ -DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH:-}" \ -DCMAKE_INSTALL_PREFIX="$VT_BUILD/install" \ -Dvt_ci_build="${VT_CI_BUILD:-0}" \ - -Dvt_debug_verbose="${VT_DEBUG_VERBOSE:-}" \ + -Dvt_debug_verbose="${VT_DEBUG_VERBOSE:-0}" \ -Dvt_tests_num_nodes="${VT_TESTS_NUM_NODES:-}" \ -Dvt_no_color_enabled="${VT_NO_COLOR_ENABLED:-0}" \ -DCMAKE_CXX_STANDARD="${CMAKE_CXX_STANDARD:-17}" \ diff --git a/ci/docker/alpine-cpp.dockerfile b/ci/docker/alpine-cpp.dockerfile index a2cf6b73c5..9eee993129 100644 --- a/ci/docker/alpine-cpp.dockerfile +++ b/ci/docker/alpine-cpp.dockerfile @@ -68,6 +68,8 @@ ARG CMAKE_BUILD_TYPE ARG VT_NO_COLOR_ENABLED ARG BUILD_SHARED_LIBS ARG CMAKE_CXX_STANDARD +ARG VT_DEBUG_VERBOSE +ARG VT_CI_BUILD ENV VT_LB_ENABLED=${VT_LB_ENABLED} \ VT_TRACE_ENABLED=${VT_TRACE_ENABLED} \ @@ -83,7 +85,9 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \ VT_NO_COLOR_ENABLED=${VT_NO_COLOR_ENABLED} \ CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} \ BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} \ - CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \ + VT_DEBUG_VERBOSE=${VT_DEBUG_VERBOSE} \ + VT_CI_BUILD=${VT_CI_BUILD} RUN /vt/ci/build_cpp.sh /vt /build diff --git a/ci/docker/develop.dockerfile b/ci/docker/develop.dockerfile index d7409bd0d4..1df31c93d1 100644 --- a/ci/docker/develop.dockerfile +++ b/ci/docker/develop.dockerfile @@ -40,6 +40,7 @@ ARG VT_ASAN_ENABLED ARG VT_UBSAN_ENABLED ARG VT_WERROR_ENABLED ARG VT_POOL_ENABLED +ARG VT_PRODUCTION_BUILD_ENABLED ARG VT_ZOLTAN_ENABLED ARG CMAKE_BUILD_TYPE ARG VT_EXTENDED_TESTS_ENABLED @@ -47,6 +48,8 @@ ARG VT_FCONTEXT_ENABLED ARG VT_NO_COLOR_ENABLED ARG BUILD_SHARED_LIBS ARG CMAKE_CXX_STANDARD +ARG VT_DEBUG_VERBOSE +ARG VT_CI_BUILD ENV VT_LB_ENABLED=${VT_LB_ENABLED} \ VT_TRACE_ENABLED=${VT_TRACE_ENABLED} \ @@ -57,6 +60,7 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \ VT_UBSAN_ENABLED=${VT_UBSAN_ENABLED} \ VT_WERROR_ENABLED=${VT_WERROR_ENABLED} \ VT_POOL_ENABLED=${VT_POOL_ENABLED} \ + VT_PRODUCTION_BUILD_ENABLED=${VT_PRODUCTION_BUILD_ENABLED} \ VT_MPI_GUARD_ENABLED=${VT_MPI_GUARD_ENABLED} \ VT_ZOLTAN_ENABLED=${VT_ZOLTAN_ENABLED} \ VT_EXTENDED_TESTS_ENABLED=${VT_EXTENDED_TESTS_ENABLED} \ @@ -67,7 +71,9 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \ VT_NO_COLOR_ENABLED=${VT_NO_COLOR_ENABLED} \ CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} \ BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} \ - CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \ + VT_DEBUG_VERBOSE=${VT_DEBUG_VERBOSE} \ + VT_CI_BUILD=${VT_CI_BUILD} RUN /vt/ci/build_cpp.sh /vt /build RUN /vt/ci/test_cpp.sh /vt /build diff --git a/ci/docker/ubuntu-20.04-gnu-openmpi-cpp.dockerfile b/ci/docker/ubuntu-20.04-gnu-openmpi-cpp.dockerfile index 4156a06167..9cb7bfcf54 100644 --- a/ci/docker/ubuntu-20.04-gnu-openmpi-cpp.dockerfile +++ b/ci/docker/ubuntu-20.04-gnu-openmpi-cpp.dockerfile @@ -96,6 +96,8 @@ ARG VT_EXTENDED_TESTS_ENABLED ARG VT_NO_COLOR_ENABLED ARG BUILD_SHARED_LIBS ARG CMAKE_CXX_STANDARD +ARG VT_DEBUG_VERBOSE +ARG VT_CI_BUILD ENV VT_LB_ENABLED=${VT_LB_ENABLED} \ VT_TRACE_ENABLED=${VT_TRACE_ENABLED} \ @@ -117,7 +119,9 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \ VT_NO_COLOR_ENABLED=${VT_NO_COLOR_ENABLED} \ CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} \ BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} \ - CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \ + VT_DEBUG_VERBOSE=${VT_DEBUG_VERBOSE} \ + VT_CI_BUILD=${VT_CI_BUILD} RUN /vt/ci/build_cpp.sh /vt /build diff --git a/ci/docker/ubuntu-clang-cpp.dockerfile b/ci/docker/ubuntu-clang-cpp.dockerfile index d1c01de4e9..3621d82f71 100644 --- a/ci/docker/ubuntu-clang-cpp.dockerfile +++ b/ci/docker/ubuntu-clang-cpp.dockerfile @@ -81,6 +81,8 @@ ARG VT_TRACE_RUNTIME_ENABLED ARG VT_UBSAN_ENABLED ARG VT_WERROR_ENABLED ARG CMAKE_CXX_STANDARD +ARG VT_DEBUG_VERBOSE +ARG VT_CI_BUILD ENV BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} \ CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \ @@ -101,7 +103,9 @@ ENV BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} \ VT_UBSAN_ENABLED=${VT_UBSAN_ENABLED} \ VT_UNITY_BUILD_ENABLED=${VT_UNITY_BUILD_ENABLED} \ VT_WERROR_ENABLED=${VT_WERROR_ENABLED} \ - CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} + CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} \ + VT_DEBUG_VERBOSE=${VT_DEBUG_VERBOSE} \ + VT_CI_BUILD=${VT_CI_BUILD} RUN /vt/ci/build_cpp.sh /vt /build diff --git a/ci/docker/ubuntu-gnu-cpp.dockerfile b/ci/docker/ubuntu-gnu-cpp.dockerfile index 75a380b808..2361da7375 100644 --- a/ci/docker/ubuntu-gnu-cpp.dockerfile +++ b/ci/docker/ubuntu-gnu-cpp.dockerfile @@ -109,6 +109,8 @@ ARG VT_UBSAN_ENABLED ARG VT_WERROR_ENABLED ARG VT_ZOLTAN_ENABLED ARG CMAKE_CXX_STANDARD +ARG VT_DEBUG_VERBOSE +ARG VT_CI_BUILD ENV BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} \ CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \ @@ -130,7 +132,9 @@ ENV BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} \ VT_UNITY_BUILD_ENABLED=${VT_UNITY_BUILD_ENABLED} \ VT_WERROR_ENABLED=${VT_WERROR_ENABLED} \ VT_ZOLTAN_ENABLED=${VT_ZOLTAN_ENABLED} \ - CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} + CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} \ + VT_DEBUG_VERBOSE=$(VT_DEBUG_VERBOSE) \ + VT_CI_BUILD=${VT_CI_BUILD} RUN /vt/ci/build_cpp.sh /vt /build diff --git a/ci/docker/ubuntu-gnu-docs.dockerfile b/ci/docker/ubuntu-gnu-docs.dockerfile index 1434b6af1c..09038c97ff 100644 --- a/ci/docker/ubuntu-gnu-docs.dockerfile +++ b/ci/docker/ubuntu-gnu-docs.dockerfile @@ -65,6 +65,8 @@ ARG VT_FCONTEXT_ENABLED ARG VT_NO_COLOR_ENABLED ARG BUILD_SHARED_LIBS ARG CMAKE_CXX_STANDARD +ARG VT_DEBUG_VERBOSE +ARG VT_CI_BUILD ENV VT_LB_ENABLED=${VT_LB_ENABLED} \ VT_TRACE_ENABLED=${VT_TRACE_ENABLED} \ @@ -84,6 +86,8 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \ VT_NO_COLOR_ENABLED=${VT_NO_COLOR_ENABLED} \ CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} \ BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} \ - CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \ + VT_DEBUG_VERBOSE=${VT_DEBUG_VERBOSE} \ + VT_CI_BUILD=${VT_CI_BUILD} RUN /vt/ci/build_cpp.sh /vt /build "${token}" diff --git a/ci/docker/ubuntu-intel-oneapi-cpp.dockerfile b/ci/docker/ubuntu-intel-oneapi-cpp.dockerfile index c3ce8235c7..82e0361fd4 100644 --- a/ci/docker/ubuntu-intel-oneapi-cpp.dockerfile +++ b/ci/docker/ubuntu-intel-oneapi-cpp.dockerfile @@ -73,6 +73,8 @@ ARG VT_FCONTEXT_ENABLED ARG CMAKE_BUILD_TYPE ARG VT_EXTENDED_TESTS_ENABLED ARG CMAKE_CXX_STANDARD +ARG VT_DEBUG_VERBOSE +ARG VT_CI_BUILD ENV VT_LB_ENABLED=${VT_LB_ENABLED} \ VT_TRACE_ENABLED=${VT_TRACE_ENABLED} \ @@ -90,7 +92,9 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \ VT_DIAGNOSTICS_ENABLED=${VT_DIAGNOSTICS_ENABLED} \ VT_DIAGNOSTICS_RUNTIME_ENABLED=${VT_DIAGNOSTICS_RUNTIME_ENABLED} \ CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} \ - CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \ + VT_DEBUG_VERBOSE=${VT_DEBUG_VERBOSE} \ + VT_CI_BUILD=${VT_CI_BUILD} RUN /vt/ci/build_cpp.sh /vt /build diff --git a/ci/docker/ubuntu-nvidia-cpp.dockerfile b/ci/docker/ubuntu-nvidia-cpp.dockerfile index c4e9335df8..c6bd3df982 100644 --- a/ci/docker/ubuntu-nvidia-cpp.dockerfile +++ b/ci/docker/ubuntu-nvidia-cpp.dockerfile @@ -79,6 +79,8 @@ ARG VT_FCONTEXT_ENABLED ARG VT_NO_COLOR_ENABLED ARG BUILD_SHARED_LIBS ARG CMAKE_CXX_STANDARD +ARG VT_DEBUG_VERBOSE +ARG VT_CI_BUILD ENV VT_LB_ENABLED=${VT_LB_ENABLED} \ VT_TRACE_ENABLED=${VT_TRACE_ENABLED} \ @@ -98,7 +100,9 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \ VT_NO_COLOR_ENABLED=${VT_NO_COLOR_ENABLED} \ CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} \ BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} \ - CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \ + VT_DEBUG_VERBOSE=${VT_DEBUG_VERBOSE} \ + VT_CI_BUILD=${VT_CI_BUILD} RUN /vt/ci/build_cpp.sh /vt /build diff --git a/docker-compose.yml b/docker-compose.yml index 3c65322bec..d223db0b2f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,7 +36,7 @@ # VT_DIAGNOSTICS_RUNTIME=0 # Enable diagnostics collection at runtime by default # BUILD_TYPE=release # CMake build type # VT_CODE_COVERAGE=0 # Enable generation of code coverage reports -# VT_DEBUG_VERBOSE # Enable verbose debug prints at compile-time +# VT_DEBUG_VERBOSE=0 # Enable verbose debug prints at compile-time # VT_NO_COLOR_ENABLED=0 # Set --vt_no_color flag to true by default # VT_BUILD_SHARED_LIBS=0 # Build VT as shared library # @@ -110,7 +110,7 @@ x-vtopts: &vtopts LSAN_OPTIONS: ${LSAN_OPTIONS-} UBSAN_OPTIONS: ${UBSAN_OPTIONS-} VT_CI_BUILD: ${VT_CI_BUILD:-0} - VT_DEBUG_VERBOSE: ${VT_DEBUG_VERBOSE-} + VT_DEBUG_VERBOSE: ${VT_DEBUG_VERBOSE:-0} VT_TESTS_NUM_NODES: ${VT_TESTS_NUM_NODES:-} VT_NO_COLOR_ENABLED: ${VT_NO_COLOR:-0} BUILD_SHARED_LIBS: ${VT_BUILD_SHARED_LIBS:-0} From d7376685143c036a644ea7a8d0b2572dac02be4e Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Mon, 22 Apr 2024 15:44:41 +0200 Subject: [PATCH 12/13] #2260: Make verbose logging independent from CI_BUILD flag --- src/vt/configs/debug/debug_masterconfig.h | 2 +- tests/unit/test_parallel_harness.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vt/configs/debug/debug_masterconfig.h b/src/vt/configs/debug/debug_masterconfig.h index fe6cd1d75e..0e121f50e6 100644 --- a/src/vt/configs/debug/debug_masterconfig.h +++ b/src/vt/configs/debug/debug_masterconfig.h @@ -65,7 +65,7 @@ using VTPrintConfig = Configuration< CtxEnum::unknown ), static_cast( -#if !vt_feature_cmake_ci_build +#if !vt_feature_cmake_ci_build || vt_feature_cmake_debug_verbose ModeEnum::terse | ModeEnum::normal | #if vt_feature_cmake_debug_verbose diff --git a/tests/unit/test_parallel_harness.h b/tests/unit/test_parallel_harness.h index 4a88ac3739..5e3971bc09 100644 --- a/tests/unit/test_parallel_harness.h +++ b/tests/unit/test_parallel_harness.h @@ -70,7 +70,7 @@ struct TestParallelHarnessAny : TestHarnessAny { addArgs(traceon); #endif -#if vt_feature_cmake_debug_verbose and !vt_feature_cmake_ci_build +#if vt_feature_cmake_debug_verbose static char verbose_on[]{"--vt_debug_level=verbose"}; addArgs(verbose_on); #endif From 554d368a5339596a1aa078df4291447894d7c765 Mon Sep 17 00:00:00 2001 From: Arkadiusz Szczepkowicz Date: Mon, 22 Apr 2024 15:46:58 +0200 Subject: [PATCH 13/13] #2260: Enable CI_BUILD flag on all CI jobs --- ci/azure/azure-clang-14-ubuntu-mpich.yml | 2 +- ci/azure/azure-gcc-12-ubuntu-mpich.yml | 2 +- ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml | 2 +- ci/azure/azure-nvidia-12-ubuntu-mpich.yml | 2 +- scripts/workflows-azure.ini | 4 ---- 5 files changed, 4 insertions(+), 8 deletions(-) diff --git a/ci/azure/azure-clang-14-ubuntu-mpich.yml b/ci/azure/azure-clang-14-ubuntu-mpich.yml index 46a90c90d4..e7e6c983d4 100644 --- a/ci/azure/azure-clang-14-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-14-ubuntu-mpich.yml @@ -48,7 +48,7 @@ variables: VT_PRODUCTION_BUILD: 0 VT_FCONTEXT: 0 VT_ZOLTAN: 0 - VT_CI_BUILD: 0 + VT_CI_BUILD: 1 VT_DIAGNOSTICS: 1 VT_NO_COLOR: 1 VT_BUILD_SHARED_LIBS: 0 diff --git a/ci/azure/azure-gcc-12-ubuntu-mpich.yml b/ci/azure/azure-gcc-12-ubuntu-mpich.yml index 755a9151e8..330ab04925 100644 --- a/ci/azure/azure-gcc-12-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-12-ubuntu-mpich.yml @@ -48,7 +48,7 @@ variables: VT_PRODUCTION_BUILD: 0 VT_FCONTEXT: 0 VT_ZOLTAN: 0 - VT_CI_BUILD: 0 + VT_CI_BUILD: 1 VT_DIAGNOSTICS: 1 VT_NO_COLOR: 1 VT_BUILD_SHARED_LIBS: 0 diff --git a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml index 178efe5a77..225c5260b9 100644 --- a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml @@ -48,7 +48,7 @@ variables: VT_PRODUCTION_BUILD: 0 VT_FCONTEXT: 0 VT_ZOLTAN: 0 - VT_CI_BUILD: 0 + VT_CI_BUILD: 1 VT_DIAGNOSTICS: 1 VT_NO_COLOR: 1 VT_BUILD_SHARED_LIBS: 0 diff --git a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml index 13bb74579f..7dce80b3c8 100644 --- a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml @@ -48,7 +48,7 @@ variables: VT_PRODUCTION_BUILD: 0 VT_FCONTEXT: 0 VT_ZOLTAN: 0 - VT_CI_BUILD: 0 + VT_CI_BUILD: 1 VT_DIAGNOSTICS: 0 VT_NO_COLOR: 1 VT_BUILD_SHARED_LIBS: 0 diff --git a/scripts/workflows-azure.ini b/scripts/workflows-azure.ini index 8fde9aca22..5543f6116c 100644 --- a/scripts/workflows-azure.ini +++ b/scripts/workflows-azure.ini @@ -54,7 +54,6 @@ vt_trace = 1 vt_pool = 0 vt_extended_tests = 0 vt_debug_verbose = 1 -vt_ci_build = 0 [PR-tests-intel-classic] test_configuration = "intel icpc, ubuntu, mpich" @@ -79,7 +78,6 @@ vt_trace = 1 vt_pool = 0 vt_tests_num_nodes = 4 vt_debug_verbose = 1 -vt_ci_build = 0 [PR-tests-nvcc-11-2-gcc-9] test_configuration = "nvidia cuda 11.2, gcc-9, ubuntu, mpich" @@ -145,7 +143,6 @@ distro = 22.04 output_name = ci/azure/azure-gcc-12-ubuntu-mpich.yml pr_pattern = "pr:\\n drafts: true\\n autoCancel: true\\n branches:\\n include:\\n - '*'\\n" vt_debug_verbose = 1 -vt_ci_build = 0 [PR-tests-clang-13-alpine] test_configuration = "clang-13, alpine, mpich" @@ -207,4 +204,3 @@ distro = 22.04 output_name = ci/azure/azure-clang-14-ubuntu-mpich.yml vt_trace = 1 vt_debug_verbose = 1 -vt_ci_build = 0