Update CMake to use modern method for fetching numpy consistently

python/cudf/cudf/_lib/CMakeLists.txt

@@ -65,21 +65,12 @@ rapids_cython_create_modules(
 
 target_link_libraries(strings_udf PUBLIC cudf_strings_udf)
 
-# TODO: Finding NumPy currently requires finding Development due to a bug in CMake. This bug was
-# fixed in https://gitlab.kitware.com/cmake/cmake/-/merge_requests/7410 and will be available in
-# CMake 3.24, so we can remove the Development component once we upgrade to CMake 3.24.
-find_package(Python REQUIRED COMPONENTS NumPy)
-set(targets_using_numpy interop avro csv orc json parquet)
-foreach(target IN LISTS targets_using_numpy)
-  target_include_directories(${target} PRIVATE "${Python_NumPy_INCLUDE_DIRS}")
-endforeach()
-
 set(targets_using_dlpack interop)
 foreach(target IN LISTS targets_using_dlpack)
   target_include_directories(${target} PRIVATE "${DLPACK_INCLUDE_DIR}")
 endforeach()
 
-find_package(Python 3.9 REQUIRED COMPONENTS Interpreter)
+find_package(Python REQUIRED COMPONENTS Interpreter NumPy)
 
 execute_process(
   COMMAND "${Python_EXECUTABLE}" -c "import pyarrow; print(pyarrow.get_include())"
@@ -98,7 +89,7 @@ endif()
 # requirement for arrow headers infects all of cudf. That in turn requires including numpy headers.
 # These requirements will go away once all scalar-related Cython code is removed from cudf.
 foreach(target IN LISTS RAPIDS_CYTHON_CREATED_TARGETS)
-  target_include_directories(${target} PRIVATE "${NumPy_INCLUDE_DIRS}")
+  target_include_directories(${target} PRIVATE "${Python_NumPy_INCLUDE_DIRS}")
   target_include_directories(${target} PRIVATE "${PYARROW_INCLUDE_DIR}")
 endforeach()
 

python/cudf/cudf/_lib/io/CMakeLists.txt

@@ -20,8 +20,7 @@ rapids_cython_create_modules(
   LINKED_LIBRARIES "${linked_libraries}" MODULE_PREFIX io_ ASSOCIATED_TARGETS cudf
 )
 
-set(targets_using_numpy_and_arrow_headers io_datasource io_utils)
-foreach(target IN LISTS targets_using_numpy_and_arrow_headers)
+foreach(target IN LISTS RAPIDS_CYTHON_CREATED_TARGETS)
   target_include_directories(${target} PRIVATE "${Python_NumPy_INCLUDE_DIRS}")
   target_include_directories(${target} PRIVATE "${PYARROW_INCLUDE_DIR}")
 endforeach()

python/cudf/cudf/_lib/nvtext/CMakeLists.txt

@@ -27,6 +27,6 @@ rapids_cython_create_modules(
 # requirement for arrow headers infects all of cudf. That in turn requires including numpy headers.
 # These requirements will go away once all scalar-related Cython code is removed from cudf.
 foreach(target IN LISTS RAPIDS_CYTHON_CREATED_TARGETS)
-  target_include_directories(${target} PRIVATE "${NumPy_INCLUDE_DIRS}")
+  target_include_directories(${target} PRIVATE "${Python_NumPy_INCLUDE_DIRS}")
   target_include_directories(${target} PRIVATE "${PYARROW_INCLUDE_DIR}")
 endforeach()

python/cudf/cudf/_lib/pylibcudf/CMakeLists.txt

@@ -22,23 +22,7 @@ rapids_cython_create_modules(
   LINKED_LIBRARIES "${linked_libraries}" MODULE_PREFIX pylibcudf_ ASSOCIATED_TARGETS cudf
 )
 
-find_package(Python 3.9 REQUIRED COMPONENTS Interpreter)
-
-execute_process(
-  COMMAND "${Python_EXECUTABLE}" -c "import pyarrow; print(pyarrow.get_include())"
-  OUTPUT_VARIABLE PYARROW_INCLUDE_DIR
-  OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
 foreach(target IN LISTS RAPIDS_CYTHON_CREATED_TARGETS)
+  target_include_directories(${target} PRIVATE "${Python_NumPy_INCLUDE_DIRS}")
   target_include_directories(${target} PRIVATE "${PYARROW_INCLUDE_DIR}")
 endforeach()
-
-# TODO: Clean up this include when switching to scikit-build-core. See cudf/_lib/CMakeLists.txt for
-# more info
-find_package(NumPy REQUIRED)
-foreach(target IN LISTS RAPIDS_CYTHON_CREATED_TARGETS)
-  target_include_directories(${target} PRIVATE "${NumPy_INCLUDE_DIRS}")
-  # Switch to the line below when we switch back to FindPython.cmake in CMake 3.24.
-  # target_include_directories(${target} PRIVATE "${Python_NumPy_INCLUDE_DIRS}")
-endforeach()

python/cudf/cudf/_lib/strings/CMakeLists.txt

@@ -45,7 +45,7 @@ rapids_cython_create_modules(
 # requirement for arrow headers infects all of cudf. That requirement will go away once all
 # scalar-related Cython code is removed from cudf.
 foreach(target IN LISTS RAPIDS_CYTHON_CREATED_TARGETS)
-  target_include_directories(${target} PRIVATE "${NumPy_INCLUDE_DIRS}")
+  target_include_directories(${target} PRIVATE "${Python_NumPy_INCLUDE_DIRS}")
   target_include_directories(${target} PRIVATE "${PYARROW_INCLUDE_DIR}")
 endforeach()
 

python/cudf/cudf/_lib/strings/convert/CMakeLists.txt

@@ -27,6 +27,6 @@ rapids_cython_create_modules(
 # requirement for arrow headers infects all of cudf. That requirement will go away once all
 # scalar-related Cython code is removed from cudf.
 foreach(target IN LISTS RAPIDS_CYTHON_CREATED_TARGETS)
-  target_include_directories(${target} PRIVATE "${NumPy_INCLUDE_DIRS}")
+  target_include_directories(${target} PRIVATE "${Python_NumPy_INCLUDE_DIRS}")
   target_include_directories(${target} PRIVATE "${PYARROW_INCLUDE_DIR}")
 endforeach()

python/cudf/cudf/_lib/strings/split/CMakeLists.txt

@@ -25,6 +25,6 @@ rapids_cython_create_modules(
 # requirement for arrow headers infects all of cudf. That requirement will go away once all
 # scalar-related Cython code is removed from cudf.
 foreach(target IN LISTS RAPIDS_CYTHON_CREATED_TARGETS)
-  target_include_directories(${target} PRIVATE "${NumPy_INCLUDE_DIRS}")
+  target_include_directories(${target} PRIVATE "${Python_NumPy_INCLUDE_DIRS}")
   target_include_directories(${target} PRIVATE "${PYARROW_INCLUDE_DIR}")
 endforeach()