Skip to content

Commit 8fe8d3a

Browse files
committed
#2037: Remove openmp
1 parent a697f1d commit 8fe8d3a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+24
-594
lines changed

.github/workflows/macosx-clang-mpich.yml

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ jobs:
2626
CMAKE_BUILD_TYPE: release
2727
VT_LB_ENABLED: 1
2828
VT_TRACE_ENABLED: 1
29-
VT_USE_OPENMP: 0
3029
VT_WERROR: 1
3130
CMAKE_CXX_STANDARD: 17
3231
CMAKE_GENERATOR: "Unix Makefiles"

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

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ variables:
4646
VT_UNITY_BUILD: 1
4747
VT_PRODUCTION_BUILD: 0
4848
VT_FCONTEXT: 0
49-
VT_USE_OPENMP: 0
5049
VT_ZOLTAN: 0
5150
VT_CI_BUILD: 1
5251
VT_DIAGNOSTICS: 1

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

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ variables:
4646
VT_UNITY_BUILD: 1
4747
VT_PRODUCTION_BUILD: 0
4848
VT_FCONTEXT: 1
49-
VT_USE_OPENMP: 0
5049
VT_ZOLTAN: 0
5150
VT_CI_BUILD: 1
5251
VT_DIAGNOSTICS: 1

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

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ variables:
4646
VT_UNITY_BUILD: 1
4747
VT_PRODUCTION_BUILD: 0
4848
VT_FCONTEXT: 0
49-
VT_USE_OPENMP: 0
5049
VT_ZOLTAN: 0
5150
VT_CI_BUILD: 1
5251
VT_DIAGNOSTICS: 1

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

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ variables:
4646
VT_UNITY_BUILD: 1
4747
VT_PRODUCTION_BUILD: 0
4848
VT_FCONTEXT: 0
49-
VT_USE_OPENMP: 0
5049
VT_ZOLTAN: 0
5150
VT_CI_BUILD: 1
5251
VT_DIAGNOSTICS: 1

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

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ variables:
4646
VT_UNITY_BUILD: 1
4747
VT_PRODUCTION_BUILD: 0
4848
VT_FCONTEXT: 0
49-
VT_USE_OPENMP: 0
5049
VT_ZOLTAN: 0
5150
VT_CI_BUILD: 1
5251
VT_DIAGNOSTICS: 1

ci/azure/azure-clang-5.0-ubuntu-mpich.yml

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ variables:
4646
VT_UNITY_BUILD: 1
4747
VT_PRODUCTION_BUILD: 0
4848
VT_FCONTEXT: 0
49-
VT_USE_OPENMP: 1
5049
VT_ZOLTAN: 0
5150
VT_CI_BUILD: 1
5251
VT_DIAGNOSTICS: 1

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

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ variables:
4646
VT_UNITY_BUILD: 1
4747
VT_PRODUCTION_BUILD: 0
4848
VT_FCONTEXT: 0
49-
VT_USE_OPENMP: 0
5049
VT_ZOLTAN: 0
5150
VT_CI_BUILD: 1
5251
VT_DIAGNOSTICS: 1

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

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ variables:
4646
VT_UNITY_BUILD: 1
4747
VT_PRODUCTION_BUILD: 1
4848
VT_FCONTEXT: 0
49-
VT_USE_OPENMP: 0
5049
VT_ZOLTAN: 0
5150
VT_CI_BUILD: 1
5251
VT_DIAGNOSTICS: 1

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

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ variables:
3434
VT_EXTENDED_TESTS: 0
3535
VT_UNITY_BUILD: 1
3636
VT_FCONTEXT: 0
37-
VT_USE_OPENMP: 0
3837
VT_ZOLTAN: 0
3938
VT_CI_BUILD: 1
4039
VT_DIAGNOSTICS: 1

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

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ variables:
4646
VT_UNITY_BUILD: 1
4747
VT_PRODUCTION_BUILD: 0
4848
VT_FCONTEXT: 0
49-
VT_USE_OPENMP: 0
5049
VT_ZOLTAN: 0
5150
VT_CI_BUILD: 1
5251
VT_DIAGNOSTICS: 1

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

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ variables:
4646
VT_UNITY_BUILD: 1
4747
VT_PRODUCTION_BUILD: 0
4848
VT_FCONTEXT: 0
49-
VT_USE_OPENMP: 0
5049
VT_ZOLTAN: 0
5150
VT_CI_BUILD: 1
5251
VT_DIAGNOSTICS: 1

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

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ variables:
4646
VT_UNITY_BUILD: 1
4747
VT_PRODUCTION_BUILD: 0
4848
VT_FCONTEXT: 0
49-
VT_USE_OPENMP: 0
5049
VT_ZOLTAN: 0
5150
VT_CI_BUILD: 1
5251
VT_DIAGNOSTICS: 1

