.

rapidsai · Mar 23, 2021 · 820e9e0 · 820e9e0
1 parent cc104ef
commit 820e9e0
Show file tree

Hide file tree

Showing 6 changed files with 212 additions and 139 deletions.
diff --git a/cpp/cmake/Modules/StringifyJITHeaders.cmake b/cpp/cmake/Modules/StringifyJITHeaders.cmake
diff --git a/cpp/cmake/thirdparty/CUDF_GetJitify.cmake b/cpp/cmake/thirdparty/CUDF_GetJitify.cmake
@@ -26,4 +26,14 @@ function(find_and_configure_jitify)
     set(JITIFY_INCLUDE_DIR "${jitify_SOURCE_DIR}" PARENT_SCOPE)
 endfunction()
 
-find_and_configure_jitify()
+function(find_and_configure_jitify_v2)
+    CPMFindPackage(NAME     jitify
+            VERSION         2.0.0
+            GIT_REPOSITORY  https://github.com/nvidia/jitify.git
+            GIT_TAG         jitify2
+            GIT_SHALLOW     TRUE
+            DOWNLOAD_ONLY   TRUE)
+    set(JITIFY_INCLUDE_DIR "${jitify_SOURCE_DIR}" PARENT_SCOPE)
+endfunction()
+
+find_and_configure_jitify_v2()
diff --git a/cpp/src/binaryop/binaryop.cpp b/cpp/src/binaryop/binaryop.cpp
@@ -24,13 +24,13 @@
 #include <jit/launcher.h>
 #include <jit/parser.h>
 #include <jit/type.h>
-
-#include <jit/bit.hpp.jit>
 #include <jit/common_headers.hpp>
-#include <jit/durations.hpp.jit>
-#include <jit/fixed_point.hpp.jit>
-#include <jit/timestamps.hpp.jit>
-#include <jit/types.hpp.jit>
+
+#include <jit_pre/cudf/fixed_point/fixed_point.hpp.jit>
+#include <jit_pre/cudf/types.hpp.jit>
+#include <jit_pre/cudf/utilities/bit.hpp.jit>
+#include <jit_pre/cudf/wrappers/durations.hpp.jit>
+#include <jit_pre/cudf/wrappers/timestamps.hpp.jit>
 
 #include <cudf/binaryop.hpp>
 #include <cudf/column/column_factories.hpp>

diff --git a/cpp/src/jit/common_headers.hpp b/cpp/src/jit/common_headers.hpp
@@ -17,31 +17,31 @@
  * limitations under the License.
  */
 
