diff --git a/CMakeLists.txt b/CMakeLists.txt index b37ca5a75..f6524b066 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,6 +70,12 @@ if(NOT EXISTS ${PROTOC_COMMAND}) error() # Place Unknown command to stop cmake process here. endif() +if (NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE "Release" CACHE STRING + "Build type release is default on single-configuration build system like GNU make." + FORCE) +endif() + ############################################################################### # Preprocessing ############################################################################### @@ -178,12 +184,6 @@ if(BUILD_CPP_LIB) ############################################################################### add_subdirectory(third_party) - if (NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "Release" CACHE STRING - "Build type release is default on single-configuration build system like GNU make." - FORCE) - endif() - # Flags if(MSVC) # Force to always compile with W4 @@ -373,7 +373,7 @@ if(BUILD_PYTHON_PACKAGE) COMMAND ${CMAKE_COMMAND} -E env WHEEL_SUFFIX=${WHEEL_SUFFIX} ${PYTHON_COMMAND} ${NNABLA_CONVERTER_SETUP} -q bdist_wheel - COMMAND ${CMAKE_SOURCE_DIR}/build-tools/auditwheel-nnabla ${CMAKE_BINARY_DIR}/dist/*-linux_*.whl + COMMAND ${CMAKE_SOURCE_DIR}/build-tools/auditwheel-nnabla ${CMAKE_BINARY_DIR}/dist/*-linux_*.whl ${CMAKE_BUILD_TYPE} COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_BINARY_DIR}/dist/*-linux*.whl COMMAND ${CMAKE_COMMAND} -E touch ${NBLA_PYTHON_OUTPUT_WHEEL} DEPENDS ${NBLA_WHEEL_DEPENDS}) diff --git a/build-tools/auditwheel-nnabla b/build-tools/auditwheel-nnabla index fe9b665b7..a0888d057 100755 --- a/build-tools/auditwheel-nnabla +++ b/build-tools/auditwheel-nnabla @@ -39,7 +39,19 @@ then cat $WHEEL | sed "s/-linux_/$TAG/g" > $WHEEL.bak && mv $WHEEL.bak $WHEEL done - INCLUDE_CUDA_CUDNN_LIB_IN_WHL=$2 + CMAKE_BUILD_TYPE=$2 + # Strip shared libraries. + if [[ "$CMAKE_BUILD_TYPE" != "Debug" ]]; then + for STRIP_LIB in $(find . -name "*.so*") + do + if [[ "$STRIP_LIB" = *"cpython"* ]] || [[ "$STRIP_LIB" = *"libnnabla"* ]] ; then + echo "Striping $STRIP_LIB" + strip --strip-unneeded $STRIP_LIB + fi + done + fi + + INCLUDE_CUDA_CUDNN_LIB_IN_WHL=$3 if [[ "$INCLUDE_CUDA_CUDNN_LIB_IN_WHL" == "True" ]]; then NNABLA_EXT_SO=$(find . -name *libnnabla_cuda*.so) LIBDIR=$(cd $(dirname $NNABLA_EXT_SO) && pwd) diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index e0018931f..d6f5c98fb 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -34,9 +34,6 @@ endfunction() if(NNABLA_UTILS_WITH_HDF5) download_and_extract_library(hdf5-master .zip https://github.com/HDFGroup/hdf5/archive/refs/tags/hdf5-1_12_2.zip DIRECTORY) - if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE Release) - endif() set(HDF5_EXTERNALLY_CONFIGURED, 1) set(HDF5_EXPORTED_TARGETS "nbla_utils-hdf5-targets") set(BUILD_SHARED_LIBS ON CACHE BOOL "Build Shared Libraries" FORCE)