ci/azure/azure-gcc-7-ubuntu-mpich.yml

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ variables:
4646
VT_UNITY_BUILD: 1
4747
VT_PRODUCTION_BUILD: 0
4848
VT_FCONTEXT: 0
49-
VT_USE_OPENMP: 0
5049
VT_ZOLTAN: 0
5150
VT_CI_BUILD: 1
5251
VT_DIAGNOSTICS: 1

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

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ variables:
4646
VT_UNITY_BUILD: 1
4747
VT_PRODUCTION_BUILD: 0
4848
VT_FCONTEXT: 0
49-
VT_USE_OPENMP: 0
5049
VT_ZOLTAN: 0
5150
VT_CI_BUILD: 1
5251
VT_DIAGNOSTICS: 1

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

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ variables:
4646
VT_UNITY_BUILD: 1
4747
VT_PRODUCTION_BUILD: 0
4848
VT_FCONTEXT: 0
49-
VT_USE_OPENMP: 0
5049
VT_ZOLTAN: 1
5150
VT_CI_BUILD: 1
5251
VT_DIAGNOSTICS: 1

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

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ variables:
4646
VT_UNITY_BUILD: 1
4747
VT_PRODUCTION_BUILD: 0
4848
VT_FCONTEXT: 0
49-
VT_USE_OPENMP: 0
5049
VT_ZOLTAN: 0
5150
VT_CI_BUILD: 1
5251
VT_DIAGNOSTICS: 1

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

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ variables:
4646
VT_UNITY_BUILD: 1
4747
VT_PRODUCTION_BUILD: 0
4848
VT_FCONTEXT: 0
49-
VT_USE_OPENMP: 0
5049
VT_ZOLTAN: 0
5150
VT_CI_BUILD: 1
5251
VT_DIAGNOSTICS: 1

ci/azure/azure-nvidia-10-ubuntu-mpich.yml

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ variables:
4646
VT_UNITY_BUILD: 1
4747
VT_PRODUCTION_BUILD: 1
4848
VT_FCONTEXT: 0
49-
VT_USE_OPENMP: 0
5049
VT_ZOLTAN: 0
5150
VT_CI_BUILD: 1
5251
VT_DIAGNOSTICS: 0

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

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ variables:
4646
VT_UNITY_BUILD: 1
4747
VT_PRODUCTION_BUILD: 0
4848
VT_FCONTEXT: 0
49-
VT_USE_OPENMP: 0
5049
VT_ZOLTAN: 0
5150
VT_CI_BUILD: 1
5251
VT_DIAGNOSTICS: 0

ci/build_cpp.sh

-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ cmake -G "${CMAKE_GENERATOR:-Ninja}" \
133133
-Dvt_fcontext_enabled="${VT_FCONTEXT_ENABLED:-0}" \
134134
-Dvt_fcontext_build_tests_examples="${VT_FCONTEXT_BUILD_TESTS_EXAMPLES:-0}" \
135135
-Dvt_rdma_tests_enabled="${VT_RDMA_TESTS_ENABLED:-1}" \
136-
-DUSE_OPENMP="${VT_USE_OPENMP:-0}" \
137136
-DCODE_COVERAGE="${CODE_COVERAGE:-0}" \
138137
-DMI_INTERPOSE:BOOL=ON \
139138
-DMI_OVERRIDE:BOOL=ON \

ci/ctest_job_script.cmake

