Skip to content

Commit f4105ac

Browse files
committed
Drop custom HAS_OPENMP define
1 parent a15aaf7 commit f4105ac

4 files changed

Lines changed: 6 additions & 7 deletions

File tree

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ if(ITLABAI_ENABLE_OPENMP)
4040

4141
if(OpenMP_FOUND)
4242
message(STATUS "OpenMP found - enabling parallel support")
43-
add_definitions(-DHAS_OPENMP)
4443
link_libraries(OpenMP::OpenMP_CXX)
4544
else()
4645
message(STATUS "OpenMP not found - parallel features disabled")

include/parallel/backends.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ inline void impl_tbb(std::size_t count,
9292
}, oneapi::tbb::auto_partitioner());
9393
}
9494

95-
#ifdef HAS_OPENMP
95+
#ifdef _OPENMP
9696
inline void impl_omp(std::size_t count,
9797
const std::function<void(std::size_t)>& func,
9898
const Options& opt) {

include/parallel/parallel.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace it_lab_ai {
55
namespace parallel {
66

77
constexpr bool kHasOmp =
8-
#ifdef HAS_OPENMP
8+
#ifdef _OPENMP
99
true;
1010
#else
1111
false;
@@ -16,7 +16,7 @@ inline Backend resolve_default_backend(std::size_t n, const Options& opt) {
1616
return Backend::kSeq;
1717
}
1818

19-
#ifdef HAS_OPENMP
19+
#ifdef _OPENMP
2020
return Backend::kOmp;
2121
#else
2222
return Backend::kTbb;

include/perf/benchmarking.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
#pragma once
44

5-
#if defined(HAS_OPENMP)
5+
#if defined(_OPENMP)
66
# include <omp.h>
77
#endif
88

@@ -29,7 +29,7 @@ DurationContainerType elapsed_time(Function&& func, Args&&... args) {
2929
// returns time in seconds
3030
template <class Function, typename... Args>
3131
double elapsed_time_omp(Function&& func, Args&&... args) {
32-
#if defined(HAS_OPENMP)
32+
#if defined(_OPENMP)
3333
double start = omp_get_wtime();
3434
std::forward<Function>(func)(std::forward<Args>(args)...);
3535
double end = omp_get_wtime();
@@ -58,7 +58,7 @@ DurationContainerType elapsed_time_avg(const size_t iters, Function&& func,
5858
template <class Function, typename... Args>
5959
double elapsed_time_omp_avg(const size_t iters, Function&& func,
6060
Args&&... args) {
61-
#if defined(HAS_OPENMP)
61+
#if defined(_OPENMP)
6262
double start = omp_get_wtime();
6363
for (size_t i = 0; i < iters; i++) {
6464
std::forward<Function>(func)(std::forward<Args>(args)...);

0 commit comments

Comments
 (0)