From 822afe954e330385ba6034b18826a620df1d451d Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Tue, 27 Sep 2022 11:31:52 -0400 Subject: [PATCH 1/2] Tell jitify_preprocess where to search for libnvrtc On machines with multiple CUDA Toolkits installed it is possible to have a mismatch between the version of `nvcc` used to compile code and the version of `libnvrtc` used for the JIT code. This generally occurs when `LD_LIBRARY_PATH` points to a different version of the CUDA Toolkit. We now explicitly specify what toolkit library directory to search when JIT code during libcudf compilation. --- cpp/cmake/Modules/JitifyPreprocessKernels.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/cmake/Modules/JitifyPreprocessKernels.cmake b/cpp/cmake/Modules/JitifyPreprocessKernels.cmake index 8ce98c6d582..39f5384e04d 100644 --- a/cpp/cmake/Modules/JitifyPreprocessKernels.cmake +++ b/cpp/cmake/Modules/JitifyPreprocessKernels.cmake @@ -39,7 +39,7 @@ function(jit_preprocess_files) VERBATIM COMMAND ${CMAKE_COMMAND} -E make_directory "${jit_output_directory}" COMMAND - jitify_preprocess ${ARG_FILE} -o + "${CMAKE_COMMAND}" -E env LD_LIBRARY_PATH="${CUDAToolkit_LIBRARY_DIR}" $ ${ARG_FILE} -o ${CUDF_GENERATED_INCLUDE_DIR}/include/jit_preprocessed_files -i -m -std=c++17 -remove-unused-globals -D_FILE_OFFSET_BITS=64 -D__CUDACC_RTC__ -I${CUDF_SOURCE_DIR}/include -I${CUDF_SOURCE_DIR}/src ${libcudacxx_includes} -I${CUDAToolkit_INCLUDE_DIRS} From 24932d731af6de138794ab1e8c0f8638ececf481 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Tue, 27 Sep 2022 12:35:59 -0400 Subject: [PATCH 2/2] Correct style issues found by CI --- cpp/cmake/Modules/JitifyPreprocessKernels.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cpp/cmake/Modules/JitifyPreprocessKernels.cmake b/cpp/cmake/Modules/JitifyPreprocessKernels.cmake index 39f5384e04d..0d52a064761 100644 --- a/cpp/cmake/Modules/JitifyPreprocessKernels.cmake +++ b/cpp/cmake/Modules/JitifyPreprocessKernels.cmake @@ -39,7 +39,8 @@ function(jit_preprocess_files) VERBATIM COMMAND ${CMAKE_COMMAND} -E make_directory "${jit_output_directory}" COMMAND - "${CMAKE_COMMAND}" -E env LD_LIBRARY_PATH="${CUDAToolkit_LIBRARY_DIR}" $ ${ARG_FILE} -o + "${CMAKE_COMMAND}" -E env LD_LIBRARY_PATH="${CUDAToolkit_LIBRARY_DIR}" + $ ${ARG_FILE} -o ${CUDF_GENERATED_INCLUDE_DIR}/include/jit_preprocessed_files -i -m -std=c++17 -remove-unused-globals -D_FILE_OFFSET_BITS=64 -D__CUDACC_RTC__ -I${CUDF_SOURCE_DIR}/include -I${CUDF_SOURCE_DIR}/src ${libcudacxx_includes} -I${CUDAToolkit_INCLUDE_DIRS}