Revert testing changes.

rapidsai · Dec 19, 2023 · baaf7e8 · baaf7e8
1 parent c5e2d3e
commit baaf7e8
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 33 deletions.
diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh
@@ -9,16 +9,11 @@ export CMAKE_GENERATOR=Ninja
 
 rapids-print-env
 
-LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1404 cpp)
-LIBCUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14576 cpp)
-
 version=$(rapids-generate-version)
 
 rapids-logger "Begin cpp build"
 
 RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild \
-    --channel "${LIBRMM_CHANNEL}" \
-    --channel "${LIBCUDF_CHANNEL}" \
     conda/recipes/libcuspatial
 
 rapids-upload-conda-to-s3 cpp
diff --git a/ci/build_python.sh b/ci/build_python.sh
@@ -20,10 +20,6 @@ for package_name in cuspatial cuproj; do
 done
 
 CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
-LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1404 cpp)
-RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1404 python)
-LIBCUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14576 cpp)
-CUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14576 python)
 
 rapids-logger "Begin py build cuSpatial"
 
@@ -32,10 +28,6 @@ rapids-logger "Begin py build cuSpatial"
 RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild \
   --no-test \
   --channel "${CPP_CHANNEL}" \
-  --channel "${LIBRMM_CHANNEL}" \
-  --channel "${RMM_CHANNEL}" \
-  --channel "${LIBCUDF_CHANNEL}" \
-  --channel "${CUDF_CHANNEL}" \
   conda/recipes/cuspatial
 
 rapids-logger "Begin py build cuProj"
@@ -45,10 +37,6 @@ rapids-logger "Begin py build cuProj"
 RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild \
   --no-test \
   --channel "${CPP_CHANNEL}" \
-  --channel "${LIBRMM_CHANNEL}" \
-  --channel "${RMM_CHANNEL}" \
-  --channel "${LIBCUDF_CHANNEL}" \
-  --channel "${CUDF_CHANNEL}" \
   conda/recipes/cuproj
 
 rapids-upload-conda-to-s3 python
diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh
@@ -19,8 +19,6 @@ conda activate test
 set -u
 
 CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
-LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1404 cpp)
-LIBCUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14576 cpp)
 RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}/
 mkdir -p "${RAPIDS_TESTS_DIR}"
 
@@ -31,8 +29,6 @@ rapids-print-env
 
 rapids-mamba-retry install \
   --channel "${CPP_CHANNEL}" \
-  --channel "${LIBRMM_CHANNEL}" \
-  --channel "${LIBCUDF_CHANNEL}" \
   libcuspatial libcuspatial-tests
 
 rapids-logger "Check GPU usage"

diff --git a/ci/test_python.sh b/ci/test_python.sh
@@ -21,10 +21,6 @@ set -u
 rapids-logger "Downloading artifacts from previous jobs"
 CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
 PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
-LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1404 cpp)
-RMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1404 python)
-LIBCUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14576 cpp)
-CUDF_CHANNEL=$(rapids-get-pr-conda-artifact cudf 14576 python)
 
 RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}
 RAPIDS_COVERAGE_DIR=${RAPIDS_COVERAGE_DIR:-"${PWD}/coverage-results"}
@@ -38,10 +34,6 @@ rapids-print-env
 rapids-mamba-retry install \
   --channel "${CPP_CHANNEL}" \
   --channel "${PYTHON_CHANNEL}" \
-  --channel "${LIBRMM_CHANNEL}" \
-  --channel "${RMM_CHANNEL}" \
-  --channel "${LIBCUDF_CHANNEL}" \
-  --channel "${CUDF_CHANNEL}" \
   libcuspatial cuspatial cuproj
 
 rapids-logger "Check GPU usage"

diff --git a/cpp/cmake/thirdparty/get_cudf.cmake b/cpp/cmake/thirdparty/get_cudf.cmake
@@ -62,11 +62,11 @@ endfunction()
 set(CUSPATIAL_MIN_VERSION_cudf "${CUSPATIAL_VERSION_MAJOR}.${CUSPATIAL_VERSION_MINOR}")
 
 if(NOT DEFINED CUSPATIAL_CUDF_GIT_REPO)
-  set(CUSPATIAL_CUDF_GIT_REPO https://github.com/bdice/cudf.git)
+  set(CUSPATIAL_CUDF_GIT_REPO https://github.com/rapidsai/cudf.git)
 endif()
 
 if(NOT DEFINED CUSPATIAL_CUDF_GIT_TAG)
-  set(CUSPATIAL_CUDF_GIT_TAG cccl-2.2.0)
+  set(CUSPATIAL_CUDF_GIT_TAG branch-${CUSPATIAL_MIN_VERSION_cudf})
 endif()
 
 find_and_configure_cudf(VERSION ${CUSPATIAL_MIN_VERSION_cudf}.00

diff --git a/fetch_rapids.cmake b/fetch_rapids.cmake
@@ -11,8 +11,6 @@
 # or implied. See the License for the specific language governing permissions and limitations under
 # the License.
 # =============================================================================
-set(rapids-cmake-repo bdice/rapids-cmake)
-set(rapids-cmake-branch cuco-cccl-2.2.0)
 if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/CUSPATIAL_RAPIDS.cmake)
   file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-24.02/RAPIDS.cmake
        ${CMAKE_BINARY_DIR}/CUSPATIAL_RAPIDS.cmake