File tree Expand file tree Collapse file tree 3 files changed +11
-3
lines changed Expand file tree Collapse file tree 3 files changed +11
-3
lines changed Original file line number Diff line number Diff line change @@ -26,6 +26,9 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
26
26
set_property (CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "RelWithDebInfo" "MinSizeRel" )
27
27
endif ()
28
28
29
+ # Mark compile time (not runtime), affects how some kernel files include
30
+ add_compile_definitions (DEME_BEING_CMAKE_COMPILED )
31
+
29
32
# ---------------------------------------------------------------------------- #
30
33
# Additional Packages
31
34
# ---------------------------------------------------------------------------- #
Original file line number Diff line number Diff line change @@ -7,8 +7,6 @@ message(STATUS "==== Configuring GPU Algorithm Components ====")
7
7
8
8
set (algorithms_message "[algorithms]" )
9
9
10
-
11
-
12
10
add_library (algorithms OBJECT )
13
11
14
12
target_include_directories (
Original file line number Diff line number Diff line change 4
4
#define DEME_HELPER_KERNELS_CU
5
5
6
6
#include < DEM/Defines.h>
7
- #include < kernel/CUDAMathHelpers.cuh>
7
+
8
+ // CUDAMathHelpers.cuh is used in static compilation, and that needs to be found through src then kernel. But at
9
+ // runtime, we ask jitify to find include files only at same level of all other fellow kernel files.
10
+ #ifdef DEME_BEING_CMAKE_COMPILED
11
+ #include < kernel/CUDAMathHelpers.cuh>
12
+ #else
13
+ #include < CUDAMathHelpers.cuh>
14
+ #endif
8
15
9
16
// inline __device__ voxelID_t position2VoxelID
10
17
You can’t perform that action at this time.
0 commit comments