diff --git a/CHANGELOG.md b/CHANGELOG.md index 504d096c037..19699b22038 100644 --- 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 index 41d38271eb9..68cd997f4d9 100644 --- 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 index f1423f7b255..e92427afac7 100644 --- 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 b/cpp/include/cudf/legacy/replace.hpp similarity index 98% rename from cpp/include/cudf/replace.hpp rename to cpp/include/cudf/legacy/replace.hpp index 1a67f90d199..7ab882bd1b9 100644 --- a/cpp/include/cudf/replace.hpp +++ b/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 b/cpp/src/replace/legacy/replace.cu similarity index 99% rename from cpp/src/replace/replace.cu rename to cpp/src/replace/legacy/replace.cu index 13d19e9a709..2b89add5b59 100644 --- a/cpp/src/replace/replace.cu +++ b/cpp/src/replace/legacy/replace.cu @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/cpp/src/strings/nvcategory_util.cpp b/cpp/src/strings/nvcategory_util.cpp index d95af72e212..5d9da063b25 100644 --- a/cpp/src/strings/nvcategory_util.cpp +++ b/cpp/src/strings/nvcategory_util.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/cpp/tests/CMakeLists.txt b/cpp/tests/CMakeLists.txt index 2a84c1e8add..dfa506bf569 100644 --- 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 b/cpp/tests/replace/legacy/replace-nulls_tests.cu similarity index 98% rename from cpp/tests/replace/replace-nulls_tests.cu rename to cpp/tests/replace/legacy/replace-nulls_tests.cu index 365c4f8b119..959aabe4928 100644 --- a/cpp/tests/replace/replace-nulls_tests.cu +++ b/cpp/tests/replace/legacy/replace-nulls_tests.cu @@ -15,7 +15,7 @@ * limitations under the License. */ -#include +#include #include @@ -83,4 +83,4 @@ TYPED_TEST(ReplaceNullsTest, ReplaceScalar) cudf::test::column_wrapper {column_size, [](cudf::size_type row) { return (row < column_size/2) ? 1 : row; }, false}); -} \ No newline at end of file +} diff --git a/cpp/tests/replace/replace_tests.cu b/cpp/tests/replace/legacy/replace_tests.cu similarity index 99% rename from cpp/tests/replace/replace_tests.cu rename to cpp/tests/replace/legacy/replace_tests.cu index afaa75666c4..6ddc600ebc0 100644 --- a/cpp/tests/replace/replace_tests.cu +++ b/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 +#include #include #include diff --git a/python/cudf/cudf/_lib/includes/replace.pxd b/python/cudf/cudf/_lib/includes/replace.pxd index ce8a6517cf0..34052624a19 100644 --- 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,