diff --git a/ci/azure/azure-clang-10-ubuntu-mpich.yml b/ci/azure/azure-clang-10-ubuntu-mpich.yml index 0f6b2cb65b..a27dfe336e 100644 --- a/ci/azure/azure-clang-10-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-10-ubuntu-mpich.yml @@ -57,7 +57,7 @@ variables: VT_DEBUG_VERBOSE: 0 VT_KOKKOS_ENABLED: 0 CMAKE_CXX_STANDARD: 17 - TEST_LB_SCHEMA: 0 + VT_CI_TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-clang-10-cache volume_name: ubuntu-cpp diff --git a/ci/azure/azure-clang-11-ubuntu-mpich.yml b/ci/azure/azure-clang-11-ubuntu-mpich.yml index 281a162626..472f2621a3 100644 --- a/ci/azure/azure-clang-11-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-11-ubuntu-mpich.yml @@ -57,7 +57,7 @@ variables: VT_DEBUG_VERBOSE: 0 VT_KOKKOS_ENABLED: 0 CMAKE_CXX_STANDARD: 17 - TEST_LB_SCHEMA: 0 + VT_CI_TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-clang-11-cache volume_name: ubuntu-cpp diff --git a/ci/azure/azure-clang-12-ubuntu-mpich.yml b/ci/azure/azure-clang-12-ubuntu-mpich.yml index 8139910e3e..ed04fe94e2 100644 --- a/ci/azure/azure-clang-12-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-12-ubuntu-mpich.yml @@ -57,7 +57,7 @@ variables: VT_DEBUG_VERBOSE: 0 VT_KOKKOS_ENABLED: 0 CMAKE_CXX_STANDARD: 17 - TEST_LB_SCHEMA: 0 + VT_CI_TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-clang-12-cache volume_name: ubuntu-cpp diff --git a/ci/azure/azure-clang-13-ubuntu-mpich.yml b/ci/azure/azure-clang-13-ubuntu-mpich.yml index 73619bf76c..0cf61444a7 100644 --- a/ci/azure/azure-clang-13-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-13-ubuntu-mpich.yml @@ -57,7 +57,7 @@ variables: VT_DEBUG_VERBOSE: 0 VT_KOKKOS_ENABLED: 0 CMAKE_CXX_STANDARD: 17 - TEST_LB_SCHEMA: 0 + VT_CI_TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-clang-13-cache volume_name: ubuntu-cpp diff --git a/ci/azure/azure-clang-14-ubuntu-mpich.yml b/ci/azure/azure-clang-14-ubuntu-mpich.yml index 84015c9de0..49241f8d2b 100644 --- a/ci/azure/azure-clang-14-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-14-ubuntu-mpich.yml @@ -57,7 +57,7 @@ variables: VT_DEBUG_VERBOSE: 1 VT_KOKKOS_ENABLED: 0 CMAKE_CXX_STANDARD: 17 - TEST_LB_SCHEMA: 0 + VT_CI_TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-clang-14-cache volume_name: ubuntu-cpp diff --git a/ci/azure/azure-clang-9-ubuntu-mpich.yml b/ci/azure/azure-clang-9-ubuntu-mpich.yml index f610c3880c..94558b9e23 100644 --- a/ci/azure/azure-clang-9-ubuntu-mpich.yml +++ b/ci/azure/azure-clang-9-ubuntu-mpich.yml @@ -57,7 +57,7 @@ variables: VT_DEBUG_VERBOSE: 0 VT_KOKKOS_ENABLED: 0 CMAKE_CXX_STANDARD: 17 - TEST_LB_SCHEMA: 0 + VT_CI_TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-clang-9-cache volume_name: ubuntu-cpp diff --git a/ci/azure/azure-clang-alpine-mpich.yml b/ci/azure/azure-clang-alpine-mpich.yml index 3c41ba56e2..b9ae33d1e3 100644 --- a/ci/azure/azure-clang-alpine-mpich.yml +++ b/ci/azure/azure-clang-alpine-mpich.yml @@ -57,7 +57,7 @@ variables: VT_DEBUG_VERBOSE: 0 VT_KOKKOS_ENABLED: 0 CMAKE_CXX_STANDARD: 17 - TEST_LB_SCHEMA: 0 + VT_CI_TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: alpine-clang-13-cache volume_name: alpine-cpp diff --git a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml index 62cea11228..7497831d01 100644 --- a/ci/azure/azure-gcc-10-ubuntu-openmpi.yml +++ b/ci/azure/azure-gcc-10-ubuntu-openmpi.yml @@ -57,7 +57,7 @@ variables: VT_DEBUG_VERBOSE: 0 VT_KOKKOS_ENABLED: 0 CMAKE_CXX_STANDARD: 17 - TEST_LB_SCHEMA: 0 + VT_CI_TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-gcc-10-cache volume_name: ubuntu-cpp diff --git a/ci/azure/azure-gcc-11-ubuntu-mpich.yml b/ci/azure/azure-gcc-11-ubuntu-mpich.yml index 7805b1f6c0..4c27fe6faa 100644 --- a/ci/azure/azure-gcc-11-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-11-ubuntu-mpich.yml @@ -57,7 +57,7 @@ variables: VT_DEBUG_VERBOSE: 0 VT_KOKKOS_ENABLED: 0 CMAKE_CXX_STANDARD: 17 - TEST_LB_SCHEMA: 0 + VT_CI_TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-gcc-11-cache volume_name: ubuntu-cpp diff --git a/ci/azure/azure-gcc-12-ubuntu-mpich.yml b/ci/azure/azure-gcc-12-ubuntu-mpich.yml index 35be998973..b8b73ec0dc 100644 --- a/ci/azure/azure-gcc-12-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-12-ubuntu-mpich.yml @@ -57,7 +57,7 @@ variables: VT_DEBUG_VERBOSE: 1 VT_KOKKOS_ENABLED: 1 CMAKE_CXX_STANDARD: 17 - TEST_LB_SCHEMA: 0 + VT_CI_TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-gcc-12-cache volume_name: ubuntu-cpp diff --git a/ci/azure/azure-gcc-8-ubuntu-mpich.yml b/ci/azure/azure-gcc-8-ubuntu-mpich.yml index b286ab0bc5..50c5b26ab4 100644 --- a/ci/azure/azure-gcc-8-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-8-ubuntu-mpich.yml @@ -57,7 +57,7 @@ variables: VT_DEBUG_VERBOSE: 0 VT_KOKKOS_ENABLED: 0 CMAKE_CXX_STANDARD: 17 - TEST_LB_SCHEMA: 0 + VT_CI_TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-gcc-8-cache volume_name: ubuntu-cpp diff --git a/ci/azure/azure-gcc-9-ubuntu-mpich.yml b/ci/azure/azure-gcc-9-ubuntu-mpich.yml index 358d8f9047..d9d4c84f7a 100644 --- a/ci/azure/azure-gcc-9-ubuntu-mpich.yml +++ b/ci/azure/azure-gcc-9-ubuntu-mpich.yml @@ -57,7 +57,7 @@ variables: VT_DEBUG_VERBOSE: 0 VT_KOKKOS_ENABLED: 0 CMAKE_CXX_STANDARD: 17 - TEST_LB_SCHEMA: 1 + VT_CI_TEST_LB_SCHEMA: 1 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-gcc-9-cache volume_name: ubuntu-cpp diff --git a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml index d60306c4ae..f2918c71b7 100644 --- a/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml @@ -57,7 +57,7 @@ variables: VT_DEBUG_VERBOSE: 0 VT_KOKKOS_ENABLED: 0 CMAKE_CXX_STANDARD: 17 - TEST_LB_SCHEMA: 0 + VT_CI_TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-intel-oneapi-icpc-cache volume_name: ubuntu-cpp diff --git a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml index ceac87ff31..108a2de15f 100644 --- a/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml +++ b/ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml @@ -57,7 +57,7 @@ variables: VT_DEBUG_VERBOSE: 1 VT_KOKKOS_ENABLED: 0 CMAKE_CXX_STANDARD: 17 - TEST_LB_SCHEMA: 0 + VT_CI_TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-intel-oneapi-icpx-cache volume_name: ubuntu-cpp diff --git a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml index e30c8760f1..9f6a642c61 100644 --- a/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml @@ -57,7 +57,7 @@ variables: VT_DEBUG_VERBOSE: 0 VT_KOKKOS_ENABLED: 0 CMAKE_CXX_STANDARD: 17 - TEST_LB_SCHEMA: 0 + VT_CI_TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-nvidia-11.2-cache volume_name: ubuntu-cpp diff --git a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml index 5a19ca429d..3ae10b3251 100644 --- a/ci/azure/azure-nvidia-12-ubuntu-mpich.yml +++ b/ci/azure/azure-nvidia-12-ubuntu-mpich.yml @@ -57,7 +57,7 @@ variables: VT_DEBUG_VERBOSE: 1 VT_KOKKOS_ENABLED: 0 CMAKE_CXX_STANDARD: 17 - TEST_LB_SCHEMA: 0 + VT_CI_TEST_LB_SCHEMA: 0 CACHE: "$(Agent.TempDirectory)/cache/" cache_name: ubuntu-nvidia-12-cache volume_name: ubuntu-cpp diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh index 669914e5b4..899cd80bec 100755 --- a/ci/build_cpp.sh +++ b/ci/build_cpp.sh @@ -147,11 +147,11 @@ 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_ci_generate_lb_files="${VT_CI_TEST_LB_SCHEMA:-0}" \ -Dvt_debug_verbose="${VT_DEBUG_VERBOSE:-0}" \ -Dvt_tests_num_nodes="${VT_TESTS_NUM_NODES:-}" \ -Dvt_external_fmt="${VT_EXTERNAL_FMT:-0}" \ -Dvt_no_color_enabled="${VT_NO_COLOR_ENABLED:-0}" \ - -Dvt_test_lb_schema="${TEST_LB_SCHEMA:-0}" \ -DCMAKE_CXX_STANDARD="${CMAKE_CXX_STANDARD:-17}" \ -DBUILD_SHARED_LIBS="${BUILD_SHARED_LIBS:-0}" \ "$VT" diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh index 461505b71c..9b32b48ff1 100755 --- a/ci/test_cpp.sh +++ b/ci/test_cpp.sh @@ -23,7 +23,7 @@ then popd fi -if test "${TEST_LB_SCHEMA:-0}" -eq 1 +if test "${VT_CI_TEST_LB_SCHEMA:-0}" -eq 1 then echo "Validating schema of json files..." "${VT}/scripts/check_lb_data_files.sh" "${VT_BUILD}" "${VT}" diff --git a/cmake/configure_options.cmake b/cmake/configure_options.cmake index 8927d0873b..031671c495 100644 --- a/cmake/configure_options.cmake +++ b/cmake/configure_options.cmake @@ -150,7 +150,7 @@ define_option(vt_werror_enabled "-Werror" "Build VT with -Werror enabled" OFF em define_option(vt_build_tests "tests" "Build VT tests" ON empty_feature) define_option(vt_build_tools "tools" "Build VT tools" ON empty_feature) define_option(vt_build_examples "examples" "Build VT examples" ON empty_feature) -define_option(vt_test_lb_schema "lb schema tests" "Enable testing of LBDatafile schema" OFF empty_feature) +define_option(vt_ci_generate_lb_files "generate lb files" "Enable generation of LBDatafiles when runnning examples" OFF empty_feature) option(vt_external_fmt "Build VT with external fmt" OFF) if(${vt_external_fmt}) diff --git a/cmake/test_vt.cmake b/cmake/test_vt.cmake index 3f28f82307..37a9100a4d 100644 --- a/cmake/test_vt.cmake +++ b/cmake/test_vt.cmake @@ -118,7 +118,7 @@ macro(add_test_for_example_vt test_target test_exec test_list) endif() # Append parameters required for the examples to output LBDatafiles. - if (vt_test_lb_schema) + if (vt_ci_generate_lb_files) list(APPEND EXEC_ARGS "--vt_lb_interval=1" "--vt_lb_data" diff --git a/docker-compose.yml b/docker-compose.yml index 77fee64a9f..d81e1ac6f0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -115,7 +115,7 @@ x-vtopts: &vtopts BUILD_SHARED_LIBS: ${VT_BUILD_SHARED_LIBS:-0} VT_INCLUSION_TYPE: ${VT_INCLUSION:-TPL} CODECOV_TOKEN: ${CODECOV_TOKEN:-} - TEST_LB_SCHEMA: ${TEST_LB_SCHEMA:-0} + VT_CI_TEST_LB_SCHEMA: ${VT_CI_TEST_LB_SCHEMA:-0} CMAKE_CXX_STANDARD: ${CMAKE_CXX_STANDARD:-17} services: diff --git a/scripts/workflow-azure-template.yml b/scripts/workflow-azure-template.yml index 6cd0c9f447..c4da44fe9f 100644 --- a/scripts/workflow-azure-template.yml +++ b/scripts/workflow-azure-template.yml @@ -45,7 +45,7 @@ variables: VT_DEBUG_VERBOSE: [% vt_debug_verbose %] VT_KOKKOS_ENABLED: [% vt_kokkos_enabled %] CMAKE_CXX_STANDARD: [% cmake_cxx_standard %] - TEST_LB_SCHEMA: [% test_lb_schema %] + VT_CI_TEST_LB_SCHEMA: [% vt_ci_test_lb_schema %] CACHE: "$(Agent.TempDirectory)/cache/" cache_name: [% cache_name %] volume_name: [% volume_name %] diff --git a/scripts/workflows-azure.ini b/scripts/workflows-azure.ini index e7ba1a75fb..a8da0b759d 100644 --- a/scripts/workflows-azure.ini +++ b/scripts/workflows-azure.ini @@ -18,7 +18,7 @@ vt_zoltan = 0 vt_ci_build = 1 vt_tests_num_nodes = 2 vt_external_fmt = 0 -test_lb_schema = 0 +vt_ci_test_lb_schema = 0 ulimit_core = 0 vt_code_coverage = 0 build_type = release @@ -114,7 +114,7 @@ test_configuration = "gcc-9, ubuntu, mpich, zoltan, json schema test" compiler_type = gnu compiler = gcc-9 output_name = ci/azure/azure-gcc-9-ubuntu-mpich.yml -test_lb_schema = 1 +vt_ci_test_lb_schema = 1 vt_zoltan = 1 [PR-tests-gcc-10]