-#include <jit/libcudacxx/cuda/std/chrono.jit>
-#include <jit/libcudacxx/cuda/std/climits.jit>
-#include <jit/libcudacxx/cuda/std/cstddef.jit>
-#include <jit/libcudacxx/cuda/std/cstdint.jit>
-#include <jit/libcudacxx/cuda/std/ctime.jit>
-#include <jit/libcudacxx/cuda/std/detail/__config.jit>
-#include <jit/libcudacxx/cuda/std/detail/__pragma_pop.jit>
-#include <jit/libcudacxx/cuda/std/detail/__pragma_push.jit>
-#include <jit/libcudacxx/cuda/std/detail/libcxx/include/__config.jit>
-#include <jit/libcudacxx/cuda/std/detail/libcxx/include/__pragma_pop.jit>
-#include <jit/libcudacxx/cuda/std/detail/libcxx/include/__pragma_push.jit>
-#include <jit/libcudacxx/cuda/std/detail/libcxx/include/__undef_macros.jit>
-#include <jit/libcudacxx/cuda/std/detail/libcxx/include/chrono.jit>
-#include <jit/libcudacxx/cuda/std/detail/libcxx/include/climits.jit>
-#include <jit/libcudacxx/cuda/std/detail/libcxx/include/cstddef.jit>
-#include <jit/libcudacxx/cuda/std/detail/libcxx/include/cstdint.jit>
-#include <jit/libcudacxx/cuda/std/detail/libcxx/include/ctime.jit>
-#include <jit/libcudacxx/cuda/std/detail/libcxx/include/limits.jit>
-#include <jit/libcudacxx/cuda/std/detail/libcxx/include/ratio.jit>
-#include <jit/libcudacxx/cuda/std/detail/libcxx/include/type_traits.jit>
-#include <jit/libcudacxx/cuda/std/detail/libcxx/include/version.jit>
-#include <jit/libcudacxx/cuda/std/limits.jit>
-#include <jit/libcudacxx/cuda/std/ratio.jit>
-#include <jit/libcudacxx/cuda/std/type_traits.jit>
-#include <jit/libcudacxx/cuda/std/version.jit>
+#include <jit_pre/cuda/std/chrono.jit>
+#include <jit_pre/cuda/std/climits.jit>
+#include <jit_pre/cuda/std/cstddef.jit>
+#include <jit_pre/cuda/std/cstdint.jit>
+#include <jit_pre/cuda/std/ctime.jit>
+#include <jit_pre/cuda/std/detail/__config.jit>
+#include <jit_pre/cuda/std/detail/__pragma_pop.jit>
+#include <jit_pre/cuda/std/detail/__pragma_push.jit>
+#include <jit_pre/cuda/std/detail/libcxx/include/__config.jit>
+#include <jit_pre/cuda/std/detail/libcxx/include/__pragma_pop.jit>
+#include <jit_pre/cuda/std/detail/libcxx/include/__pragma_push.jit>
+#include <jit_pre/cuda/std/detail/libcxx/include/__undef_macros.jit>
+#include <jit_pre/cuda/std/detail/libcxx/include/chrono.jit>
+#include <jit_pre/cuda/std/detail/libcxx/include/climits.jit>
+#include <jit_pre/cuda/std/detail/libcxx/include/cstddef.jit>
+#include <jit_pre/cuda/std/detail/libcxx/include/cstdint.jit>
+#include <jit_pre/cuda/std/detail/libcxx/include/ctime.jit>
+#include <jit_pre/cuda/std/detail/libcxx/include/limits.jit>
+#include <jit_pre/cuda/std/detail/libcxx/include/ratio.jit>
+#include <jit_pre/cuda/std/detail/libcxx/include/type_traits.jit>
+#include <jit_pre/cuda/std/detail/libcxx/include/version.jit>
+#include <jit_pre/cuda/std/limits.jit>
+#include <jit_pre/cuda/std/ratio.jit>
+#include <jit_pre/cuda/std/type_traits.jit>
+#include <jit_pre/cuda/std/version.jit>
 
 #include <cstring>
 #include <iostream>

diff --git a/cpp/src/rolling/rolling_detail.cuh b/cpp/src/rolling/rolling_detail.cuh
@@ -47,9 +47,10 @@
 #include <jit/launcher.h>
 #include <jit/parser.h>
 #include <jit/type.h>
-#include <jit/bit.hpp.jit>
-#include <jit/rolling_jit_detail.hpp.jit>
-#include <jit/types.hpp.jit>
+
+#include <jit_pre/cudf/rolling_jit_detail.hpp.jit>
+#include <jit_pre/cudf/types.hpp.jit>
+#include <jit_pre/cudf/utilities/bit.hpp.jit>
 
 #include <rmm/thrust_rmm_allocator.h>
 #include <rmm/cuda_stream_view.hpp>

diff --git a/cpp/src/transform/transform.cpp b/cpp/src/transform/transform.cpp
@@ -29,8 +29,8 @@
 #include <cudf/utilities/traits.hpp>
 #include <cudf/utilities/type_dispatcher.hpp>
 
-#include <jit/timestamps.hpp.jit>
-#include <jit/types.hpp.jit>
+#include <jit_pre/cudf/types.hpp.jit>
+#include <jit_pre/cudf/wrappers/timestamps.hpp.jit>
 
 #include <rmm/cuda_stream_view.hpp>