Merge remote-tracking branch 'upstream/branch-0.11' into new-hash-dis…

…patch
rapidsai · Oct 24, 2019 · ffe85e0 · ffe85e0
2 parents 21e7dc4 + 3253ec2
commit ffe85e0
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 212 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -56,6 +56,7 @@
 - PR #3193 Add cuPy as a formal dependency
 - PR #3195 Support for zero columned `table_view`
 - PR #3165 Java device memory size for string category
+- PR #3205 Move transform files to legacy
 - PR #3202 Rename and move error.hpp to public headers
 
 ## Bug Fixes

diff --git a/conda/recipes/libcudf/meta.yaml b/conda/recipes/libcudf/meta.yaml
@@ -77,7 +77,7 @@ test:
     - test -f $PREFIX/include/cudf/rolling.hpp
     - test -f $PREFIX/include/cudf/legacy/search.hpp
     - test -f $PREFIX/include/cudf/stream_compaction.hpp
-    - test -f $PREFIX/include/cudf/transform.hpp
+    - test -f $PREFIX/include/cudf/legacy/transform.hpp
     - test -f $PREFIX/include/cudf/types.h
     - test -f $PREFIX/include/cudf/types.hpp
     - test -f $PREFIX/include/cudf/legacy/unary.hpp

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -388,9 +388,9 @@ add_library(cudf
             src/jit/parser.cpp
             src/jit/cache.cpp
             src/jit/launcher.cpp
-            src/transform/transform.cpp
+            src/transform/legacy/transform.cpp
             src/transform/jit/code/kernel.cpp
-            src/transform/nans_to_nulls.cu
+            src/transform/legacy/nans_to_nulls.cu
             src/bitmask/legacy/bitmask_ops.cu
             src/stream_compaction/apply_boolean_mask.cu
             src/stream_compaction/drop_nulls.cu

diff --git a/cpp/include/cudf/transform.hpp → cpp/include/cudf/legacy/transform.hpp b/cpp/include/cudf/transform.hpp → cpp/include/cudf/legacy/transform.hpp
@@ -17,8 +17,8 @@
 #ifndef CUDF_TRANSFORM_HPP
 #define CUDF_TRANSFORM_HPP
 
-#include "cudf.h"
-#include "types.h"
+#include "cudf/cudf.h"
+#include "cudf/types.h"
 
 namespace cudf {
 

diff --git a/cpp/src/bitmask/legacy/valid_if.cuh b/cpp/src/bitmask/legacy/valid_if.cuh
@@ -18,7 +18,7 @@
 #define __BITMASK_VALID_IF_CUH__
 
 #include <cudf/types.h>
-#include <utilities/error_utils.hpp>
+#include <cudf/utilities/error.hpp>
 #include <utilities/bit_util.cuh>
 #include <utilities/cuda_utils.hpp>
 #include <bitmask/legacy/bit_mask.cuh>
@@ -42,9 +42,9 @@ constexpr int block_size = 256;
  * @return[out] result of each block is returned in thread 0.
  */
 template <class bit_container, int lane = 0>
-__device__ __inline__ gdf_size_type single_lane_popc_block_reduce(bit_container bit_mask) {
+__device__ __inline__ cudf::size_type single_lane_popc_block_reduce(bit_container bit_mask) {
 
-  static __shared__ gdf_size_type warp_count[warp_size];
+  static __shared__ cudf::size_type warp_count[warp_size];
 
   int lane_id = (threadIdx.x % warp_size);
   int warp_id = (threadIdx.x / warp_size);
@@ -56,7 +56,7 @@ __device__ __inline__ gdf_size_type single_lane_popc_block_reduce(bit_container
   }
   __syncthreads();
 
-  gdf_size_type block_count = 0;
+  cudf::size_type block_count = 0;
 
   if (warp_id == 0) {
 
@@ -65,12 +65,12 @@ __device__ __inline__ gdf_size_type single_lane_popc_block_reduce(bit_container
 
     // Maximum block size is 1024 and 1024 / 32 = 32
     // so one single warp is enough to do the reduction over different warps
-    gdf_size_type count = 
+    cudf::size_type count = 
       (lane_id < (blockDim.x / warp_size)) ? warp_count[lane_id] : 0;
 
     __shared__
-        typename cub::WarpReduce<gdf_size_type>::TempStorage temp_storage;
-    block_count = cub::WarpReduce<gdf_size_type>(temp_storage).Sum(count);
+        typename cub::WarpReduce<cudf::size_type>::TempStorage temp_storage;
+    block_count = cub::WarpReduce<cudf::size_type>(temp_storage).Sum(count);
 
   }
 

diff --git a/cpp/src/bitmask/valid_if.cuh b/cpp/src/bitmask/valid_if.cuh
diff --git a/cpp/src/stream_compaction/drop_duplicates.cu b/cpp/src/stream_compaction/drop_duplicates.cu
@@ -27,7 +27,7 @@
 #include <cudf/legacy/table.hpp>
 #include <table/legacy/device_table.cuh>
 #include <table/legacy/device_table_row_operators.cuh>
-#include <cudf/transform.hpp>
+#include <cudf/legacy/transform.hpp>
 
 #include <rmm/thrust_rmm_allocator.h>
 #include <cudf/utilities/legacy/nvcategory_util.hpp>

diff --git a/cpp/src/strings/copying/copying.cu b/cpp/src/strings/copying/copying.cu
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <bitmask/valid_if.cuh>
+#include <bitmask/legacy/valid_if.cuh>
 #include <cudf/column/column_factories.hpp>
 #include <cudf/column/column_device_view.cuh>
 #include <cudf/strings/copying.hpp>

diff --git a/cpp/src/strings/utilities.cuh b/cpp/src/strings/utilities.cuh
@@ -16,7 +16,7 @@
 #pragma once
 
 #include <cuda_runtime.h>
-#include <bitmask/valid_if.cuh>
+#include <bitmask/legacy/valid_if.cuh>
 #include <cudf/strings/string_view.cuh>
 #include <cudf/column/column_view.hpp>
 

diff --git a/cpp/src/transform/nans_to_nulls.cu → cpp/src/transform/legacy/nans_to_nulls.cu b/cpp/src/transform/nans_to_nulls.cu → cpp/src/transform/legacy/nans_to_nulls.cu
diff --git a/cpp/src/transform/transform.cpp → cpp/src/transform/legacy/transform.cpp b/cpp/src/transform/transform.cpp → cpp/src/transform/legacy/transform.cpp
@@ -30,7 +30,7 @@
 #include <jit/launcher.h>
 #include <jit/legacy/type.h>
 #include <jit/parser.h>
-#include "jit/code/code.h"
+#include "../jit/code/code.h"
 
 #include <types.h.jit>
 #include <types.hpp.jit>

diff --git a/cpp/tests/CMakeLists.txt b/cpp/tests/CMakeLists.txt
@@ -189,12 +189,12 @@ set(LEGACY_BITMASK_TEST_SRC
 ConfigureTest(LEGACY_BITMASK_TEST "${LEGACY_BITMASK_TEST_SRC}")
 
 ###################################################################################################
-# - nans_to_nulls tests ---------------------------------------------------------------------------
+# - legacy nans_to_nulls tests ---------------------------------------------------------------------------
 
-set(NANS_TO_NULLS_TEST_SRC
-  "${CMAKE_CURRENT_SOURCE_DIR}/bitmask/nans_to_nulls_tests.cu")
+set(LEGACY_NANS_TO_NULLS_TEST_SRC
+  "${CMAKE_CURRENT_SOURCE_DIR}/bitmask/legacy/nans_to_nulls_tests.cu")
 
-ConfigureTest(NANS_TO_NULLS_TEST "${NANS_TO_NULLS_TEST_SRC}")
+ConfigureTest(LEGACY_NANS_TO_NULLS_TEST "${LEGACY_NANS_TO_NULLS_TEST_SRC}")
 
 
 ###################################################################################################
@@ -282,12 +282,12 @@ set(BINARY_TEST_SRC
 ConfigureTest(BINARY_TEST "${BINARY_TEST_SRC}")
 
 ###################################################################################################
-# - unary transform tests -------------------------------------------------------------------------
+# - legacy unary transform tests -------------------------------------------------------------------------
 
-set(TRANSFORM_TEST_SRC 
-    "${CMAKE_CURRENT_SOURCE_DIR}/transform/integration/unary-operation-integration-test.cu")
+set(LEGACY_TRANSFORM_TEST_SRC 
+    "${CMAKE_CURRENT_SOURCE_DIR}/transform/integration/legacy/unary-operation-integration-test.cu")
 
-ConfigureTest(TRANSFORM_TEST "${TRANSFORM_TEST_SRC}")
+ConfigureTest(LEGACY_TRANSFORM_TEST "${LEGACY_TRANSFORM_TEST_SRC}")
 
 ###################################################################################################
 # - jit cache tests -------------------------------------------------------------------------------

diff --git a/cpp/tests/bitmask/nans_to_nulls_tests.cu → ...sts/bitmask/legacy/nans_to_nulls_tests.cu b/cpp/tests/bitmask/nans_to_nulls_tests.cu → ...sts/bitmask/legacy/nans_to_nulls_tests.cu
@@ -28,7 +28,7 @@
 #include <cudf/utilities/legacy/wrapper_types.hpp>
 
 #include <random>
-#include <cudf/transform.hpp>
+#include <cudf/legacy/transform.hpp>
 
 using bit_mask::bit_mask_t;
 

diff --git a/...ation/unary-operation-integration-test.cu → ...egacy/unary-operation-integration-test.cu b/...ation/unary-operation-integration-test.cu → ...egacy/unary-operation-integration-test.cu
@@ -18,8 +18,8 @@
  */
 
 #include <tests/utilities/legacy/cudf_test_fixtures.h>
-#include <cudf/transform.hpp>
-#include "assert-unary.h"
+#include <cudf/legacy/transform.hpp>
+#include "../assert-unary.h"
 #include <cudf/types.h>
 
 #include <cctype>

diff --git a/python/cudf/cudf/_lib/includes/unaryops.pxd b/python/cudf/cudf/_lib/includes/unaryops.pxd
@@ -49,7 +49,7 @@ cdef extern from "cudf/cudf.h" nogil:
         gdf_column *output
     ) except +
 
-cdef extern from "cudf/transform.hpp" namespace "cudf" nogil:
+cdef extern from "cudf/legacy/transform.hpp" namespace "cudf" nogil:
     cdef gdf_column transform(
         const gdf_column& input,
         const string& ptx,