Skip to content

Commit ed2d6c3

Browse files
sbalint98sbalint98
committed
Added SOURCES to add_sycl_to_target
1 parent a9cb23a commit ed2d6c3

File tree

15 files changed

+49
-53
lines changed

15 files changed

+49
-53
lines changed

‎src/CMakeLists.txt

-3
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ if(BUILD_SHARED_LIBS)
4848
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
4949
$<INSTALL_INTERFACE:include>
5050
)
51-
if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
52-
add_sycl_to_target(TARGET onemkl)
53-
endif()
5451
set_target_properties(onemkl PROPERTIES
5552
SOVERSION ${PROJECT_VERSION_MAJOR}
5653
)

‎src/blas/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ set_target_properties(onemkl_blas PROPERTIES
3737
POSITION_INDEPENDENT_CODE ON
3838
)
3939
if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
40-
add_sycl_to_target(TARGET onemkl_blas)
40+
add_sycl_to_target(TARGET onemkl_blas SOURCES blas_loader.cpp)
4141
else()
4242
target_link_libraries(onemkl_blas PUBLIC ONEMKL::SYCL::SYCL)
4343
endif()

‎src/blas/backends/cublas/CMakeLists.txt

+10-12
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,16 @@
2020
set(LIB_NAME onemkl_blas_cublas)
2121
set(LIB_OBJ ${LIB_NAME}_obj)
2222
find_package(cuBLAS REQUIRED)
23-
23+
set(SOURCES cublas_level1.cpp
24+
cublas_level2.cpp
25+
cublas_level3.cpp
26+
cublas_batch.cpp
27+
cublas_extensions.cpp
28+
cublas_scope_handle.cpp
29+
$<$<BOOL:${BUILD_SHARED_LIBS}>: mkl_blas_cublas_wrappers.cpp>)
2430
add_library(${LIB_NAME})
25-
add_library(${LIB_OBJ} OBJECT
26-
cublas_level1.cpp
27-
cublas_level2.cpp
28-
cublas_level3.cpp
29-
cublas_batch.cpp
30-
cublas_extensions.cpp
31-
cublas_scope_handle.cpp
32-
$<$<BOOL:${BUILD_SHARED_LIBS}>: mkl_blas_cublas_wrappers.cpp>
33-
)
31+
add_library(${LIB_OBJ} OBJECT ${SOURCES})
32+
3433
target_include_directories(${LIB_OBJ}
3534
PRIVATE ${PROJECT_SOURCE_DIR}/include
3635
${PROJECT_SOURCE_DIR}/src
@@ -43,8 +42,7 @@ set_target_properties(${LIB_OBJ} PROPERTIES
4342

4443
target_link_libraries(${LIB_NAME} PUBLIC ${LIB_OBJ})
4544
if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
46-
add_sycl_to_target(TARGET ${LIB_NAME})
47-
add_sycl_to_target(TARGET ${LIB_OBJ})
45+
add_sycl_to_target(TARGET ${LIB_OBJ} SOURCES ${SOURCES})
4846
endif()
4947
# Add major version to the library
5048
set_target_properties(${LIB_NAME} PROPERTIES

‎src/blas/backends/mklcpu/CMakeLists.txt

+5-8
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,13 @@ set(LIB_NAME onemkl_blas_mklcpu)
2121
set(LIB_OBJ ${LIB_NAME}_obj)
2222

2323
find_package(MKL REQUIRED)
24-
25-
add_library(${LIB_NAME})
26-
add_library(${LIB_OBJ} OBJECT
27-
fp16.hpp mklcpu_common.hpp
24+
set(SOURCES fp16.hpp mklcpu_common.hpp
2825
mklcpu_level1.cpp mklcpu_level2.cpp mklcpu_level3.cpp mklcpu_batch.cpp mklcpu_extensions.cpp
29-
$<$<BOOL:${BUILD_SHARED_LIBS}>: mklcpu_wrappers.cpp>
30-
)
26+
$<$<BOOL:${BUILD_SHARED_LIBS}>: mklcpu_wrappers.cpp>)
27+
add_library(${LIB_NAME})
28+
add_library(${LIB_OBJ} OBJECT ${SOURCES})
3129
if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
32-
add_sycl_to_target(TARGET ${LIB_NAME})
33-
add_sycl_to_target(TARGET ${LIB_OBJ})
30+
add_sycl_to_target(TARGET ${LIB_OBJ} ${SOURCES})
3431
endif()
3532

3633
target_include_directories(${LIB_OBJ}

‎src/rng/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ set_target_properties(onemkl_rng PROPERTIES
3838
POSITION_INDEPENDENT_CODE ON
3939
)
4040
if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
41-
add_sycl_to_target(TARGET onemkl_rng)
41+
add_sycl_to_target(TARGET onemkl_rng SOURCES rng_loader.cpp)
4242
else()
4343
target_link_libraries(onemkl_rng PUBLIC ONEMKL::SYCL::SYCL)
4444
endif()

‎src/rng/backends/curand/CMakeLists.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@ set(LIB_NAME onemkl_rng_curand)
2121
set(LIB_OBJ ${LIB_NAME}_obj)
2222
find_package(cuRAND REQUIRED)
2323

24-
add_library(${LIB_NAME})
25-
add_library(${LIB_OBJ} OBJECT
26-
philox4x32x10.cpp
24+
set(SOURCES philox4x32x10.cpp
2725
mrg32k3a.cpp
28-
$<$<BOOL:${BUILD_SHARED_LIBS}>: mkl_rng_curand_wrappers.cpp>
26+
$<$<BOOL:${BUILD_SHARED_LIBS}>: mkl_rng_curand_wrappers.cpp>)
2927
)
3028

29+
add_library(${LIB_NAME})
30+
add_library(${LIB_OBJ} OBJECT ${SOURCES})
31+
3132
target_include_directories(${LIB_OBJ}
3233
PRIVATE ${PROJECT_SOURCE_DIR}/include
3334
${PROJECT_SOURCE_DIR}/src
@@ -43,8 +44,7 @@ set_target_properties(${LIB_OBJ} PROPERTIES
4344

4445
target_link_libraries(${LIB_NAME} PUBLIC ${LIB_OBJ})
4546
if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
46-
add_sycl_to_target(TARGET ${LIB_OBJ})
47-
add_sycl_to_target(TARGET ${LIB_NAME})
47+
add_sycl_to_target(TARGET ${LIB_OBJ} SOURCES ${SOURCES})
4848
endif()
4949
# Add major version to the library
5050
set_target_properties(${LIB_NAME} PROPERTIES

‎src/rng/backends/mklcpu/CMakeLists.txt

+6-5
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,16 @@ set(LIB_OBJ ${LIB_NAME}_obj)
2222

2323
find_package(MKL REQUIRED)
2424

25-
add_library(${LIB_NAME})
26-
add_library(${LIB_OBJ} OBJECT
27-
cpu_common.hpp
25+
set(SOURCES cpu_common.hpp
2826
philox4x32x10.cpp
2927
mrg32k3a.cpp
3028
$<$<BOOL:${BUILD_SHARED_LIBS}>: mkl_rng_cpu_wrappers.cpp>
3129
)
3230

31+
add_library(${LIB_NAME})
32+
add_library(${LIB_OBJ} OBJECT ${SOURCES})
33+
34+
3335
target_include_directories(${LIB_OBJ}
3436
PRIVATE ${PROJECT_SOURCE_DIR}/include
3537
${PROJECT_SOURCE_DIR}/src
@@ -39,8 +41,7 @@ target_include_directories(${LIB_OBJ}
3941

4042
target_compile_options(${LIB_OBJ} PRIVATE ${ONEMKL_BUILD_COPT} ${MKL_COPT})
4143
if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
42-
add_sycl_to_target(TARGET ${LIB_OBJ})
43-
add_sycl_to_target(TARGET ${LIB_NAME})
44+
add_sycl_to_target(TARGET ${LIB_OBJ} SOURCES ${SOURCES})
4445
endif()
4546
target_link_libraries(${LIB_OBJ} PUBLIC ONEMKL::SYCL::SYCL ${MKL_LINK_C})
4647

‎tests/unit_tests/CMakeLists.txt

+6-3
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ foreach(domain ${TARGET_DOMAINS})
5959
add_executable(test_main_${domain}_ct main_test.cpp)
6060
target_include_directories(test_main_${domain}_ct PUBLIC ${GTEST_INCLUDE_DIR})
6161
target_compile_options(test_main_${domain}_ct PRIVATE -fsycl)
62+
if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
63+
add_sycl_to_target(TARGET test_main_${domain}_ct SOURCES t main_test.cpp)
64+
endif()
6265

6366
if(BUILD_SHARED_LIBS)
6467
add_executable(test_main_${domain}_rt main_test.cpp)
@@ -73,6 +76,9 @@ foreach(domain ${TARGET_DOMAINS})
7376
onemkl
7477
${${domain}_TEST_LIST_RT}
7578
)
79+
if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
80+
add_sycl_to_target(TARGET test_main_${domain}_rt SOURCES main_test.cpp)
81+
endif()
7682
endif()
7783

7884
if(ENABLE_MKLCPU_BACKEND)
@@ -109,9 +115,6 @@ foreach(domain ${TARGET_DOMAINS})
109115
ONEMKL::SYCL::SYCL
110116
${${domain}_TEST_LIST_CT}
111117
)
112-
if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
113-
add_sycl_to_target(TARGET test_main_${domain}_ct)
114-
endif()
115118
string(TOUPPER ${domain} DOMAIN_PREFIX)
116119

117120
if(BUILD_SHARED_LIBS)

‎tests/unit_tests/blas/batch/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ if(BUILD_SHARED_LIBS)
3333
)
3434
target_link_libraries(blas_batch_rt PUBLIC ONEMKL::SYCL::SYCL)
3535
if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
36-
add_sycl_to_target(TARGET blas_batch_rt)
36+
add_sycl_to_target(TARGET blas_batch_rt SOURCES ${BATCH_SOURCES})
3737
else()
3838
target_link_libraries(blas_batch_rt PUBLIC ONEMKL::SYCL::SYCL)
3939
endif()
@@ -51,7 +51,7 @@ target_include_directories(blas_batch_ct
5151
)
5252
target_link_libraries(blas_batch_ct PUBLIC ONEMKL::SYCL::SYCL)
5353
if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
54-
add_sycl_to_target(TARGET blas_batch_ct)
54+
add_sycl_to_target(TARGET blas_batch_ct SOURCES ${BATCH_SOURCES})
5555
else()
5656
target_link_libraries(blas_batch_ct PUBLIC ONEMKL::SYCL::SYCL)
5757
endif()

‎tests/unit_tests/blas/extensions/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ if(BUILD_SHARED_LIBS)
3333
)
3434
target_link_libraries(blas_extensions_rt PUBLIC ONEMKL::SYCL::SYCL)
3535
if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
36-
add_sycl_to_target(TARGET blas_extensions_rt)
36+
add_sycl_to_target(TARGET blas_extensions_rt SOURCES ${EXTENSIONS_SOURCES})
3737
else()
3838
target_link_libraries(blas_extensions_rt PUBLIC ONEMKL::SYCL::SYCL)
3939
endif()
@@ -51,7 +51,7 @@ target_include_directories(blas_extensions_ct
5151
)
5252
target_link_libraries(blas_extensions_ct PUBLIC ONEMKL::SYCL::SYCL)
5353
if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
54-
add_sycl_to_target(TARGET blas_extensions_ct)
54+
add_sycl_to_target(TARGET blas_extensions_ct SOURCES ${EXTENSIONS_SOURCES})
5555
else()
5656
target_link_libraries(blas_extensions_ct PUBLIC ONEMKL::SYCL::SYCL)
5757
endif()

‎tests/unit_tests/blas/level1/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ if(BUILD_SHARED_LIBS)
3232
PUBLIC ${CBLAS_INCLUDE}
3333
)
3434
if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
35-
add_sycl_to_target(TARGET blas_level1_rt)
35+
add_sycl_to_target(TARGET blas_level1_rt SOURCES ${L1_SOURCES})
3636
else()
3737
target_link_libraries(blas_level1_rt PUBLIC ONEMKL::SYCL::SYCL)
3838
endif()
@@ -50,7 +50,7 @@ target_include_directories(blas_level1_ct
5050
PUBLIC ${CBLAS_INCLUDE}
5151
)
5252
if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
53-
add_sycl_to_target(TARGET blas_level1_ct)
53+
add_sycl_to_target(TARGET blas_level1_ct SOURCES ${L1_SOURCES})
5454
else()
5555
target_link_libraries(blas_level1_ct PUBLIC ONEMKL::SYCL::SYCL)
5656
endif()

‎tests/unit_tests/blas/level2/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ if(BUILD_SHARED_LIBS)
3232
PUBLIC ${CBLAS_INCLUDE}
3333
)
3434
if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
35-
add_sycl_to_target(TARGET blas_level2_rt)
35+
add_sycl_to_target(TARGET blas_level2_rt SOURCES ${L2_SOURCES})
3636
else()
3737
target_link_libraries(blas_level2_rt PUBLIC ONEMKL::SYCL::SYCL)
3838
endif()
@@ -49,7 +49,7 @@ target_include_directories(blas_level2_ct
4949
PUBLIC ${CBLAS_INCLUDE}
5050
)
5151
if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
52-
add_sycl_to_target(TARGET blas_level2_ct)
52+
add_sycl_to_target(TARGET blas_level2_ct SOURCES ${L2_SOURCES})
5353
else()
5454
target_link_libraries(blas_level2_ct PUBLIC ONEMKL::SYCL::SYCL)
5555
endif()

‎tests/unit_tests/blas/level3/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ if(BUILD_SHARED_LIBS)
3232
PUBLIC ${CBLAS_INCLUDE}
3333
)
3434
if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
35-
add_sycl_to_target(TARGET blas_level3_rt)
35+
add_sycl_to_target(TARGET blas_level3_rt SOURCES ${L3_SOURCES})
3636
else()
3737
target_link_libraries(blas_level3_rt PUBLIC ONEMKL::SYCL::SYCL)
3838
endif()
@@ -49,7 +49,7 @@ target_include_directories(blas_level3_ct
4949
PUBLIC ${CBLAS_INCLUDE}
5050
)
5151
if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
52-
add_sycl_to_target(TARGET blas_level3_ct)
52+
add_sycl_to_target(TARGET blas_level3_ct SOURCES ${L3_SOURCES})
5353
else()
5454
target_link_libraries(blas_level3_ct PUBLIC ONEMKL::SYCL::SYCL)
5555
endif()

‎tests/unit_tests/rng/service/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ if(BUILD_SHARED_LIBS)
3131
PUBLIC ${CMAKE_BINARY_DIR}/bin
3232
)
3333
if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
34-
add_sycl_to_target(TARGET rng_service_rt)
34+
add_sycl_to_target(TARGET rng_service_rt SOURCES ${SERVICE_TESTS_SOURCES})
3535
else()
3636
target_link_libraries(rng_service_rt PUBLIC ONEMKL::SYCL::SYCL)
3737
endif()
@@ -48,7 +48,7 @@ target_include_directories(rng_service_ct
4848
)
4949
target_link_libraries(rng_service_ct PUBLIC ONEMKL::SYCL::SYCL)
5050
if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
51-
add_sycl_to_target(TARGET rng_service_ct)
51+
add_sycl_to_target(TARGET rng_service_ct SOURCES ${SERVICE_TESTS_SOURCES})
5252
else()
5353
target_link_libraries(rng_service_ct PUBLIC ONEMKL::SYCL::SYCL)
5454
endif()

‎tests/unit_tests/rng/statistics_check/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ if(BUILD_SHARED_LIBS)
3131
PUBLIC ${CMAKE_BINARY_DIR}/bin
3232
)
3333
if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
34-
add_sycl_to_target(TARGET rng_statistics_rt)
34+
add_sycl_to_target(TARGET rng_statistics_rt SOURCES ${STATS_CHECK_SOURCES})
3535
else()
3636
target_link_libraries(rng_statistics_rt PUBLIC ONEMKL::SYCL::SYCL)
3737
endif()
@@ -47,7 +47,7 @@ target_include_directories(rng_statistics_ct
4747
PUBLIC ${CMAKE_BINARY_DIR}/bin
4848
)
4949
if (USE_ADD_SYCL_TO_TARGET_INTEGRATION)
50-
add_sycl_to_target(TARGET rng_statistics_ct)
50+
add_sycl_to_target(TARGET rng_statistics_ct SOURCES ${STATS_CHECK_SOURCES})
5151
else()
5252
target_link_libraries(rng_statistics_ct PUBLIC ONEMKL::SYCL::SYCL)
5353
endif()

0 commit comments

Comments
 (0)