Skip to content

Commit d793521

Browse files
committed
Fixed compilation with C++20 on Windows
1 parent ef14b50 commit d793521

File tree

5 files changed

+9
-3
lines changed

5 files changed

+9
-3
lines changed

.github/workflows/linux_arm64.yml

-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ jobs:
149149
-DENABLE_NCC_STYLE=OFF \
150150
-DENABLE_TESTS=ON \
151151
-DENABLE_STRICT_DEPENDENCIES=OFF \
152-
-DENABLE_SYSTEM_TBB=OFF \
153152
-DENABLE_SYSTEM_OPENCL=ON \
154153
-DCMAKE_VERBOSE_MAKEFILE=ON \
155154
-DCPACK_GENERATOR=TGZ \

.github/workflows/linux_conditional_compilation.yml

+1
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ jobs:
143143
cmake \
144144
-G "${{ env.CMAKE_GENERATOR }}" \
145145
-DBUILD_SHARED_LIBS=OFF \
146+
-DCMAKE_CXX_STANDARD=20 \
146147
-DENABLE_TESTS=ON \
147148
-DENABLE_CPPLINT=OFF \
148149
-DENABLE_NCC_STYLE=OFF \

.github/workflows/windows_conditional_compilation.yml

+1
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ jobs:
118118
run: |
119119
cmake -G "${{ env.CMAKE_GENERATOR }}" `
120120
-DBUILD_SHARED_LIBS=OFF `
121+
-DCMAKE_CXX_STANDARD=20 `
121122
-DENABLE_TESTS=ON `
122123
-DENABLE_CPPLINT=OFF `
123124
-DENABLE_NCC_STYLE=OFF `

cmake/features.cmake

+6-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,12 @@ endif()
165165
if(DEFINED ENV{TBBROOT} OR DEFINED ENV{TBB_DIR} OR DEFINED TBB_DIR OR DEFINED TBBROOT)
166166
set(ENABLE_SYSTEM_TBB_DEFAULT OFF)
167167
else()
168-
set(ENABLE_SYSTEM_TBB_DEFAULT ${ENABLE_SYSTEM_LIBS_DEFAULT})
168+
if(LINUX AND ARM64)
169+
# CVS-126984: system TBB is not very stable on Linux ARM64 (at least on Ubuntu 20.04)
170+
set(ENABLE_SYSTEM_TBB_DEFAULT OFF)
171+
else()
172+
set(ENABLE_SYSTEM_TBB_DEFAULT ${ENABLE_SYSTEM_LIBS_DEFAULT})
173+
endif()
169174
endif()
170175

171176
ov_dependent_option (ENABLE_SYSTEM_TBB "Enables use of system TBB" ${ENABLE_SYSTEM_TBB_DEFAULT}

src/common/transformations/include/transformations/rt_info/nms_selected_indices.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ TRANSFORMATIONS_API bool has_nms_selected_indices(const Node* node);
2121

2222
TRANSFORMATIONS_API void set_nms_selected_indices(Node* node);
2323

24-
class TRANSFORMATIONS_API NmsSelectedIndices : ov::RuntimeAttribute {
24+
class TRANSFORMATIONS_API NmsSelectedIndices : public ov::RuntimeAttribute {
2525
public:
2626
OPENVINO_RTTI("nms_selected_indices", "0");
2727
NmsSelectedIndices() = default;

0 commit comments

Comments
 (0)