-4
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,6 @@ 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{VT_USE_OPENMP} )
87-
set(ENV{VT_USE_OPENMP} "0")
88-
endif()
8986
if ( NOT DEFINED ENV{VT_USE_STD_THREAD} )
9087
set(ENV{VT_USE_STD_THREAD} "0")
9188
endif()
@@ -143,7 +140,6 @@ set(configureOpts
143140
"-Dvt_fcontext_enabled=$ENV{VT_FCONTEXT_ENABLED}"
144141
"-Dvt_fcontext_build_tests_examples=$ENV{VT_FCONTEXT_BUILD_TESTS_EXAMPLES}"
145142
"-Dvt_rdma_tests_enabled=$ENV{VT_RDMA_TESTS_ENABLED}"
146-
"-DUSE_OPENMP=$ENV{VT_USE_OPENMP}"
147143
"-DUSE_STD_THREAD=$ENV{VT_USE_STD_THREAD}"
148144
"-DCODE_COVERAGE=$ENV{CODE_COVERAGE}"
149145
"-DMI_INTERPOSE:BOOL=ON"

ci/docker/alpine-cpp.dockerfile

-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ ARG VT_WERROR_ENABLED
6464
ARG VT_POOL_ENABLED
6565
ARG VT_PRODUCTION_BUILD_ENABLED
6666
ARG VT_FCONTEXT_ENABLED
67-
ARG VT_USE_OPENMP
6867
ARG CMAKE_BUILD_TYPE
6968
ARG VT_NO_COLOR_ENABLED
7069
ARG BUILD_SHARED_LIBS
@@ -81,7 +80,6 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
8180
VT_POOL_ENABLED=${VT_POOL_ENABLED} \
8281
VT_PRODUCTION_BUILD_ENABLED=${VT_PRODUCTION_BUILD_ENABLED} \
8382
VT_FCONTEXT_ENABLED=${VT_FCONTEXT_ENABLED} \
84-
VT_USE_OPENMP=${VT_USE_OPENMP} \
8583
VT_NO_COLOR_ENABLED=${VT_NO_COLOR_ENABLED} \
8684
CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} \
8785
BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} \

ci/docker/develop.dockerfile

-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ ARG VT_ZOLTAN_ENABLED
4444
ARG CMAKE_BUILD_TYPE
4545
ARG VT_EXTENDED_TESTS_ENABLED
4646
ARG VT_FCONTEXT_ENABLED
47-
ARG VT_USE_OPENMP
4847
ARG VT_NO_COLOR_ENABLED
4948
ARG BUILD_SHARED_LIBS
5049
ARG CMAKE_CXX_STANDARD
@@ -63,7 +62,6 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
6362
VT_EXTENDED_TESTS_ENABLED=${VT_EXTENDED_TESTS_ENABLED} \
6463
VT_UNITY_BUILD_ENABLED=${VT_UNITY_BUILD_ENABLED} \
6564
VT_FCONTEXT_ENABLED=${VT_FCONTEXT_ENABLED} \
66-
VT_USE_OPENMP=${VT_USE_OPENMP} \
6765
VT_DIAGNOSTICS_ENABLED=${VT_DIAGNOSTICS_ENABLED} \
6866
VT_DIAGNOSTICS_RUNTIME_ENABLED=${VT_DIAGNOSTICS_RUNTIME_ENABLED} \
6967
VT_NO_COLOR_ENABLED=${VT_NO_COLOR_ENABLED} \

ci/docker/ubuntu-18.04-gnu-docs.dockerfile

-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ ARG VT_PRODUCTION_BUILD_ENABLED
6060
ARG CMAKE_BUILD_TYPE
6161
ARG VT_EXTENDED_TESTS_ENABLED
6262
ARG VT_FCONTEXT_ENABLED
63-
ARG VT_USE_OPENMP
6463
ARG VT_NO_COLOR_ENABLED
6564
ARG BUILD_SHARED_LIBS
6665
ARG CMAKE_CXX_STANDARD
@@ -78,7 +77,6 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
7877
VT_MPI_GUARD_ENABLED=${VT_MPI_GUARD_ENABLED} \
7978
VT_EXTENDED_TESTS_ENABLED=${VT_EXTENDED_TESTS_ENABLED} \
8079
VT_FCONTEXT_ENABLED=${VT_FCONTEXT_ENABLED} \
81-
VT_USE_OPENMP=${VT_USE_OPENMP} \
8280
VT_DIAGNOSTICS_ENABLED=${VT_DIAGNOSTICS_ENABLED} \
8381
VT_DIAGNOSTICS_RUNTIME_ENABLED=${VT_DIAGNOSTICS_RUNTIME_ENABLED} \
8482
VT_NO_COLOR_ENABLED=${VT_NO_COLOR_ENABLED} \

