Merge branch 'branch-0.14' into fea-enable-logging

Author: harrism

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## New Features
 
 - PR #341 Enable logging
+- PR #343 Add in option to statically link against cudart
 
 ## Improvements
 

CMakeLists.txt

@@ -57,6 +57,18 @@ endif(CMAKE_COMPILER_IS_GNUCXX)
 option(BUILD_TESTS "Configure CMake to build tests" ON)
 option(BUILD_BENCHMARKS "Configure CMake to build (google) benchmarks" OFF)
 
+###################################################################################################
+# - cudart options --------------------------------------------------------------------------------
+# cudart can be statically linked or dynamically linked the python ecosystem wants dynamic linking
+
+option(CUDA_STATIC_RUNTIME "Statically link the CUDA runtime" OFF)
+
+if(CUDA_STATIC_RUNTIME)
+    message(STATUS "Enabling static linking of cudart")
+    set(CUDART_LIBRARY "cudart_static")
+else()
+    set(CUDART_LIBRARY "cudart")
+endif(CUDA_STATIC_RUNTIME)
 
 ###################################################################################################
 # - cnmem ---------------------------------------------------------------------------------
@@ -152,7 +164,7 @@ endif(USE_NVTX)
 ###################################################################################################
 # - link libraries --------------------------------------------------------------------------------
 
-target_link_libraries(rmm cudart cuda)
+target_link_libraries(rmm ${CUDART_LIBRARY} cuda)
 
 ###################################################################################################
 # - install targets -------------------------------------------------------------------------------

build.sh

@@ -18,14 +18,15 @@ ARGS=$*
 # script, and that this script resides in the repo dir!
 REPODIR=$(cd $(dirname $0); pwd)
 
-VALIDARGS="clean librmm rmm -v -g -n -h"
-HELP="$0 [clean] [librmm] [rmm] [-v] [-g] [-n] [-h]
+VALIDARGS="clean librmm rmm -v -g -n -s -h"
+HELP="$0 [clean] [librmm] [rmm] [-v] [-g] [-n] [-s] [-h]
    clean  - remove all existing build artifacts and configuration (start over)
    librmm - build and install the librmm C++ code
    rmm    - build and install the rmm Python package
    -v     - verbose build mode
    -g     - build for debug
    -n     - no install step
+   -s     - statically link against cudart
    -h     - print this text
 
    default action (no args) is to build and install 'librmm' and 'rmm' targets
@@ -39,6 +40,7 @@ VERBOSE=""
 BUILD_TYPE=Release
 INSTALL_TARGET=install
 PYTHON=${PYTHON:=python}
+CUDA_STATIC_RUNTIME=OFF
 RAN_CMAKE=0
 
 # Set defaults for vars that may not have been defined externally
@@ -59,6 +61,7 @@ function ensureCMakeRan {
     if (( RAN_CMAKE == 0 )); then
         echo "Executing cmake for librmm..."
         cmake -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \
+              -DCUDA_STATIC_RUNTIME="${CUDA_STATIC_RUNTIME}" \
               -DCMAKE_CXX11_ABI=ON \
               -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ..
         RAN_CMAKE=1
@@ -91,6 +94,9 @@ fi
 if hasArg -n; then
     INSTALL_TARGET=""
 fi
+if hasArg -s; then
+    CUDA_STATIC_RUNTIME=ON
+fi
 
 # If clean given, run it prior to any other steps
 if hasArg clean; then

tests/CMakeLists.txt

@@ -29,7 +29,7 @@ set(CMAKE_CUDA_STANDARD_REQUIRED ON)
 function(ConfigureTest CMAKE_TEST_NAME CMAKE_TEST_SRC)
     add_executable(${CMAKE_TEST_NAME} ${CMAKE_TEST_SRC})
     set_target_properties(${CMAKE_TEST_NAME} PROPERTIES POSITION_INDEPENDENT_CODE ON)
-    target_link_libraries(${CMAKE_TEST_NAME} gmock gtest gmock_main gtest_main pthread rmm)
+    target_link_libraries(${CMAKE_TEST_NAME} gmock gtest gmock_main gtest_main pthread cudart rmm)
     set_target_properties(${CMAKE_TEST_NAME} PROPERTIES
                             RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/gtests")
     add_test(NAME ${CMAKE_TEST_NAME} COMMAND ${CMAKE_TEST_NAME})
@@ -128,6 +128,6 @@ set(RANDOM_ALLOCATE_SRC
 
 add_executable(random_allocate ${RANDOM_ALLOCATE_SRC})
 set_target_properties(random_allocate PROPERTIES POSITION_INDEPENDENT_CODE ON)
-target_link_libraries(random_allocate rmm)
+target_link_libraries(random_allocate cudart rmm)
 set_target_properties(random_allocate PROPERTIES
                       RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bench")