From 7d6f628b88ca0bc66ed77b833be5a52febe9dddf Mon Sep 17 00:00:00 2001 From: raver119 Date: Tue, 12 May 2020 07:48:29 +0300 Subject: [PATCH] stop using static library for tests (#450) Signed-off-by: raver119 --- libnd4j/blas/CMakeLists.txt | 50 ++++++++++++------- libnd4j/tests_cpu/layers_tests/CMakeLists.txt | 4 +- 2 files changed, 33 insertions(+), 21 deletions(-) diff --git a/libnd4j/blas/CMakeLists.txt b/libnd4j/blas/CMakeLists.txt index a12b70194..8c8d5fb22 100755 --- a/libnd4j/blas/CMakeLists.txt +++ b/libnd4j/blas/CMakeLists.txt @@ -231,30 +231,34 @@ if(SD_CUDA) file(GLOB_RECURSE CUSTOMOPS_CUDNN_SOURCES false ../include/ops/declarable/platform/cudnn/*.cu) endif() - add_library(nd4jobj OBJECT ${LOOPS_SOURCES_CUDA} ${LEGACY_SOURCES} + add_library(samediff_obj OBJECT ${LOOPS_SOURCES_CUDA} ${LEGACY_SOURCES} ${CUSTOMOPS_HELPERS_SOURCES} ${HELPERS_SOURCES} ${EXEC_SOURCES} ${LOOPS_SOURCES} ${ARRAY_SOURCES} ${TYPES_SOURCES} ${MEMORY_SOURCES} ${GRAPH_SOURCES} ${CUSTOMOPS_SOURCES} ${INDEXING_SOURCES} ${EXCEPTIONS_SOURCES} ${OPS_SOURCES} ${PERF_SOURCES} ${CUSTOMOPS_CUDNN_SOURCES} ${CUSTOMOPS_MKLDNN_SOURCES}) - # Don't output dynamic linked lib when a static lib build is specified unless the tests are built - if(NOT SD_STATIC_LIB OR SD_BUILD_TESTS) - add_library(${SD_LIBRARY_NAME} SHARED $) - endif() - - if (WIN32) message("MSVC runtime for library: ${MSVC_RT_LIB}") endif() - # static library is built only if we're going to build tests, skip otherwise - if (SD_BUILD_TESTS OR SD_STATIC_LIB) - add_library(${SD_LIBRARY_NAME}static STATIC $) + # build shared library by default or when it's explicitly requested + if(NOT SD_STATIC_LIB OR SD_SHARED_LIB) + add_library(${SD_LIBRARY_NAME} SHARED $) + endif() + + if (SD_STATIC_LIB AND SD_SHARED_LIB) + # if both static and shared library are going to be built - static library will have special suffix + add_library(${SD_LIBRARY_NAME}static STATIC $) set_property(TARGET ${SD_LIBRARY_NAME}static PROPERTY MSVC_RUNTIME_LIBRARY "${MSVC_RT_LIB}$<$:Debug>") install(TARGETS ${SD_LIBRARY_NAME}static DESTINATION .) + elseif(SD_STATIC_LIB) + # if we only build static library - use this name + add_library(${SD_LIBRARY_NAME} STATIC $) + set_property(TARGET ${SD_LIBRARY_NAME} PROPERTY MSVC_RUNTIME_LIBRARY "${MSVC_RT_LIB}$<$:Debug>") + install(TARGETS ${SD_LIBRARY_NAME} DESTINATION .) endif() # on windows we want to make sure we use MT or MD, but since we use it in one lib, we must use it everywhere to avoid conflicts - set_property(TARGET nd4jobj PROPERTY MSVC_RUNTIME_LIBRARY "${MSVC_RT_LIB}$<$:Debug>") + set_property(TARGET samediff_obj PROPERTY MSVC_RUNTIME_LIBRARY "${MSVC_RT_LIB}$<$:Debug>") set_property(TARGET ${SD_LIBRARY_NAME} PROPERTY MSVC_RUNTIME_LIBRARY "${MSVC_RT_LIB}$<$:Debug>") if(WIN32) @@ -324,20 +328,28 @@ elseif(SD_CPU) message("CPU BLAS") add_definitions(-D__CPUBLAS__=true) - add_library(nd4jobj OBJECT ${LEGACY_SOURCES} + add_library(samediff_obj OBJECT ${LEGACY_SOURCES} ${LOOPS_SOURCES} ${HELPERS_SOURCES} ${EXEC_SOURCES} ${ARRAY_SOURCES} ${TYPES_SOURCES} ${MEMORY_SOURCES} ${GRAPH_SOURCES} ${CUSTOMOPS_SOURCES} ${EXCEPTIONS_SOURCES} ${INDEXING_SOURCES} ${CUSTOMOPS_MKLDNN_SOURCES} ${CUSTOMOPS_GENERIC_SOURCES} ${OPS_SOURCES} ${PERF_SOURCES}) if(IOS) - add_library(${SD_LIBRARY_NAME} STATIC $) + add_library(${SD_LIBRARY_NAME} STATIC $) else() - # static library is built only if we're going to build tests, skip otherwise - if (SD_BUILD_TESTS OR SD_STATIC_LIB) - add_library(${SD_LIBRARY_NAME}static STATIC $) + # build shared library by default or when it's explicitly requested + if(NOT SD_STATIC_LIB OR SD_SHARED_LIB) + add_library(${SD_LIBRARY_NAME} SHARED $) endif() - if(SD_BUILD_TESTS OR NOT SD_STATIC_LIB) - add_library(${SD_LIBRARY_NAME} SHARED $) + if (SD_STATIC_LIB AND SD_SHARED_LIB) + # if both static and shared library are going to be built - static library will have special suffix + add_library(${SD_LIBRARY_NAME}static STATIC $) + set_property(TARGET ${SD_LIBRARY_NAME}static PROPERTY MSVC_RUNTIME_LIBRARY "${MSVC_RT_LIB}$<$:Debug>") + install(TARGETS ${SD_LIBRARY_NAME}static DESTINATION .) + elseif(SD_STATIC_LIB) + # if we only build static library - use this name + add_library(${SD_LIBRARY_NAME} STATIC $) + set_property(TARGET ${SD_LIBRARY_NAME} PROPERTY MSVC_RUNTIME_LIBRARY "${MSVC_RT_LIB}$<$:Debug>") + install(TARGETS ${SD_LIBRARY_NAME} DESTINATION .) endif() endif() @@ -350,7 +362,7 @@ elseif(SD_CPU) if ("${SD_ALL_OPS}" AND "${SD_BUILD_MINIFIER}") message(STATUS "Building minifier...") add_executable(minifier ../minifier/minifier.cpp ../minifier/graphopt.cpp) - target_link_libraries(minifier ${SD_LIBRARY_NAME}static ${MKLDNN_LIBRARIES} ${OPENBLAS_LIBRARIES} ${MKLDNN} ${BLAS_LIBRARIES} ${CPU_FEATURES}) + target_link_libraries(minifier samediff_obj ${MKLDNN_LIBRARIES} ${OPENBLAS_LIBRARIES} ${MKLDNN} ${BLAS_LIBRARIES} ${CPU_FEATURES}) endif() if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 4.9) diff --git a/libnd4j/tests_cpu/layers_tests/CMakeLists.txt b/libnd4j/tests_cpu/layers_tests/CMakeLists.txt index 870178152..5ae202542 100644 --- a/libnd4j/tests_cpu/layers_tests/CMakeLists.txt +++ b/libnd4j/tests_cpu/layers_tests/CMakeLists.txt @@ -130,7 +130,7 @@ if (SD_CPU) endif() add_executable(runtests ${TEST_SOURCES}) - target_link_libraries(runtests ${SD_LIBRARY_NAME}static ${MKLDNN_LIBRARIES} ${OPENBLAS_LIBRARIES} ${MKLDNN} ${BLAS_LIBRARIES} ${CPU_FEATURES} gtest gtest_main) + target_link_libraries(runtests samediff_obj ${MKLDNN_LIBRARIES} ${OPENBLAS_LIBRARIES} ${MKLDNN} ${BLAS_LIBRARIES} ${CPU_FEATURES} gtest gtest_main) elseif(SD_CUDA) add_executable(runtests ${TEST_SOURCES}) @@ -148,5 +148,5 @@ elseif(SD_CUDA) message("CUDNN library: ${CUDNN}") endif() - target_link_libraries(runtests ${SD_LIBRARY_NAME}static ${CUDA_LIBRARIES} ${CUDA_CUBLAS_LIBRARIES} ${CUDA_cusolver_LIBRARY} ${CUDNN} ${MKLDNN} gtest gtest_main) + target_link_libraries(runtests samediff_obj ${CUDA_LIBRARIES} ${CUDA_CUBLAS_LIBRARIES} ${CUDA_cusolver_LIBRARY} ${CUDNN} ${MKLDNN} gtest gtest_main) endif() \ No newline at end of file