ci/docker/ubuntu-20.04-gnu-openmpi-cpp.dockerfile

-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ ARG VT_POOL_ENABLED
8989
ARG VT_PRODUCTION_BUILD_ENABLED
9090
ARG VT_ZOLTAN_ENABLED
9191
ARG VT_FCONTEXT_ENABLED
92-
ARG VT_USE_OPENMP
9392
ARG CMAKE_BUILD_TYPE
9493
ARG VT_EXTENDED_TESTS_ENABLED
9594
ARG VT_NO_COLOR_ENABLED
@@ -111,7 +110,6 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
111110
VT_UNITY_BUILD_ENABLED=${VT_UNITY_BUILD_ENABLED} \
112111
VT_PRODUCTION_BUILD_ENABLED=${VT_PRODUCTION_BUILD_ENABLED} \
113112
VT_FCONTEXT_ENABLED=${VT_FCONTEXT_ENABLED} \
114-
VT_USE_OPENMP=${VT_USE_OPENMP} \
115113
VT_DIAGNOSTICS_ENABLED=${VT_DIAGNOSTICS_ENABLED} \
116114
VT_DIAGNOSTICS_RUNTIME_ENABLED=${VT_DIAGNOSTICS_RUNTIME_ENABLED} \
117115
VT_NO_COLOR_ENABLED=${VT_NO_COLOR_ENABLED} \

ci/docker/ubuntu-clang-cpp.dockerfile

-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ ARG VT_PRODUCTION_BUILD_ENABLED
7777
ARG VT_TRACE_ENABLED
7878
ARG VT_TRACE_RUNTIME_ENABLED
7979
ARG VT_UBSAN_ENABLED
80-
ARG VT_USE_OPENMP
8180
ARG VT_WERROR_ENABLED
8281
ARG CMAKE_CXX_STANDARD
8382

@@ -99,7 +98,6 @@ ENV BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} \
9998
VT_TRACE_RUNTIME_ENABLED=${VT_TRACE_RUNTIME} \
10099
VT_UBSAN_ENABLED=${VT_UBSAN_ENABLED} \
101100
VT_UNITY_BUILD_ENABLED=${VT_UNITY_BUILD_ENABLED} \
102-
VT_USE_OPENMP=${VT_USE_OPENMP} \
103101
VT_WERROR_ENABLED=${VT_WERROR_ENABLED} \
104102
CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}
105103

ci/docker/ubuntu-gnu-cpp.dockerfile

-2
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ ARG VT_PRODUCTION_BUILD_ENABLED
104104
ARG VT_TRACE_ENABLED
105105
ARG VT_TRACE_RUNTIME_ENABLED
106106
ARG VT_UBSAN_ENABLED
107-
ARG VT_USE_OPENMP
108107
ARG VT_WERROR_ENABLED
109108
ARG VT_ZOLTAN_ENABLED
110109
ARG CMAKE_CXX_STANDARD
@@ -127,7 +126,6 @@ ENV BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} \
127126
VT_TRACE_RUNTIME_ENABLED=${VT_TRACE_RUNTIME} \
128127
VT_UBSAN_ENABLED=${VT_UBSAN_ENABLED} \
129128
VT_UNITY_BUILD_ENABLED=${VT_UNITY_BUILD_ENABLED} \
130-
VT_USE_OPENMP=${VT_USE_OPENMP} \
131129
VT_WERROR_ENABLED=${VT_WERROR_ENABLED} \
132130
VT_ZOLTAN_ENABLED=${VT_ZOLTAN_ENABLED} \
133131
CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}

ci/docker/ubuntu-intel-oneapi-cpp.dockerfile

