Skip to content

Commit b37a2df

Browse files
allnesallnes
committed
fix: silence unused option in omp fallback
1 parent 1f22fa0 commit b37a2df

13 files changed

Lines changed: 287 additions & 193 deletions

File tree

‎app/Accuracy/CMakeLists.txt‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
1-
set(INCLUDE_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/acc.hpp")
2-
set(SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/acc.cpp")
3-
add_library(ACCLib STATIC ${INCLUDE_HEADERS} ${SRC_FILES})
1+
file(GLOB ACC_CPP CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
2+
file(GLOB ACC_HPP CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
3+
list(FILTER ACC_CPP EXCLUDE REGEX "accuracy_check\\.cpp$")
44

5-
set_target_properties(ReadLib PROPERTIES LINKER_LANGUAGE CXX)
5+
add_library(itlabai_acc_lib STATIC ${ACC_HPP} ${ACC_CPP})
6+
add_library(ITLabAI::AccLib ALIAS itlabai_acc_lib)
67

7-
find_package( OpenCV REQUIRED PATHS "${OPENCV_BUILD_DIR}" )
8-
include_directories( ${OpenCV_INCLUDE_DIRS} )
9-
target_link_libraries( ACCLib ${OpenCV_LIBS} )
10-
target_link_libraries( ACCLib TBB_unified)
11-
target_link_libraries( ACCLib layers_lib)
12-
target_link_libraries( ACCLib gtest_main)
13-
target_link_libraries( ACCLib Kokkos_imported)
8+
set_target_properties(itlabai_acc_lib PROPERTIES LINKER_LANGUAGE CXX)
149

15-
add_executable(Accuracy_Check accuracy_check.cpp)
16-
target_link_libraries(Accuracy_Check ACCLib)
17-
18-
file(DOWNLOAD
19-
"https://raw.githubusercontent.com/opencv/opencv/4.x/samples/data/lena.jpg"
20-
"${CMAKE_CURRENT_BINARY_DIR}/image.jpg"
21-
SHOW_PROGRESS
22-
STATUS status_code
23-
LOG log_file
10+
target_link_libraries(itlabai_acc_lib
11+
PUBLIC
12+
itlabai_layers_lib
13+
OpenCV::opencv_world
14+
TBB_unified
15+
Kokkos_imported
2416
)
25-
add_definitions(-DIMAGE1_PATH="${CMAKE_CURRENT_BINARY_DIR}/image.jpg")
17+
itlabai_link_externals(itlabai_acc_lib opencv tbb gtest kokkos openmp)
18+
itlabai_target_defaults(itlabai_acc_lib)
19+
add_dependencies(itlabai_acc_lib opencv_external)
20+
target_compile_definitions(itlabai_acc_lib PUBLIC IMAGE1_PATH="${ITLABAI_TEST_DATA_DIR}/lena.jpg")
21+
22+
file(GLOB ACC_MAIN CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/accuracy_check.cpp")
23+
add_executable(itlabai_accuracy_check_exe ${ACC_MAIN})
24+
add_executable(ITLabAI::AccuracyCheckExe ALIAS itlabai_accuracy_check_exe)
25+
target_link_libraries(itlabai_accuracy_check_exe PRIVATE itlabai_acc_lib OpenCV::opencv_world)
26+
itlabai_link_externals(itlabai_accuracy_check_exe openmp)
27+
itlabai_target_defaults(itlabai_accuracy_check_exe)
28+
itlabai_apply_runtime_rpath(itlabai_accuracy_check_exe)

‎app/Converters/CMakeLists.txt‎

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,26 @@
1-
add_executable(Reader_weights reader_weights_sample.cpp)
2-
add_executable(Reader_weights_onnx reader_weights_sample_onnx.cpp)
3-
target_link_libraries(Reader_weights PUBLIC perf_lib layers_lib reader_lib)
4-
target_link_libraries(Reader_weights_onnx PUBLIC perf_lib layers_lib reader_lib)
5-
add_definitions(-DMODEL_PATH_H5="${CMAKE_SOURCE_DIR}/docs/jsons/model_data_alexnet_1.json")
6-
add_definitions(-DMODEL_PATH_GOOGLENET_ONNX="${CMAKE_SOURCE_DIR}/docs/jsons/googlenet_onnx_model.json")
7-
add_definitions(-DMODEL_PATH_DENSENET_ONNX="${CMAKE_SOURCE_DIR}/docs/jsons/densenet121_Opset16_onnx_model.json")
8-
add_definitions(-DMODEL_PATH_RESNET_ONNX="${CMAKE_SOURCE_DIR}/docs/jsons/resnest101e_Opset16_onnx_model.json")
9-
add_definitions(-DMODEL_PATH_YOLO11NET_ONNX="${CMAKE_SOURCE_DIR}/docs/jsons/yolo11x-cls_onnx_model.json")
1+
file(GLOB READER_WEIGHTS_SRC CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/reader_weights_sample.cpp")
2+
file(GLOB READER_WEIGHTS_ONNX_SRC CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/reader_weights_sample_onnx.cpp")
3+
add_executable(itlabai_reader_weights_exe ${READER_WEIGHTS_SRC})
4+
add_executable(ITLabAI::ReaderWeightsExe ALIAS itlabai_reader_weights_exe)
5+
add_executable(itlabai_reader_weights_onnx_exe ${READER_WEIGHTS_ONNX_SRC})
6+
add_executable(ITLabAI::ReaderWeightsOnnxExe ALIAS itlabai_reader_weights_onnx_exe)
7+
target_link_libraries(itlabai_reader_weights_exe PUBLIC itlabai_perf_lib itlabai_layers_lib itlabai_reader_lib)
8+
target_link_libraries(itlabai_reader_weights_onnx_exe PUBLIC itlabai_perf_lib itlabai_layers_lib itlabai_reader_lib)
9+
itlabai_target_defaults(itlabai_reader_weights_exe)
10+
itlabai_target_defaults(itlabai_reader_weights_onnx_exe)
11+
itlabai_apply_runtime_rpath(itlabai_reader_weights_exe)
12+
itlabai_apply_runtime_rpath(itlabai_reader_weights_onnx_exe)
13+
target_compile_definitions(itlabai_reader_weights_exe PRIVATE
14+
MODEL_PATH_H5="${CMAKE_SOURCE_DIR}/docs/jsons/model_data_alexnet_1.json"
15+
MODEL_PATH_GOOGLENET_ONNX="${CMAKE_SOURCE_DIR}/docs/jsons/googlenet_onnx_model.json"
16+
MODEL_PATH_DENSENET_ONNX="${CMAKE_SOURCE_DIR}/docs/jsons/densenet121_Opset16_onnx_model.json"
17+
MODEL_PATH_RESNET_ONNX="${CMAKE_SOURCE_DIR}/docs/jsons/resnest101e_Opset16_onnx_model.json"
18+
MODEL_PATH_YOLO11NET_ONNX="${CMAKE_SOURCE_DIR}/docs/jsons/yolo11x-cls_onnx_model.json"
19+
)
20+
target_compile_definitions(itlabai_reader_weights_onnx_exe PRIVATE
21+
MODEL_PATH_H5="${CMAKE_SOURCE_DIR}/docs/jsons/model_data_alexnet_1.json"
22+
MODEL_PATH_GOOGLENET_ONNX="${CMAKE_SOURCE_DIR}/docs/jsons/googlenet_onnx_model.json"
23+
MODEL_PATH_DENSENET_ONNX="${CMAKE_SOURCE_DIR}/docs/jsons/densenet121_Opset16_onnx_model.json"
24+
MODEL_PATH_RESNET_ONNX="${CMAKE_SOURCE_DIR}/docs/jsons/resnest101e_Opset16_onnx_model.json"
25+
MODEL_PATH_YOLO11NET_ONNX="${CMAKE_SOURCE_DIR}/docs/jsons/yolo11x-cls_onnx_model.json"
26+
)

‎app/Graph/CMakeLists.txt‎

Lines changed: 47 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,49 @@
1-
set(INCLUDE_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/build.hpp")
2-
set(SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/build.cpp")
3-
add_library(BuildGraph STATIC ${INCLUDE_HEADERS} ${SRC_FILES})
4-
5-
set_target_properties(BuildGraph PROPERTIES LINKER_LANGUAGE CXX)
6-
7-
find_package(OpenCV REQUIRED PATHS "${OPENCV_BUILD_DIR}")
8-
include_directories(${OpenCV_INCLUDE_DIRS})
9-
10-
target_link_libraries(BuildGraph PUBLIC ${OpenCV_LIBS})
11-
target_link_libraries(BuildGraph PUBLIC reader_lib)
12-
target_link_libraries(BuildGraph PUBLIC TBB_unified)
13-
target_link_libraries(BuildGraph PUBLIC layers_lib)
14-
target_link_libraries(BuildGraph PUBLIC layers_oneDNN_lib)
15-
target_link_libraries(BuildGraph PUBLIC gtest_main)
16-
17-
target_include_directories(BuildGraph PUBLIC ${CMAKE_SOURCE_DIR}/3rdparty/Json/include)
18-
19-
add_executable(Graph_Build graph_build.cpp)
20-
target_link_libraries(Graph_Build BuildGraph)
21-
22-
add_executable(ACC acc_check.cpp)
23-
target_link_libraries(ACC BuildGraph)
24-
25-
add_executable(onnx_subgraphs onnx_subgraphs.cpp)
26-
target_link_libraries(onnx_subgraphs BuildGraph)
27-
target_link_libraries(onnx_subgraphs OpenMP::OpenMP_CXX)
28-
target_link_libraries(onnx_subgraphs graphT_lib)
29-
30-
file(DOWNLOAD
31-
"https://raw.githubusercontent.com/DeepTrackAI/MNIST_dataset/main/mnist/test/1_000008.png"
32-
"${CMAKE_SOURCE_DIR}/docs/input/28/test1.png"
33-
SHOW_PROGRESS
34-
STATUS status_code
35-
LOG log_file
36-
)
37-
38-
file(DOWNLOAD
39-
"blob:https://ru.pinterest.com/63b88674-b4a6-4ef3-85b2-ab57ef7bb8e7"
40-
"${CMAKE_SOURCE_DIR}/docs/input/Imagenet_test/tench.png"
41-
SHOW_PROGRESS
42-
STATUS status_code
43-
LOG log_file
1+
file(GLOB BUILDGRAPH_CPP CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
2+
file(GLOB BUILDGRAPH_HPP CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
3+
list(FILTER BUILDGRAPH_CPP INCLUDE REGEX "/build\\.cpp$")
4+
5+
add_library(itlabai_build_graph_lib STATIC ${BUILDGRAPH_HPP} ${BUILDGRAPH_CPP})
6+
add_library(ITLabAI::BuildGraphLib ALIAS itlabai_build_graph_lib)
7+
8+
set_target_properties(itlabai_build_graph_lib PROPERTIES LINKER_LANGUAGE CXX)
9+
10+
target_link_libraries(itlabai_build_graph_lib PUBLIC itlabai_reader_lib itlabai_layers_lib itlabai_layers_onednn_lib OpenCV::opencv_world Kokkos_imported TBB_unified)
11+
itlabai_link_externals(itlabai_build_graph_lib opencv tbb gtest kokkos openmp)
12+
add_dependencies(itlabai_build_graph_lib opencv_external)
13+
target_compile_definitions(itlabai_build_graph_lib PUBLIC
14+
IMAGE28_PATH="${CMAKE_SOURCE_DIR}/docs/input/28/"
15+
IMAGENET_ACC="${CMAKE_SOURCE_DIR}/docs/ImageNet/test/"
16+
IMAGENET_PATH="${CMAKE_SOURCE_DIR}/docs/input/Imagenet_test/"
17+
MODEL_PATH_H5="${CMAKE_SOURCE_DIR}/docs/jsons/model_data_alexnet_1.json"
18+
MODEL_PATH_GOOGLENET_ONNX="${CMAKE_SOURCE_DIR}/docs/jsons/googlenet_onnx_model.json"
19+
MODEL_PATH_DENSENET_ONNX="${CMAKE_SOURCE_DIR}/docs/jsons/densenet121_Opset16_onnx_model.json"
20+
MODEL_PATH_RESNET_ONNX="${CMAKE_SOURCE_DIR}/docs/jsons/resnest101e_Opset16_onnx_model.json"
21+
MODEL_PATH_YOLO11NET_ONNX="${CMAKE_SOURCE_DIR}/docs/jsons/yolo11x-cls_onnx_model.json"
22+
IMAGENET_LABELS="${CMAKE_SOURCE_DIR}/docs/imagenet1000_clsidx_to_labels.json"
23+
MNIST_PATH="${CMAKE_SOURCE_DIR}/docs/mnist/mnist/test"
4424
)
4525

46-
add_definitions(-DIMAGE28_PATH="${CMAKE_SOURCE_DIR}/docs/input/28/")
47-
add_definitions(-DIMAGENET_ACC="${CMAKE_SOURCE_DIR}/docs/ImageNet/test/")
48-
add_definitions(-DIMAGENET_PATH="${CMAKE_SOURCE_DIR}/docs/input/Imagenet_test/")
49-
add_definitions(-DMODEL_PATH_H5="${CMAKE_SOURCE_DIR}/docs/jsons/model_data_alexnet_1.json")
50-
add_definitions(-DMODEL_PATH_GOOGLENET_ONNX="${CMAKE_SOURCE_DIR}/docs/jsons/googlenet_onnx_model.json")
51-
add_definitions(-DMODEL_PATH_DENSENET_ONNX="${CMAKE_SOURCE_DIR}/docs/jsons/densenet121_Opset16_onnx_model.json")
52-
add_definitions(-DMODEL_PATH_RESNET_ONNX="${CMAKE_SOURCE_DIR}/docs/jsons/resnest101e_Opset16_onnx_model.json")
53-
add_definitions(-DMODEL_PATH_YOLO11NET_ONNX="${CMAKE_SOURCE_DIR}/docs/jsons/yolo11x-cls_onnx_model.json")
54-
add_definitions(-DIMAGENET_LABELS="${CMAKE_SOURCE_DIR}/docs/imagenet1000_clsidx_to_labels.json")
55-
add_definitions(-DMNIST_PATH="${CMAKE_SOURCE_DIR}/docs/mnist/mnist/test")
26+
file(GLOB GRAPH_BUILD_MAIN CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/graph_build.cpp")
27+
add_executable(itlabai_graph_build_exe ${GRAPH_BUILD_MAIN})
28+
add_executable(ITLabAI::GraphBuildExe ALIAS itlabai_graph_build_exe)
29+
target_link_libraries(itlabai_graph_build_exe PRIVATE itlabai_build_graph_lib)
30+
itlabai_target_defaults(itlabai_graph_build_exe)
31+
itlabai_apply_runtime_rpath(itlabai_graph_build_exe)
32+
33+
file(GLOB ACC_MAIN CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/acc_check.cpp")
34+
add_executable(itlabai_acc_exe ${ACC_MAIN})
35+
add_executable(ITLabAI::AccExe ALIAS itlabai_acc_exe)
36+
target_link_libraries(itlabai_acc_exe PRIVATE itlabai_build_graph_lib OpenCV::opencv_world)
37+
itlabai_target_defaults(itlabai_acc_exe)
38+
itlabai_apply_runtime_rpath(itlabai_acc_exe)
39+
40+
file(GLOB ONNX_SUBGRAPHS_MAIN CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/onnx_subgraphs.cpp")
41+
add_executable(itlabai_onnx_subgraphs_exe ${ONNX_SUBGRAPHS_MAIN})
42+
add_executable(ITLabAI::OnnxSubgraphsExe ALIAS itlabai_onnx_subgraphs_exe)
43+
target_link_libraries(itlabai_onnx_subgraphs_exe PRIVATE itlabai_build_graph_lib)
44+
if(ITLABAI_ENABLE_OPENMP AND TARGET OpenMP::OpenMP_CXX)
45+
target_link_libraries(itlabai_onnx_subgraphs_exe PRIVATE OpenMP::OpenMP_CXX)
46+
endif()
47+
target_link_libraries(itlabai_onnx_subgraphs_exe PRIVATE itlabai_graph_transformations_lib)
48+
itlabai_target_defaults(itlabai_onnx_subgraphs_exe)
49+
itlabai_apply_runtime_rpath(itlabai_onnx_subgraphs_exe)

‎app/ReaderImage/CMakeLists.txt‎

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,19 @@
1-
set(INCLUDE_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/reader_img.hpp")
2-
set(SRC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/reader_img_s.cpp")
3-
add_library(ReadLib STATIC ${INCLUDE_HEADERS} ${SRC_FILES})
1+
file(GLOB READER_IMG_HEADERS CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
2+
file(GLOB READER_IMG_SOURCES CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/*_s.cpp")
3+
add_library(itlabai_reader_image_lib STATIC ${READER_IMG_HEADERS} ${READER_IMG_SOURCES})
4+
add_library(ITLabAI::ReaderImageLib ALIAS itlabai_reader_image_lib)
45

6+
set_target_properties(itlabai_reader_image_lib PROPERTIES LINKER_LANGUAGE CXX)
57

6-
set_target_properties(ReadLib PROPERTIES LINKER_LANGUAGE CXX)
8+
itlabai_link_externals(itlabai_reader_image_lib opencv tbb openmp)
9+
target_link_libraries(itlabai_reader_image_lib PUBLIC OpenCV::opencv_world TBB_unified)
10+
itlabai_target_defaults(itlabai_reader_image_lib)
11+
add_dependencies(itlabai_reader_image_lib opencv_external)
12+
target_compile_definitions(itlabai_reader_image_lib PUBLIC IMAGE1_PATH="${ITLABAI_TEST_DATA_DIR}/lena.jpg")
713

8-
find_package( OpenCV REQUIRED PATHS "${OPENCV_BUILD_DIR}" )
9-
include_directories( ${OpenCV_INCLUDE_DIRS} )
10-
target_link_libraries( ReadLib ${OpenCV_LIBS} )
11-
target_link_libraries( ReadLib TBB_unified)
12-
13-
add_executable(Reader reader_img.cpp)
14-
target_link_libraries(Reader ReadLib)
15-
16-
file(DOWNLOAD
17-
"https://raw.githubusercontent.com/opencv/opencv/4.x/samples/data/lena.jpg"
18-
"${CMAKE_CURRENT_BINARY_DIR}/image.jpg"
19-
SHOW_PROGRESS
20-
STATUS status_code
21-
LOG log_file
22-
)
23-
add_definitions(-DIMAGE1_PATH="${CMAKE_CURRENT_BINARY_DIR}/image.jpg")
14+
file(GLOB READER_MAIN CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/reader_img.cpp")
15+
add_executable(itlabai_reader_exe ${READER_MAIN})
16+
add_executable(ITLabAI::ReaderExe ALIAS itlabai_reader_exe)
17+
target_link_libraries(itlabai_reader_exe PRIVATE itlabai_reader_image_lib OpenCV::opencv_world)
18+
itlabai_target_defaults(itlabai_reader_exe)
19+
itlabai_apply_runtime_rpath(itlabai_reader_exe)

‎include/CMakeLists.txt‎

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
1-
file(GLOB_RECURSE graph_headers graph/*.h graph/*.hpp)
2-
set(GRAPH_HEADERS "${graph_headers}" PARENT_SCOPE)
3-
4-
file(GLOB_RECURSE graphT_headers graph_transformations/*.h graph_transformations/*.hpp)
5-
set(GRAPHT_HEADERS "${graphT_headers}" PARENT_SCOPE)
6-
7-
file(GLOB_RECURSE layers_headers layers/*.h layers/*.hpp)
8-
set(LAYERS_HEADERS "${layers_headers}" PARENT_SCOPE)
9-
10-
file(GLOB_RECURSE layers_oneDNN_headers layers_oneDNN/*.h layers_oneDNN/*.hpp)
11-
set(LAYERS_ONEDNN_HEADERS "${layers_oneDNN_headers}" PARENT_SCOPE)
12-
13-
file(GLOB_RECURSE perf_headers perf/*.h perf/*.hpp)
14-
set(PERF_HEADERS "${perf_headers}" PARENT_SCOPE)
15-
16-
file(GLOB_RECURSE reader_headers Weights_Reader/*.h Weights_Reader/*.hpp)
17-
set(READER_HEADERS "${reader_headers}" PARENT_SCOPE)
18-
19-
file(GLOB_RECURSE parallel_headers parallel/*.h parallel/*.hpp)
20-
set(LAYERS_HEADERS "${parallel_headers}" PARENT_SCOPE)
1+
file(GLOB_RECURSE GRAPH_HEADERS CONFIGURE_DEPENDS
2+
"${CMAKE_CURRENT_SOURCE_DIR}/graph/*.hpp"
3+
)
4+
file(GLOB_RECURSE GRAPHT_HEADERS CONFIGURE_DEPENDS
5+
"${CMAKE_CURRENT_SOURCE_DIR}/graph_transformations/*.hpp"
6+
)
7+
file(GLOB_RECURSE LAYERS_HEADERS CONFIGURE_DEPENDS
8+
"${CMAKE_CURRENT_SOURCE_DIR}/layers/*.hpp"
9+
"${CMAKE_CURRENT_SOURCE_DIR}/parallel/*.hpp"
10+
)
11+
file(GLOB_RECURSE LAYERS_ONEDNN_HEADERS CONFIGURE_DEPENDS
12+
"${CMAKE_CURRENT_SOURCE_DIR}/layers_oneDNN/*.hpp"
13+
)
14+
file(GLOB_RECURSE PERF_HEADERS CONFIGURE_DEPENDS
15+
"${CMAKE_CURRENT_SOURCE_DIR}/perf/*.hpp"
16+
)
17+
file(GLOB_RECURSE READER_HEADERS CONFIGURE_DEPENDS
18+
"${CMAKE_CURRENT_SOURCE_DIR}/Weights_Reader/*.hpp"
19+
)
20+
set(GRAPH_HEADERS "${GRAPH_HEADERS}" PARENT_SCOPE)
21+
set(GRAPHT_HEADERS "${GRAPHT_HEADERS}" PARENT_SCOPE)
22+
set(LAYERS_HEADERS "${LAYERS_HEADERS}" PARENT_SCOPE)
23+
set(LAYERS_ONEDNN_HEADERS "${LAYERS_ONEDNN_HEADERS}" PARENT_SCOPE)
24+
set(PERF_HEADERS "${PERF_HEADERS}" PARENT_SCOPE)
25+
set(READER_HEADERS "${READER_HEADERS}" PARENT_SCOPE)

‎include/parallel/backends.hpp‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,13 @@ inline void impl_omp(std::size_t count,
112112
}
113113
}
114114
#else
115-
inline void impl_omp(std::size_t count,
116-
const std::function<void(std::size_t)>& func,
117-
const Options& opt) {
118-
impl_seq(count, func);
119-
}
120-
#endif
115+
inline void impl_omp(std::size_t count,
116+
const std::function<void(std::size_t)>& func,
117+
const Options& opt) {
118+
(void)opt;
119+
impl_seq(count, func);
120+
}
121+
#endif
121122

122123
inline void impl_kokkos(std::size_t count,
123124
const std::function<void(std::size_t)>& func,

‎src/Weights_Reader/CMakeLists.txt‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1-
file(GLOB_RECURSE reader_src *.cpp)
2-
add_library(reader_lib STATIC "${READER_HEADERS}" "${reader_src}")
1+
file(GLOB READER_SOURCES CONFIGURE_DEPENDS
2+
"${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
3+
)
34

4-
include_directories(${CMAKE_SOURCE_DIR}/3rdparty/Json/include)
5-
target_include_directories(reader_lib PUBLIC ${CMAKE_SOURCE_DIR}/3rdparty/Json/include)
5+
add_library(itlabai_reader_lib STATIC)
6+
add_library(ITLabAI::ReaderLib ALIAS itlabai_reader_lib)
7+
target_sources(itlabai_reader_lib PRIVATE ${READER_SOURCES} ${READER_HEADERS})
8+
target_include_directories(itlabai_reader_lib
9+
PUBLIC
10+
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>
11+
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
12+
)
13+
target_link_libraries(itlabai_reader_lib PUBLIC nlohmann_json::nlohmann_json)
14+
itlabai_target_defaults(itlabai_reader_lib)
15+
itlabai_link_externals(itlabai_reader_lib)

‎src/graph/CMakeLists.txt‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1-
file(GLOB_RECURSE graph_src *.cpp)
2-
add_library(graph_lib STATIC "${GRAPH_HEADERS}" "${graph_src}")
3-
target_link_libraries(graph_lib PUBLIC TBB_unified)
4-
add_dependencies(graph_lib kokkos_external)
1+
file(GLOB GRAPH_SOURCES CONFIGURE_DEPENDS
2+
"${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
3+
)
4+
5+
add_library(itlabai_graph_lib STATIC)
6+
add_library(ITLabAI::GraphLib ALIAS itlabai_graph_lib)
7+
target_sources(itlabai_graph_lib PRIVATE ${GRAPH_SOURCES} ${GRAPH_HEADERS})
8+
target_include_directories(itlabai_graph_lib
9+
PUBLIC
10+
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>
11+
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
12+
)
13+
itlabai_link_externals(itlabai_graph_lib tbb kokkos openmp)
14+
itlabai_target_defaults(itlabai_graph_lib)

‎src/graph_transformations/CMakeLists.txt‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1-
file(GLOB_RECURSE graphT_src *.cpp)
2-
add_library(graphT_lib STATIC "${GRAPHT_HEADERS}" "${graphT_src}")
3-
target_link_libraries(graphT_lib PUBLIC TBB_unified)
4-
add_dependencies(graphT_lib kokkos_external)
1+
file(GLOB GRAPHT_SOURCES CONFIGURE_DEPENDS
2+
"${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
3+
)
4+
5+
add_library(itlabai_graph_transformations_lib STATIC)
6+
add_library(ITLabAI::GraphTransformationsLib ALIAS itlabai_graph_transformations_lib)
7+
target_sources(itlabai_graph_transformations_lib PRIVATE ${GRAPHT_SOURCES} ${GRAPHT_HEADERS})
8+
target_include_directories(itlabai_graph_transformations_lib
9+
PUBLIC
10+
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>
11+
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
12+
)
13+
itlabai_link_externals(itlabai_graph_transformations_lib tbb kokkos openmp)
14+
itlabai_target_defaults(itlabai_graph_transformations_lib)

‎src/layers/CMakeLists.txt‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
1-
file(GLOB_RECURSE layers_src *.cpp)
2-
add_library(layers_lib STATIC "${LAYERS_HEADERS}" "${layers_src}")
1+
file(GLOB LAYERS_SOURCES CONFIGURE_DEPENDS
2+
"${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
3+
)
34

4-
target_link_libraries(layers_lib PUBLIC TBB_unified)
5-
target_link_libraries(layers_lib PUBLIC OpenMP::OpenMP_CXX)
6-
target_link_libraries(layers_lib PUBLIC dnnl)
7-
target_link_libraries(layers_lib PUBLIC Kokkos_imported)
5+
add_library(itlabai_layers_lib STATIC)
6+
add_library(ITLabAI::LayersLib ALIAS itlabai_layers_lib)
7+
target_sources(itlabai_layers_lib PRIVATE ${LAYERS_SOURCES} ${LAYERS_HEADERS})
8+
target_include_directories(itlabai_layers_lib
9+
PUBLIC
10+
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>
11+
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
12+
)
13+
target_link_libraries(itlabai_layers_lib PUBLIC dnnl)
14+
itlabai_link_externals(itlabai_layers_lib tbb openmp kokkos)
15+
itlabai_target_defaults(itlabai_layers_lib)

0 commit comments

Comments
 (0)