Merge pull request #3052 from jwyles/issue2944-2

Move replace.hpp files to legacy
rapidsai · Oct 22, 2019 · 1d7e44a · 1d7e44a
2 parents 90062b9 + 88e191b
commit 1d7e44a
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,7 @@
 - PR #3014 Snappy decompression optimizations
 - PR #3032 Use `asarray` to coerce indices to a NumPy array
 - PR #2996 IO Readers: Replace `cuio::device_buffer` with `rmm::device_buffer`
+- PR #3052 Moved replace.hpp functionality to legacy
 - PR #3091 Move join files to legacy
 - PR #3092 Implicitly init RMM if Java allocates before init
 - PR #3029 Update gdf_ numeric types with stdint and move to cudf namespace
@@ -43,6 +44,7 @@
 - PR #3021 Java host side concat of serialized buffers
 - PR #3138 Movey unary files to legacy
 
+
 ## Bug Fixes
 
 - PR #3048 Support for zero columned tables

diff --git a/conda/recipes/libcudf/meta.yaml b/conda/recipes/libcudf/meta.yaml
@@ -72,7 +72,7 @@ test:
     - test -f $PREFIX/include/cudf/merge.hpp
     - test -f $PREFIX/include/cudf/predicates.hpp
     - test -f $PREFIX/include/cudf/reduction.hpp
-    - test -f $PREFIX/include/cudf/replace.hpp
+    - test -f $PREFIX/include/cudf/legacy/replace.hpp
     - test -f $PREFIX/include/cudf/rolling.hpp
     - test -f $PREFIX/include/cudf/legacy/search.hpp
     - test -f $PREFIX/include/cudf/stream_compaction.hpp

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -373,7 +373,7 @@ add_library(cudf
             src/reductions/mean.cu
             src/reductions/var.cu
             src/reductions/std.cu
-            src/replace/replace.cu
+            src/replace/legacy/replace.cu
             src/reductions/scan.cu
             src/transpose/legacy/transpose.cu
             src/merge/merge.cu

diff --git a/cpp/include/cudf/replace.hpp → cpp/include/cudf/legacy/replace.hpp b/cpp/include/cudf/replace.hpp → cpp/include/cudf/legacy/replace.hpp
@@ -17,8 +17,8 @@
 #ifndef REPLACE_HPP
 #define REPLACE_HPP
 
-#include "cudf.h"
-#include "types.hpp"
+#include "cudf/cudf.h"
+#include "cudf/types.hpp"
 
 // Forward declaration
 typedef struct CUstream_st* cudaStream_t;

diff --git a/cpp/src/replace/replace.cu → cpp/src/replace/legacy/replace.cu b/cpp/src/replace/replace.cu → cpp/src/replace/legacy/replace.cu
@@ -22,7 +22,7 @@
 #include <cub/cub.cuh>
 
 #include <cudf/legacy/copying.hpp>
-#include <cudf/replace.hpp>
+#include <cudf/legacy/replace.hpp>
 #include <cudf/cudf.h>
 #include <rmm/rmm.h>
 #include <cudf/types.hpp>

diff --git a/cpp/src/strings/nvcategory_util.cpp b/cpp/src/strings/nvcategory_util.cpp
@@ -1,7 +1,7 @@
 #include <utility>
 #include <utilities/column_utils.hpp>
 #include <cudf/utilities/legacy/nvcategory_util.hpp>
-#include <cudf/replace.hpp>
+#include <cudf/legacy/replace.hpp>
 #include <cudf/types.hpp>
 #include <cudf/legacy/table.hpp>
 #include <nvstrings/NVCategory.h>

diff --git a/cpp/tests/CMakeLists.txt b/cpp/tests/CMakeLists.txt
@@ -250,17 +250,17 @@ set(REDUCTION_TEST_SRC
 ConfigureTest(REDUCTION_TEST "${REDUCTION_TEST_SRC}")
 
 ###################################################################################################
-# - replace tests ---------------------------------------------------------------------------------
+# - legacy replace tests ---------------------------------------------------------------------------------
 
-set(REPLACE_TEST_SRC 
-    "${CMAKE_CURRENT_SOURCE_DIR}/replace/replace_tests.cu")
+set(LEGACY_REPLACE_TEST_SRC 
+    "${CMAKE_CURRENT_SOURCE_DIR}/replace/legacy/replace_tests.cu")
 
-ConfigureTest(REPLACE_TEST "${REPLACE_TEST_SRC}")
+ConfigureTest(LEGACY_REPLACE_TEST "${LEGACY_REPLACE_TEST_SRC}")
 
-set(REPLACE_NULLS_TEST_SRC 
-    "${CMAKE_CURRENT_SOURCE_DIR}/replace/replace-nulls_tests.cu")
+set(LEGACY_REPLACE_NULLS_TEST_SRC 
+    "${CMAKE_CURRENT_SOURCE_DIR}/replace/legacy/replace-nulls_tests.cu")
 
-ConfigureTest(REPLACE_NULLS_TEST "${REPLACE_NULLS_TEST_SRC}")
+ConfigureTest(LEGACY_REPLACE_NULLS_TEST "${LEGACY_REPLACE_NULLS_TEST_SRC}")
 
 ###################################################################################################
 # - unary tests -----------------------------------------------------------------------------------

diff --git a/cpp/tests/replace/replace-nulls_tests.cu → ...sts/replace/legacy/replace-nulls_tests.cu b/cpp/tests/replace/replace-nulls_tests.cu → ...sts/replace/legacy/replace-nulls_tests.cu
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <cudf/replace.hpp>
+#include <cudf/legacy/replace.hpp>
 
 #include <utilities/error_utils.hpp>
 
@@ -83,4 +83,4 @@ TYPED_TEST(ReplaceNullsTest, ReplaceScalar)
     cudf::test::column_wrapper<TypeParam> {column_size,
       [](cudf::size_type row) { return (row < column_size/2) ? 1 : row; },
       false});
-}
+}
diff --git a/cpp/tests/replace/replace_tests.cu → cpp/tests/replace/legacy/replace_tests.cu b/cpp/tests/replace/replace_tests.cu → cpp/tests/replace/legacy/replace_tests.cu
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <cudf/replace.hpp>
+#include <cudf/legacy/replace.hpp>
 
 #include <tests/utilities/legacy/cudf_test_fixtures.h>
 #include <tests/utilities/legacy/cudf_test_utils.cuh>

diff --git a/python/cudf/cudf/_lib/includes/replace.pxd b/python/cudf/cudf/_lib/includes/replace.pxd
@@ -7,7 +7,7 @@
 
 from cudf._lib.cudf cimport *
 
-cdef extern from "cudf/replace.hpp" namespace "cudf" nogil:
+cdef extern from "cudf/legacy/replace.hpp" namespace "cudf" nogil:
 
     cdef gdf_column replace_nulls(
         const gdf_column& inp,