From a6e2a258711b8726f1d678b84d66f72001cf858d Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Tue, 6 Apr 2021 11:02:03 -0400 Subject: [PATCH 1/4] jit_preprocess_files properly specifies the correct output paths --- 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 7bb5b1d0a14..d643922f459 100644 --- a/cpp/cmake/Modules/JitifyPreprocessKernels.cmake +++ b/cpp/cmake/Modules/JitifyPreprocessKernels.cmake @@ -33,7 +33,7 @@ function(jit_preprocess_files) ) foreach(ARG_FILE ${ARG_FILES}) - set(ARG_OUTPUT ${CUDF_GENERATED_INCLUDE_DIR}/include/jit_preprocessed_files/${ARG_FILE}.jit) + set(ARG_OUTPUT ${CUDF_GENERATED_INCLUDE_DIR}/include/jit_preprocessed_files/${ARG_FILE}.jit.hpp) list(APPEND JIT_PREPROCESSED_FILES "${ARG_OUTPUT}") add_custom_command(WORKING_DIRECTORY ${ARG_SOURCE_DIRECTORY} DEPENDS jitify_preprocess From 84da36fd9f46ad37a6204697ee313f1773b159d1 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Tue, 6 Apr 2021 11:46:10 -0400 Subject: [PATCH 2/4] jitify now properly tracks input files --- 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 d643922f459..5a62fec6180 100644 --- a/cpp/cmake/Modules/JitifyPreprocessKernels.cmake +++ b/cpp/cmake/Modules/JitifyPreprocessKernels.cmake @@ -36,7 +36,7 @@ function(jit_preprocess_files) set(ARG_OUTPUT ${CUDF_GENERATED_INCLUDE_DIR}/include/jit_preprocessed_files/${ARG_FILE}.jit.hpp) list(APPEND JIT_PREPROCESSED_FILES "${ARG_OUTPUT}") add_custom_command(WORKING_DIRECTORY ${ARG_SOURCE_DIRECTORY} - DEPENDS jitify_preprocess + DEPENDS jitify_preprocess "${ARG_SOURCE_DIRECTORY}/${ARG_FILE}" OUTPUT ${ARG_OUTPUT} VERBATIM COMMAND jitify_preprocess ${ARG_FILE} From 1b0711ebc0b93cbe822d51a1f9b6c29bd3944b2a Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Tue, 6 Apr 2021 11:51:00 -0400 Subject: [PATCH 3/4] jit_preprocess_files make sure output directory always exists --- cpp/cmake/Modules/JitifyPreprocessKernels.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/cmake/Modules/JitifyPreprocessKernels.cmake b/cpp/cmake/Modules/JitifyPreprocessKernels.cmake index 5a62fec6180..15cdabf8309 100644 --- a/cpp/cmake/Modules/JitifyPreprocessKernels.cmake +++ b/cpp/cmake/Modules/JitifyPreprocessKernels.cmake @@ -16,8 +16,6 @@ cmake_minimum_required(VERSION 3.18) -file(MAKE_DIRECTORY "${CUDF_GENERATED_INCLUDE_DIR}/include/jit_preprocessed_files") - # Create `jitify_preprocess` executable project(jitify_preprocess VERSION 2.0 LANGUAGES CXX CUDA) add_executable(jitify_preprocess "${JITIFY_INCLUDE_DIR}/jitify2_preprocess.cpp") @@ -34,11 +32,13 @@ function(jit_preprocess_files) foreach(ARG_FILE ${ARG_FILES}) set(ARG_OUTPUT ${CUDF_GENERATED_INCLUDE_DIR}/include/jit_preprocessed_files/${ARG_FILE}.jit.hpp) + get_filename_component(jit_output_directory "${ARG_OUTPUT}" DIRECTORY ) list(APPEND JIT_PREPROCESSED_FILES "${ARG_OUTPUT}") add_custom_command(WORKING_DIRECTORY ${ARG_SOURCE_DIRECTORY} DEPENDS jitify_preprocess "${ARG_SOURCE_DIRECTORY}/${ARG_FILE}" OUTPUT ${ARG_OUTPUT} VERBATIM + COMMAND ${CMAKE_COMMAND} -E make_directory "${jit_output_directory}" COMMAND jitify_preprocess ${ARG_FILE} -o ${CUDF_GENERATED_INCLUDE_DIR}/include/jit_preprocessed_files -v From 1d416dfb66015639fe06e63fe816f53df0958439 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Tue, 6 Apr 2021 12:09:09 -0400 Subject: [PATCH 4/4] Cleanup JitifyPreprocessKernels.cmake as requested in code review --- cpp/cmake/Modules/JitifyPreprocessKernels.cmake | 3 --- 1 file changed, 3 deletions(-) diff --git a/cpp/cmake/Modules/JitifyPreprocessKernels.cmake b/cpp/cmake/Modules/JitifyPreprocessKernels.cmake index 15cdabf8309..a4e827dc26f 100644 --- a/cpp/cmake/Modules/JitifyPreprocessKernels.cmake +++ b/cpp/cmake/Modules/JitifyPreprocessKernels.cmake @@ -14,10 +14,7 @@ # limitations under the License. #============================================================================= -cmake_minimum_required(VERSION 3.18) - # Create `jitify_preprocess` executable -project(jitify_preprocess VERSION 2.0 LANGUAGES CXX CUDA) add_executable(jitify_preprocess "${JITIFY_INCLUDE_DIR}/jitify2_preprocess.cpp") target_link_libraries(jitify_preprocess CUDA::cudart ${CMAKE_DL_LIBS})