Move predicates files to legacy

CHANGELOG.md

@@ -72,6 +72,7 @@
 - PR #3241 Move stream_compaction files to legacy
 - PR #3166 Move reductions to legacy
 - PR #3261 Small cleanup: remove `== true`
+- PR #3270 Move predicates files to legacy
 
 ## Bug Fixes
 

conda/recipes/libcudf/meta.yaml

@@ -71,7 +71,7 @@ test:
     - test -f $PREFIX/include/cudf/ipc.hpp
     - test -f $PREFIX/include/cudf/legacy/merge.hpp
     - test -f $PREFIX/include/cudf/legacy/join.hpp
-    - test -f $PREFIX/include/cudf/predicates.hpp
+    - test -f $PREFIX/include/cudf/legacy/predicates.hpp
     - test -f $PREFIX/include/cudf/legacy/reduction.hpp
     - test -f $PREFIX/include/cudf/legacy/replace.hpp
     - test -f $PREFIX/include/cudf/rolling.hpp

cpp/CMakeLists.txt

@@ -366,7 +366,7 @@ add_library(cudf
             src/strings/nvcategory_util.cpp
             src/join/legacy/joining.cu
             src/orderby/legacy/orderby.cu
-            src/predicates/is_sorted.cu
+            src/predicates/legacy/is_sorted.cu
             src/sort/legacy/digitize.cu
             src/groupby/hash/legacy/groupby.cu
             src/groupby/sort/legacy/sort_helper.cu

cpp/tests/CMakeLists.txt

@@ -89,7 +89,7 @@ link_directories("${CMAKE_CUDA_IMPLICIT_LINK_DIRECTORIES}" # CMAKE_CUDA_IMPLICIT
 ###################################################################################################
 
 ###################################################################################################
-# - legacy column tests ----------------------------------------------------------------------------------
+# - legacy column tests ---------------------------------------------------------------------------
 
 set(LEGACY_COLUMN_TEST_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/column/legacy/column_test.cu")
@@ -106,7 +106,7 @@ set(COLUMN_TEST_SRC
 ConfigureTest(COLUMN_TEST "${COLUMN_TEST_SRC}")
 
 ###################################################################################################
-# - timestamps tests ----------------------------------------------------------------------------------
+# - timestamps tests ------------------------------------------------------------------------------
 
 set(TIMESTAMPS_TEST_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/wrappers/timestamps_test.cu")
@@ -173,23 +173,23 @@ set(LEGACY_ORDERBY_TEST_SRC
 ConfigureTest(LEGACY_ORDERBY_TEST "${LEGACY_ORDERBY_TEST_SRC}")
 
 ###################################################################################################
-# - is_sorted tests ---------------------------------------------------------------------------------
+# - is_sorted tests -------------------------------------------------------------------------------
 
-set(IS_SORTED_TEST_SRC 
-    "${CMAKE_CURRENT_SOURCE_DIR}/orderby/is_sorted/is_sorted_tests.cu")
+set(LEGACY_IS_SORTED_TEST_SRC 
+    "${CMAKE_CURRENT_SOURCE_DIR}/orderby/is_sorted/legacy/is_sorted_tests.cu")
 
-ConfigureTest(IS_SORTED_TEST "${IS_SORTED_TEST_SRC}")
+ConfigureTest(IS_SORTED_TEST "${LEGACY_IS_SORTED_TEST_SRC}")
 
 ###################################################################################################
-# - legacy bitmask tests ---------------------------------------------------------------------------------
+# - legacy bitmask tests --------------------------------------------------------------------------
 
 set(LEGACY_BITMASK_TEST_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/bitmask/legacy/bitmask_ops_test.cu")
 
 ConfigureTest(LEGACY_BITMASK_TEST "${LEGACY_BITMASK_TEST_SRC}")
 
 ###################################################################################################
-# - legacy nans_to_nulls tests ---------------------------------------------------------------------------
+# - legacy nans_to_nulls tests --------------------------------------------------------------------
 
 set(LEGACY_NANS_TO_NULLS_TEST_SRC
   "${CMAKE_CURRENT_SOURCE_DIR}/bitmask/legacy/nans_to_nulls_tests.cu")
@@ -198,7 +198,7 @@ ConfigureTest(LEGACY_NANS_TO_NULLS_TEST "${LEGACY_NANS_TO_NULLS_TEST_SRC}")
 
 
 ###################################################################################################
-# - legacy bit_mask tests --------------------------------------------------------------------------------
+# - legacy bit_mask tests -------------------------------------------------------------------------
 
 set(LEGACY_BIT_MASK_TEST_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/bitmask/legacy/bit_mask_test.cu")
@@ -241,7 +241,7 @@ set(QUANTILES_TEST_SRC
 ConfigureTest(QUANTILES_TEST "${QUANTILES_TEST_SRC}")
 
 ###################################################################################################
-# - reduction tests ---------------------------------------------------------------------------------
+# - reduction tests -------------------------------------------------------------------------------
 
 set(LEGACY_REDUCTION_TEST_SRC 
     "${CMAKE_CURRENT_SOURCE_DIR}/reductions/legacy/reduction_tests.cu"
@@ -250,7 +250,7 @@ set(LEGACY_REDUCTION_TEST_SRC
 ConfigureTest(LEGACY_REDUCTION_TEST "${LEGACY_REDUCTION_TEST_SRC}")
 
 ###################################################################################################
-# - legacy replace tests ---------------------------------------------------------------------------------
+# - legacy replace tests --------------------------------------------------------------------------
 
 set(LEGACY_REPLACE_TEST_SRC 
     "${CMAKE_CURRENT_SOURCE_DIR}/replace/legacy/replace_tests.cu")
@@ -271,7 +271,7 @@ set(LEGACY_UNARY_TEST_SRC
 ConfigureTest(LEGACY_UNARY_TEST "${LEGACY_UNARY_TEST_SRC}")
 
 ###################################################################################################
-# - legacy binary tests ----------------------------------------------------------------------------------
+# - legacy binary tests ---------------------------------------------------------------------------
 
 set(LEGACY_BINARY_TEST_SRC 
     "${CMAKE_CURRENT_SOURCE_DIR}/binaryop/legacy/unit/binop-verify-input-test.cpp"
@@ -282,15 +282,15 @@ set(LEGACY_BINARY_TEST_SRC
 ConfigureTest(LEGACY_BINARY_TEST "${LEGACY_BINARY_TEST_SRC}")
 
 ###################################################################################################
-# - legacy unary transform tests -------------------------------------------------------------------------
+# - legacy unary transform tests ------------------------------------------------------------------
 
 set(LEGACY_TRANSFORM_TEST_SRC 
     "${CMAKE_CURRENT_SOURCE_DIR}/transform/integration/legacy/unary-operation-integration-test.cu")
 
 ConfigureTest(LEGACY_TRANSFORM_TEST "${LEGACY_TRANSFORM_TEST_SRC}")
 
 ###################################################################################################
-# - legacy jit cache tests -------------------------------------------------------------------------------
+# - legacy jit cache tests ------------------------------------------------------------------------
 
 set(LEGACY_JITCACHE_TEST_SRC 
     "${CMAKE_SOURCE_DIR}/src/jit/cache.cpp"
@@ -305,7 +305,7 @@ set(LEGACY_JITCACHE_MULTI_TEST_SRC
 ConfigureTest(LEGACY_JITCACHE_MULTIPROC_TEST "${LEGACY_JITCACHE_MULTI_TEST_SRC}")
 
 ###################################################################################################
-# - io tests -------------------------------------------------------------------------------------
+# - io tests --------------------------------------------------------------------------------------
 
 set(DECOMPRESSION_TEST_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/io/comp/decomp_test.cu")
@@ -337,7 +337,7 @@ set(SORT_TEST_SRC
 ConfigureTest(SORT_TEST "${SORT_TEST_SRC}")
 
 ###################################################################################################
-# - legacy sort tests ------------------------------------------------------------------------------------
+# - legacy sort tests -----------------------------------------------------------------------------
 
 set(LEGACY_SORT_TEST_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/sort/legacy/digitize_test.cu")
@@ -354,15 +354,15 @@ set(LEGACY_TYPES_TEST_SRC
 ConfigureTest(LEGACY_TYPES_TEST "${LEGACY_TYPES_TEST_SRC}")
 
 ###################################################################################################
-# - nvcategory tests -------------------------------------------------------------------------------
+# - nvcategory tests ------------------------------------------------------------------------------
 
 set(NVCATEGORY_TEST_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/nvcategory/nvcategory_test.cu")
 
 ConfigureTest(NVCATEGORY_TEST "${NVCATEGORY_TEST_SRC}")
 
 ###################################################################################################
-# - DLPack tests -------------------------------------------------------------------------------------
+# - DLPack tests ----------------------------------------------------------------------------------
 
 set(LEGACY_DLPACK_TEST_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/io/convert/legacy/dlpack_test.cu")
@@ -380,7 +380,7 @@ set(COPYING_TEST_SRC
 ConfigureTest(COPYING_TEST "${COPYING_TEST_SRC}")
 
 ###################################################################################################
-# - legacy copying tests ---------------------------------------------------------------------------------
+# - legacy copying tests --------------------------------------------------------------------------
 
 set(LEGACY_COPYING_TEST_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/copying/legacy/copy_tests.cu"
@@ -412,23 +412,23 @@ set(UTILITIES_TEST_SRC
 ConfigureTest(UTILITIES_TEST "${UTILITIES_TEST_SRC}")
 
 ###################################################################################################
-# - legacy utilities tests -------------------------------------------------------------------------------
+# - legacy utilities tests ------------------------------------------------------------------------
 
 set(LEGACY_UTILITIES_TEST_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/utilities_tests/legacy/column_wrapper_tests.cu")
 
 ConfigureTest(LEGACY_UTILITIES_TEST "${LEGACY_UTILITIES_TEST_SRC}")
 
 ###################################################################################################
-# - iterator tests -------------------------------------------------------------------------------
+# - iterator tests --------------------------------------------------------------------------------
 
 set(ITERATOR_TEST_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/iterator/iterator_test.cu")
 
 ConfigureTest(ITERATOR_TEST "${ITERATOR_TEST_SRC}")
 
 ###################################################################################################
-# - device atomics tests -------------------------------------------------------------------------------
+# - device atomics tests --------------------------------------------------------------------------
 
 set(DEVICE_ATOMICS_TEST_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/device_atomics/device_atomics_test.cu")
@@ -452,30 +452,30 @@ set(TABLE_TEST_SRC
 
 ConfigureTest(TABLE_TEST "${TABLE_TEST_SRC}")
 ###################################################################################################
-# - legacy table tests -----------------------------------------------------------------------------------
+# - legacy table tests ----------------------------------------------------------------------------
 
 set(LEGACY_TABLE_TEST_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/table/legacy/table_tests.cu")
 
 ConfigureTest(LEGACY_TABLE_TEST "${LEGACY_TABLE_TEST_SRC}")
 ###################################################################################################
-# - device table tests -----------------------------------------------------------------------------------
+# - device table tests ----------------------------------------------------------------------------
 
 set(DEVICE_TABLE_TEST_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/device_table/device_table_tests.cu")
 
 ConfigureTest(DEVICE_TABLE_TEST "${DEVICE_TABLE_TEST_SRC}")
 
 ###################################################################################################
-# - sorted-merge tests -------------------------------------------------------------------------------------
+# - sorted-merge tests ----------------------------------------------------------------------------
 
 set(LEGACY_MERGE_TEST_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/merge/legacy/merge-test.cu")
 
 ConfigureTest(LEGACY_MERGE_TEST "${LEGACY_MERGE_TEST_SRC}")
 
 ###################################################################################################
-# - legacy stream compaction tests -----------------------------------------------------------------------
+# - legacy stream compaction tests ----------------------------------------------------------------
 
 set(LEGACY_STREAM_COMPACTION_TEST_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/stream_compaction/legacy/apply_boolean_mask_tests.cu"
@@ -503,7 +503,7 @@ set(LEGACY_FILLING_TEST_SRC
 ConfigureTest(LEGACY_FILLING_TEST "${LEGACY_FILLING_TEST_SRC}")
 
 ###################################################################################################
-# - legacy search test -----------------------------------------------------------------------------------
+# - legacy search test ----------------------------------------------------------------------------
 
 set(LEGACY_SEARCH_TEST_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/search/legacy/search_test.cu")
@@ -527,23 +527,23 @@ set(TRAITS_TEST_SRC
 ConfigureTest(TRAITS_TEST "${TRAITS_TEST_SRC}")
 
 ###################################################################################################
-# - factories test -----------------------------------------------------------------------------------
+# - factories test --------------------------------------------------------------------------------
 
 set(FACTORIES_TEST_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/column/factories_test.cpp")
 
 ConfigureTest(FACTORIES_TEST "${FACTORIES_TEST_SRC}")
 
 ###################################################################################################
-# - dispatcher test -----------------------------------------------------------------------------------
+# - dispatcher test -------------------------------------------------------------------------------
 
 set(DISPATCHER_TEST_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/types/type_dispatcher_test.cu")
 
 ConfigureTest(DISPATCHER_TEST "${DISPATCHER_TEST_SRC}")
 
 ###################################################################################################
-# - strings test --------------------------------------------------------------------------------------
+# - strings test ----------------------------------------------------------------------------------
 
 set(STRINGS_TEST_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/strings/factories_test.cu"
@@ -572,7 +572,7 @@ enable_testing()
 # only built if CMAKE_ENABLE_BENCHMARKS is set to ON
 
 ###################################################################################################
-# - iterator benchmarks-------------------------------------------------------------------
+# - iterator benchmarks----------------------------------------------------------------------------
 
 set(ITERATOR_BENCH_SRC
     "${CMAKE_CURRENT_SOURCE_DIR}/iterator/iterator_bench.cu")

cpp/tests/orderby/is_sorted/is_sorted_tests.cu → cpp/tests/orderby/is_sorted/legacy/is_sorted_tests.cu

@@ -18,7 +18,7 @@
 #include <gmock/gmock.h>
 #include <cudf/cudf.h>
 #include <cudf/legacy/table.hpp>
-#include <cudf/predicates.hpp>
+#include <cudf/legacy/predicates.hpp>
 
 #include <cudf/utilities/error.hpp>
 

python/cudf/cudf/_lib/includes/issorted.pxd

@@ -7,7 +7,7 @@
 
 from cudf._lib.cudf cimport *
 
-cdef extern from "cudf/predicates.hpp" namespace "cudf" nogil:
+cdef extern from "cudf/legacy/predicates.hpp" namespace "cudf" nogil:
 
     cdef bool is_sorted(
         cudf_table table,