-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ ARG VT_WERROR_ENABLED
7070
ARG VT_POOL_ENABLED
7171
ARG VT_PRODUCTION_BUILD_ENABLED
7272
ARG VT_FCONTEXT_ENABLED
73-
ARG VT_USE_OPENMP
7473
ARG CMAKE_BUILD_TYPE
7574
ARG VT_EXTENDED_TESTS_ENABLED
7675
ARG CMAKE_CXX_STANDARD
@@ -88,7 +87,6 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
8887
VT_UNITY_BUILD_ENABLED=${VT_UNITY_BUILD_ENABLED} \
8988
VT_PRODUCTION_BUILD_ENABLED=${VT_PRODUCTION_BUILD_ENABLED} \
9089
VT_FCONTEXT_ENABLED=${VT_FCONTEXT_ENABLED} \
91-
VT_USE_OPENMP=${VT_USE_OPENMP} \
9290
VT_DIAGNOSTICS_ENABLED=${VT_DIAGNOSTICS_ENABLED} \
9391
VT_DIAGNOSTICS_RUNTIME_ENABLED=${VT_DIAGNOSTICS_RUNTIME_ENABLED} \
9492
CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} \

ci/docker/ubuntu-nvidia-cpp.dockerfile

-2
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ ARG VT_PRODUCTION_BUILD_ENABLED
108108
ARG CMAKE_BUILD_TYPE
109109
ARG VT_EXTENDED_TESTS_ENABLED
110110
ARG VT_FCONTEXT_ENABLED
111-
ARG VT_USE_OPENMP
112111
ARG VT_NO_COLOR_ENABLED
113112
ARG BUILD_SHARED_LIBS
114113
ARG CMAKE_CXX_STANDARD
@@ -126,7 +125,6 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
126125
VT_UNITY_BUILD_ENABLED=${VT_UNITY_BUILD_ENABLED} \
127126
VT_PRODUCTION_BUILD_ENABLED=${VT_PRODUCTION_BUILD_ENABLED} \
128127
VT_FCONTEXT_ENABLED=${VT_FCONTEXT_ENABLED} \
129-
VT_USE_OPENMP=${VT_USE_OPENMP} \
130128
VT_DIAGNOSTICS_ENABLED=${VT_DIAGNOSTICS_ENABLED} \
131129
VT_DIAGNOSTICS_RUNTIME_ENABLED=${VT_DIAGNOSTICS_RUNTIME_ENABLED} \
132130
VT_NO_COLOR_ENABLED=${VT_NO_COLOR_ENABLED} \

ci/test_spack_package.sh

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ variables_map["diagnostics_enabled"]="${VT_DIAGNOSTICS_ENABLED:-0}"
2626
variables_map["diagnostics_runtime_enabled"]="${VT_DIAGNOSTICS_RUNTIME_ENABLED:-0}"
2727
variables_map["unity_build_enabled"]="${VT_UNITY_BUILD_ENABLED:-0}"
2828
variables_map["fcontext_enabled"]="${VT_FCONTEXT_ENABLED:-0}"
29-
variables_map["use_openmp"]="${VT_USE_OPENMP:-0}"
3029

3130
cmd_vars=()
3231
for flag in "${!variables_map[@]}"

cmake_config.h.in

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
#define vt_feature_cmake_trace_enabled @vt_feature_cmake_trace_enabled@
4747
#define vt_feature_cmake_trace_only @vt_feature_cmake_trace_only@
4848
#define vt_feature_cmake_lblite @vt_feature_cmake_lblite@
49-
#define vt_feature_cmake_openmp @vt_feature_cmake_openmp@
5049
#define vt_feature_cmake_production @vt_feature_cmake_production@
5150
#define vt_feature_cmake_mpi_rdma @vt_feature_cmake_mpi_rdma@
5251
#define vt_feature_cmake_print_term_msgs @vt_feature_cmake_print_term_msgs@

docker-compose.yml

