Skip to content

Commit 3b84d2e

Browse files
JacobDomagalaJacobDomagala
committed
#2214: Change uppercase vt related CMake variables to lowercase
1 parent ecfea5f commit 3b84d2e

28 files changed

+42
-42
lines changed

‎CMakeLists.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ endif()
7979
#
8080
# Test prep - ensures examples can be registered as tests.
8181
#
82-
if (VT_BUILD_TESTS
82+
if (vt_build_tests
8383
AND "${CMAKE_PROJECT_NAME}" STREQUAL "${PROJECT_NAME}")
8484
# CTest implies enable_testing() and defines the BUILD_TESTING option.
8585
# The default of BUILD_TESTING is ON.
@@ -107,7 +107,7 @@ endif()
107107
#
108108
# Examples
109109
#
110-
if (VT_BUILD_EXAMPLES)
110+
if (vt_build_examples)
111111
message(
112112
STATUS
113113
"VT: building examples"
@@ -117,7 +117,7 @@ if (VT_BUILD_EXAMPLES)
117117
add_subdirectory(examples)
118118
else()
119119
message(
120-
STATUS "VT: NOT building examples because VT_BUILD_EXAMPLES is not set.\
120+
STATUS "VT: NOT building examples because vt_build_examples is not set.\
121121
Examples that are not built are NOT TESTED."
122122
)
123123
endif()
@@ -127,7 +127,7 @@ endif()
127127
#
128128

129129
if (BUILD_TESTING
130-
AND VT_BUILD_TESTS
130+
AND vt_build_tests
131131
AND CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
132132
message(
133133
STATUS
@@ -140,7 +140,7 @@ if (BUILD_TESTING
140140
else()
141141
message(
142142
STATUS
143-
"VT: NOT building tests because VT_BUILD_TESTS or BUILD_TESTING are not set"
143+
"VT: NOT building tests because vt_build_tests or BUILD_TESTING are not set"
144144
)
145145
endif()
146146

‎ci/azure/azure-clang-10-ubuntu-mpich.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ variables:
3131
HOST_COMPILER: clang-10
3232
BUILD_TYPE: release
3333
ULIMIT_CORE: 0
34-
CODE_COVERAGE: 0
34+
VT_CODE_COVERAGE: 0
3535
VT_LB: 1
3636
VT_TRACE: 0
3737
VT_TRACE_RT: 0

‎ci/azure/azure-clang-11-ubuntu-mpich.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ variables:
3131
HOST_COMPILER: clang-11
3232
BUILD_TYPE: release
3333
ULIMIT_CORE: 0
34-
CODE_COVERAGE: 0
34+
VT_CODE_COVERAGE: 0
3535
VT_LB: 1
3636
VT_TRACE: 0
3737
VT_TRACE_RT: 0

‎ci/azure/azure-clang-12-ubuntu-mpich.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ variables:
3131
HOST_COMPILER: clang-12
3232
BUILD_TYPE: release
3333
ULIMIT_CORE: 0
34-
CODE_COVERAGE: 0
34+
VT_CODE_COVERAGE: 0
3535
VT_LB: 1
3636
VT_TRACE: 0
3737
VT_TRACE_RT: 0

‎ci/azure/azure-clang-13-ubuntu-mpich.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ variables:
3131
HOST_COMPILER: clang-13
3232
BUILD_TYPE: release
3333
ULIMIT_CORE: 0
34-
CODE_COVERAGE: 0
34+
VT_CODE_COVERAGE: 0
3535
VT_LB: 1
3636
VT_TRACE: 0
3737
VT_TRACE_RT: 0

‎ci/azure/azure-clang-14-ubuntu-mpich.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ variables:
3131
HOST_COMPILER: clang-14
3232
BUILD_TYPE: release
3333
ULIMIT_CORE: 0
34-
CODE_COVERAGE: 0
34+
VT_CODE_COVERAGE: 0
3535
VT_LB: 1
3636
VT_TRACE: 1
3737
VT_TRACE_RT: 0

‎ci/azure/azure-clang-9-ubuntu-mpich.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ variables:
3131
HOST_COMPILER: clang-9
3232
BUILD_TYPE: release
3333
ULIMIT_CORE: 0
34-
CODE_COVERAGE: 0
34+
VT_CODE_COVERAGE: 0
3535
VT_LB: 1
3636
VT_TRACE: 0
3737
VT_TRACE_RT: 0

‎ci/azure/azure-clang-alpine-mpich.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ variables:
3131
HOST_COMPILER: clang-13
3232
BUILD_TYPE: release
3333
ULIMIT_CORE: 0
34-
CODE_COVERAGE: 0
34+
VT_CODE_COVERAGE: 0
3535
VT_LB: 1
3636
VT_TRACE: 0
3737
VT_TRACE_RT: 0

‎ci/azure/azure-gcc-10-ubuntu-openmpi-spack.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ variables:
2222
HOST_COMPILER: gcc-10
2323
BUILD_TYPE: release
2424
ULIMIT_CORE: 0
25-
CODE_COVERAGE: 0
25+
VT_CODE_COVERAGE: 0
2626
VT_LB: 0
2727
VT_TRACE: 0
2828
VT_TRACE_RT: 0

‎ci/azure/azure-gcc-10-ubuntu-openmpi.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ variables:
3131
HOST_COMPILER: gcc-10
3232
BUILD_TYPE: release
3333
ULIMIT_CORE: 0
34-
CODE_COVERAGE: 0
34+
VT_CODE_COVERAGE: 0
3535
VT_LB: 0
3636
VT_TRACE: 0
3737
VT_TRACE_RT: 0

‎ci/azure/azure-gcc-11-ubuntu-mpich.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ variables:
3131
HOST_COMPILER: gcc-11
3232
BUILD_TYPE: release
3333
ULIMIT_CORE: 0
34-
CODE_COVERAGE: 1
34+
VT_CODE_COVERAGE: 1
3535
VT_LB: 1
3636
VT_TRACE: 1
3737
VT_TRACE_RT: 1

‎ci/azure/azure-gcc-12-ubuntu-mpich.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ variables:
3131
HOST_COMPILER: gcc-12
3232
BUILD_TYPE: release
3333
ULIMIT_CORE: 0
34-
CODE_COVERAGE: 0
34+
VT_CODE_COVERAGE: 0
3535
VT_LB: 1
3636
VT_TRACE: 0
3737
VT_TRACE_RT: 0

‎ci/azure/azure-gcc-8-ubuntu-mpich.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ variables:
3131
HOST_COMPILER: gcc-8
3232
BUILD_TYPE: release
3333
ULIMIT_CORE: 0
34-
CODE_COVERAGE: 0
34+
VT_CODE_COVERAGE: 0
3535
VT_LB: 1
3636
VT_TRACE: 1
3737
VT_TRACE_RT: 0

‎ci/azure/azure-gcc-9-ubuntu-mpich.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ variables:
3131
HOST_COMPILER: gcc-9
3232
BUILD_TYPE: release
3333
ULIMIT_CORE: 0
34-
CODE_COVERAGE: 0
34+
VT_CODE_COVERAGE: 0
3535
VT_LB: 1
3636
VT_TRACE: 0
3737
VT_TRACE_RT: 0

‎ci/azure/azure-intel-oneapi-icpc-ubuntu-mpich.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ variables:
3131
HOST_COMPILER: icpc
3232
BUILD_TYPE: release
3333
ULIMIT_CORE: 0
34-
CODE_COVERAGE: 0
34+
VT_CODE_COVERAGE: 0
3535
VT_LB: 1
3636
VT_TRACE: 0
3737
VT_TRACE_RT: 0

‎ci/azure/azure-intel-oneapi-icpx-ubuntu-mpich.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ variables:
3131
HOST_COMPILER: icpx
3232
BUILD_TYPE: release
3333
ULIMIT_CORE: 0
34-
CODE_COVERAGE: 0
34+
VT_CODE_COVERAGE: 0
3535
VT_LB: 1
3636
VT_TRACE: 1
3737
VT_TRACE_RT: 0

‎ci/azure/azure-nvidia-11-2-ubuntu-mpich.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ variables:
3131
HOST_COMPILER: gcc-9
3232
BUILD_TYPE: release
3333
ULIMIT_CORE: 0
34-
CODE_COVERAGE: 0
34+
VT_CODE_COVERAGE: 0
3535
VT_LB: 1
3636
VT_TRACE: 1
3737
VT_TRACE_RT: 0

‎ci/azure/azure-nvidia-12-ubuntu-mpich.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ variables:
3131
HOST_COMPILER: gcc-9
3232
BUILD_TYPE: release
3333
ULIMIT_CORE: 0
34-
CODE_COVERAGE: 0
34+
VT_CODE_COVERAGE: 0
3535
VT_LB: 1
3636
VT_TRACE: 1
3737
VT_TRACE_RT: 0

‎ci/build_cpp.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ cmake -G "${CMAKE_GENERATOR:-Ninja}" \
109109
-Dvt_fcontext_enabled="${VT_FCONTEXT_ENABLED:-0}" \
110110
-Dvt_fcontext_build_tests_examples="${VT_FCONTEXT_BUILD_TESTS_EXAMPLES:-0}" \
111111
-Dvt_rdma_tests_enabled="${VT_RDMA_TESTS_ENABLED:-1}" \
112-
-DCODE_COVERAGE="${CODE_COVERAGE:-0}" \
112+
-Dvt_code_coverage="${VT_CODE_COVERAGE:-0}" \
113113
-DMI_INTERPOSE:BOOL=ON \
114114
-DMI_OVERRIDE:BOOL=ON \
115115
-Dvt_mpi_guards="${VT_MPI_GUARD_ENABLED:-0}" \

‎ci/build_vt_sample.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ then
4848
-Dkokkos_DISABLE:BOOL=1 \
4949
-Dkokkos_kernels_DISABLE:BOOL=1 \
5050
-Dvt_trace_only="1" \
51-
-DVT_BUILD_EXAMPLES="0" \
52-
-DVT_BUILD_TESTS="0" \
51+
-Dvt_build_examples="0" \
52+
-Dvt_build_tests="0" \
5353
-DCMAKE_CXX_STANDARD="${CMAKE_CXX_STANDARD:-17}" \
5454
-DCMAKE_EXPORT_COMPILE_COMMANDS=1 \
5555
-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Release}" \

‎ci/ctest_job_script.cmake

+3-3
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ endif()
8383
if ( NOT DEFINED ENV{VT_RDMA_TESTS_ENABLED} )
8484
set(ENV{VT_RDMA_TESTS_ENABLED} "1")
8585
endif()
86-
if ( NOT DEFINED ENV{CODE_COVERAGE} )
87-
set(ENV{CODE_COVERAGE} "0")
86+
if ( NOT DEFINED ENV{VT_CODE_COVERAGE} )
87+
set(ENV{VT_CODE_COVERAGE} "0")
8888
endif()
8989
if ( NOT DEFINED ENV{VT_MPI_GUARD_ENABLED} )
9090
set(ENV{VT_MPI_GUARD_ENABLED} "0")
@@ -137,7 +137,7 @@ set(configureOpts
137137
"-Dvt_fcontext_enabled=$ENV{VT_FCONTEXT_ENABLED}"
138138
"-Dvt_fcontext_build_tests_examples=$ENV{VT_FCONTEXT_BUILD_TESTS_EXAMPLES}"
139139
"-Dvt_rdma_tests_enabled=$ENV{VT_RDMA_TESTS_ENABLED}"
140-
"-DCODE_COVERAGE=$ENV{CODE_COVERAGE}"
140+
"-Dvt_code_coverage=$ENV{VT_CODE_COVERAGE}"
141141
"-DMI_INTERPOSE:BOOL=ON"
142142
"-DMI_OVERRIDE:BOOL=ON"
143143
"-Dvt_mpi_guards=$ENV{VT_MPI_GUARD_ENABLED}"

‎ci/test_cpp.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pushd "$VT_BUILD"
1212
# Don't run performance tests here (use label 'unit_test' or 'example')
1313
ctest --output-on-failure -L 'unit_test|example' | tee cmake-output.log
1414

15-
if test "${CODE_COVERAGE:-0}" -eq 1
15+
if test "${VT_CODE_COVERAGE:-0}" -eq 1
1616
then
1717
export CODECOV_TOKEN="$CODECOV_TOKEN"
1818
lcov --capture --directory . --output-file coverage.info

‎cmake/configure_options.cmake

+3-3
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ define_option(vt_no_color_enabled "--vt_no_color set to true by default"
135135
"Build VT with option --vt_no_color set to true by default" OFF empty_feature
136136
)
137137

138-
define_option(CODE_COVERAGE "code coverage" "Enable coverage reporting" OFF empty_feature)
138+
define_option(vt_code_coverage "code coverage" "Enable coverage reporting" OFF empty_feature)
139139
define_option(vt_gold_linker_enabled "`gold' linker" "Build VT using the `gold' linker" ON empty_feature)
140140
define_option(vt_unity_build_enabled "unity build" "Build VT with Unity/Jumbo mode enabled" OFF empty_feature)
141141
define_option(vt_mimalloc_enabled "mimalloc" "Build VT with mimalloc" OFF empty_feature)
@@ -147,9 +147,9 @@ define_option(vt_ubsan_enabled "undefined behavior sanitizer" "Build VT with und
147147
OFF empty_feature
148148
)
149149
define_option(vt_werror_enabled "-Werror" "Build VT with -Werror enabled" OFF empty_feature)
150-
define_option(VT_BUILD_TESTS "tests" "Build VT tests" ON empty_feature)
150+
define_option(vt_build_tests "tests" "Build VT tests" ON empty_feature)
151151
define_option(vt_build_tools "tools" "Build VT tools" ON empty_feature)
152-
define_option(VT_BUILD_EXAMPLES "examples" "Build VT examples" ON empty_feature)
152+
define_option(VT_build_examples "examples" "Build VT examples" ON empty_feature)
153153

154154
list(POP_BACK CMAKE_MESSAGE_INDENT)
155155

‎docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
# VT_DIAGNOSTICS=1 # Build with diagnostics enabled
3636
# VT_DIAGNOSTICS_RUNTIME=0 # Enable diagnostics collection at runtime by default
3737
# BUILD_TYPE=release # CMake build type
38-
# CODE_COVERAGE=0 # Enable generation of code coverage reports
38+
# VT_CODE_COVERAGE=0 # Enable generation of code coverage reports
3939
# VT_DEBUG_VERBOSE # Enable verbose debug prints at compile-time
4040
# VT_NO_COLOR_ENABLED=0 # Set --vt_no_color flag to true by default
4141
# VT_BUILD_SHARED_LIBS=0 # Build VT as shared library
@@ -153,7 +153,7 @@ x-vtopts: &vtopts
153153
CMAKE_BUILD_TYPE: ${BUILD_TYPE:-release}
154154
VT_MPI_GUARD_ENABLED: ${VT_MPI_GUARD:-1}
155155
VT_EXTENDED_TESTS_ENABLED: ${VT_EXTENDED_TESTS:-1}
156-
CODE_COVERAGE: ${CODE_COVERAGE:-0}
156+
VT_CODE_COVERAGE: ${VT_CODE_COVERAGE:-0}
157157
https_proxy: ${PROXY-}
158158
http_proxy: ${PROXY-}
159159
LSAN_OPTIONS: ${LSAN_OPTIONS-}

‎docs/md/building.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ build configuration:
5757
| `vt_unity_build_enabled` | 0 | Build with Unity/Jumbo mode enabled (requires CMake >= 3.16) |
5858
| `vt_fcontext_enabled` | 0 | Force use of fcontext for threading |
5959
| `vt_tests_num_nodes` | - | Maximum number of nodes used for tests. If empty, then the default value detected by CMake is used |
60-
| `CODE_COVERAGE` | 0 | Enable code coverage for VT examples/tests |
61-
| `VT_BUILD_TESTS` | 1 | Build all VT tests |
62-
| `VT_BUILD_EXAMPLES` | 1 | Build all VT examples |
60+
| `vt_code_coverage` | 0 | Enable code coverage for VT examples/tests |
61+
| `vt_build_tests` | 1 | Build all VT tests |
62+
| `VT_build_examples` | 1 | Build all VT examples |
6363
| `vt_debug_verbose` | 1 (not Release) | Enable VT verbose debug prints at compile-time |
6464
| `vt_no_color_enabled` | 0 | Set `--vt_no_color` flag to true by default |
6565
| `BUILD_SHARED_LIBS` | 0 | Build VT as shared library |
@@ -163,7 +163,7 @@ which `docker-compose` will read.
163163
# VT_DIAGNOSTICS=1 # Build with diagnostics enabled
164164
# VT_DIAGNOSTICS_RUNTIME=0 # Enable diagnostics at runtime by default
165165
# BUILD_TYPE=release # CMake build type
166-
# CODE_COVERAGE=0 # Enable generation of code coverage reports
166+
# VT_CODE_COVERAGE=0 # Enable generation of code coverage reports
167167
# VT_DEBUG_VERBOSE # Enable verbose debug prints at compile-time
168168
# VT_NO_COLOR_ENABLED=0 # Set --vt_no_color flag to true by default
169169
# VT_BUILD_SHARED_LIBS=0 # Build VT as shared library

‎scripts/workflow-azure-template.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ variables:
1919
HOST_COMPILER: [% IF host_compiler %][% host_compiler %][% ELSE %][% compiler %][% END %]
2020
BUILD_TYPE: [% build_type %]
2121
ULIMIT_CORE: [% ulimit_core %]
22-
CODE_COVERAGE: [% code_coverage %]
22+
VT_CODE_COVERAGE: [% vt_code_coverage %]
2323
VT_LB: [% vt_lb %]
2424
VT_TRACE: [% vt_trace %]
2525
VT_TRACE_RT: [% vt_trace_rt %]

‎scripts/workflows-azure.ini

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ vt_ci_build = 1
1919
vt_tests_num_nodes = 2
2020
test_lb_schema = 0
2121
ulimit_core = 0
22-
code_coverage = 0
22+
vt_code_coverage = 0
2323
build_type = release
2424
repo = lifflander1/vt
2525
arch = amd64
@@ -127,7 +127,7 @@ distro = 22.04
127127
vt_trace = 1
128128
vt_trace_rt = 1
129129
vt_unity_build = 0
130-
code_coverage = 1
130+
vt_code_coverage = 1
131131
docker_target = "[% linux %]-cpp-clean-noinstall"
132132
output_name = ci/azure/azure-gcc-11-ubuntu-mpich.yml
133133

‎src/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ target_include_directories(
259259
$<INSTALL_INTERFACE:${VT_EXTERNAL_DESTINATION}>
260260
)
261261

262-
if(CODE_COVERAGE AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
262+
if(VT_CODE_COVERAGE AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
263263
message(STATUS "VT: enabling code coverage generation")
264264
# Add required flags (GCC & LLVM/Clang)
265265
target_compile_options(${VIRTUAL_TRANSPORT_LIBRARY} PUBLIC

0 commit comments

Comments
 (0)