-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
# VT_UNITY_BUILD=0 # Build with Unity/Jumbo mode enabled
3434
# VT_PRODUCTION_BUILD=0 # Disable assertions and debug prints
3535
# VT_FCONTEXT=0 # Force use of fcontext for threading
36-
# VT_USE_OPENMP=0 # Force use of OpenMP for threading
3736
# VT_DIAGNOSTICS=1 # Build with diagnostics enabled
3837
# VT_DIAGNOSTICS_RUNTIME=0 # Enable diagnostics collection at runtime by default
3938
# BUILD_TYPE=release # CMake build type
@@ -138,7 +137,6 @@ x-vtopts: &vtopts
138137
VT_UNITY_BUILD_ENABLED: ${VT_UNITY_BUILD:-0}
139138
VT_PRODUCTION_BUILD_ENABLED: ${VT_PRODUCTION_BUILD:-0}
140139
VT_FCONTEXT_ENABLED: ${VT_FCONTEXT:-0}
141-
VT_USE_OPENMP: ${VT_USE_OPENMP:-0}
142140
VT_DIAGNOSTICS_ENABLED: ${VT_DIAGNOSTICS:-1}
143141
VT_DIAGNOSTICS_RUNTIME_ENABLED: ${VT_DIAGNOSTICS_RUNTIME:-0}
144142
CMAKE_BUILD_TYPE: ${BUILD_TYPE:-release}

scripts/workflow-azure-template.yml

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ variables:
3434
VT_UNITY_BUILD: [% vt_unity_build %]
3535
VT_PRODUCTION_BUILD: [% vt_production_build %]
3636
VT_FCONTEXT: [% vt_fcontext %]
37-
VT_USE_OPENMP: [% vt_use_openmp %]
3837
VT_ZOLTAN: [% vt_zoltan %]
3938
VT_CI_BUILD: [% vt_ci_build %]
4039
VT_DIAGNOSTICS: [% vt_diagnostics %]

scripts/workflows-azure.ini

-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ vt_extended_tests = 1
1414
vt_unity_build = 1
1515
vt_production_build = 0
1616
vt_fcontext = 0
17-
vt_use_openmp = 0
1817
vt_zoltan = 0
1918
vt_ci_build = 1
2019
vt_tests_num_nodes = 2
@@ -151,7 +150,6 @@ compiler = clang-5.0
151150
distro = 18.04
152151
output_name = ci/azure/azure-clang-5.0-ubuntu-mpich.yml
153152
vt_trace = 1
154-
vt_use_openmp = 1
155153

156154
[PR-tests-clang-13-alpine]
157155
test_configuration = "clang-13, alpine, mpich"

src/vt/configs/debug/debug_masterconfig.h

+1-5
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,7 @@ using VTPrintConfig = Configuration<
7878

7979
}} /* end namespace vt::config */
8080

81-
#define backend_no_threading \
82-
!vt_check_enabled(openmp)
83-
8481
#define vt_threading_enabled \
85-
(vt_check_enabled(openmp) \
86-
or vt_check_enabled(fcontext))
82+
vt_check_enabled(fcontext)
8783

8884
#endif /*INCLUDED_VT_CONFIGS_DEBUG_DEBUG_MASTERCONFIG_H*/

src/vt/configs/features/features_defines.h

-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
#define vt_feature_trace_enabled 0 || vt_feature_cmake_trace_enabled
5757
#define vt_feature_trace_only 0 || vt_feature_cmake_trace_only
5858
#define vt_feature_lblite 0 || vt_feature_cmake_lblite
59-
#define vt_feature_openmp 0 || vt_feature_cmake_openmp
6059
#define vt_feature_production 0 || vt_feature_cmake_production
6160
#define vt_feature_mpi_rdma 0 || vt_feature_cmake_mpi_rdma
6261
#define vt_feature_print_term_msgs 0 || vt_feature_cmake_print_term_msgs

src/vt/configs/features/features_featureswitch.h

-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
#define vt_feature_str_mpi_rdma "Native RDMA with MPI"
5959
#define vt_feature_str_no_feature "No feature"
6060
#define vt_feature_str_no_pool_alloc_env "No memory pool envelope"
61-
#define vt_feature_str_openmp "OpenMP Threading"
6261
#define vt_feature_str_print_term_msgs "Print Termination Control Messages"
6362
#define vt_feature_str_priorities "Message priorities"
6463
#define vt_feature_str_production_build "Production Build (assertions and " \

0 commit comments

Comments
 (0)