Revert testing changes.

rapidsai · Dec 19, 2023 · 3da09ac · 3da09ac
1 parent 3770799
commit 3da09ac
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 77 deletions.
diff --git a/ci/build_cpp.sh b/ci/build_cpp.sh
@@ -9,18 +9,10 @@ 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)
-LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 2049 cpp)
-
 version=$(rapids-generate-version)
 
 rapids-logger "Begin cpp build"
 
-RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild \
-    --channel "${LIBRMM_CHANNEL}" \
-    --channel "${LIBCUDF_CHANNEL}" \
-    --channel "${LIBRAFT_CHANNEL}" \
-    conda/recipes/libcugraph
+RAPIDS_PACKAGE_VERSION=${version} rapids-conda-retry mambabuild conda/recipes/libcugraph
 
 rapids-upload-conda-to-s3 cpp
diff --git a/ci/build_python.sh b/ci/build_python.sh
@@ -10,12 +10,6 @@ export CMAKE_GENERATOR=Ninja
 rapids-print-env
 
 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)
-LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 2049 cpp)
-RAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 2049 python)
 
 version=$(rapids-generate-version)
 git_commit=$(git rev-parse HEAD)
@@ -35,23 +29,11 @@ done
 rapids-conda-retry mambabuild \
   --no-test \
   --channel "${CPP_CHANNEL}" \
-  --channel "${LIBRMM_CHANNEL}" \
-  --channel "${RMM_CHANNEL}" \
-  --channel "${LIBCUDF_CHANNEL}" \
-  --channel "${CUDF_CHANNEL}" \
-  --channel "${LIBRAFT_CHANNEL}" \
-  --channel "${RAFT_CHANNEL}" \
   conda/recipes/pylibcugraph
 
 rapids-conda-retry mambabuild \
   --no-test \
   --channel "${CPP_CHANNEL}" \
-  --channel "${LIBRMM_CHANNEL}" \
-  --channel "${RMM_CHANNEL}" \
-  --channel "${LIBCUDF_CHANNEL}" \
-  --channel "${CUDF_CHANNEL}" \
-  --channel "${LIBRAFT_CHANNEL}" \
-  --channel "${RAFT_CHANNEL}" \
   --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \
   conda/recipes/cugraph
 
@@ -62,12 +44,6 @@ rapids-conda-retry mambabuild \
 rapids-conda-retry mambabuild \
   --no-test \
   --channel "${CPP_CHANNEL}" \
-  --channel "${LIBRMM_CHANNEL}" \
-  --channel "${RMM_CHANNEL}" \
-  --channel "${LIBCUDF_CHANNEL}" \
-  --channel "${CUDF_CHANNEL}" \
-  --channel "${LIBRAFT_CHANNEL}" \
-  --channel "${RAFT_CHANNEL}" \
   --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \
   conda/recipes/nx-cugraph
 
@@ -92,12 +68,6 @@ if [[ ${RAPIDS_CUDA_MAJOR} == "11" ]]; then
   rapids-conda-retry mambabuild \
     --no-test \
     --channel "${CPP_CHANNEL}" \
-    --channel "${LIBRMM_CHANNEL}" \
-    --channel "${RMM_CHANNEL}" \
-    --channel "${LIBCUDF_CHANNEL}" \
-    --channel "${CUDF_CHANNEL}" \
-    --channel "${LIBRAFT_CHANNEL}" \
-    --channel "${RAFT_CHANNEL}" \
     --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \
     --channel pyg \
     --channel pytorch \
@@ -108,12 +78,6 @@ if [[ ${RAPIDS_CUDA_MAJOR} == "11" ]]; then
   rapids-conda-retry mambabuild \
     --no-test \
     --channel "${CPP_CHANNEL}" \
-    --channel "${LIBRMM_CHANNEL}" \
-    --channel "${RMM_CHANNEL}" \
-    --channel "${LIBCUDF_CHANNEL}" \
-    --channel "${CUDF_CHANNEL}" \
-    --channel "${LIBRAFT_CHANNEL}" \
-    --channel "${RAFT_CHANNEL}" \
     --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \
     --channel dglteam \
     --channel pytorch \

diff --git a/ci/test_cpp.sh b/ci/test_cpp.sh
@@ -19,9 +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)
-LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 2049 cpp)
 
 RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}/
 mkdir -p "${RAPIDS_TESTS_DIR}"
@@ -30,9 +27,6 @@ rapids-print-env
 
 rapids-mamba-retry install \
     --channel "${CPP_CHANNEL}" \
-    --channel "${LIBRMM_CHANNEL}" \
-    --channel "${LIBCUDF_CHANNEL}" \
-    --channel "${LIBRAFT_CHANNEL}" \
     libcugraph libcugraph_etl libcugraph-tests
 
 rapids-logger "Check GPU usage"

diff --git a/ci/test_python.sh b/ci/test_python.sh
@@ -21,12 +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)
-LIBRAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 2049 cpp)
-RAFT_CHANNEL=$(rapids-get-pr-conda-artifact raft 2049 python)
 
 RAPIDS_TESTS_DIR=${RAPIDS_TESTS_DIR:-"${PWD}/test-results"}
 RAPIDS_COVERAGE_DIR=${RAPIDS_COVERAGE_DIR:-"${PWD}/coverage-results"}
@@ -37,12 +31,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}" \
-  --channel "${LIBRAFT_CHANNEL}" \
-  --channel "${RAFT_CHANNEL}" \
   libcugraph \
   pylibcugraph \
   cugraph \
@@ -160,12 +148,6 @@ if [[ "${RAPIDS_CUDA_VERSION}" == "11.8.0" ]]; then
     rapids-mamba-retry install \
       --channel "${CPP_CHANNEL}" \
       --channel "${PYTHON_CHANNEL}" \
-      --channel "${LIBRMM_CHANNEL}" \
-      --channel "${RMM_CHANNEL}" \
-      --channel "${LIBCUDF_CHANNEL}" \
-      --channel "${CUDF_CHANNEL}" \
-      --channel "${LIBRAFT_CHANNEL}" \
-      --channel "${RAFT_CHANNEL}" \
       --channel pytorch \
       --channel pytorch-nightly \
       --channel dglteam/label/cu118 \
@@ -219,12 +201,6 @@ if [[ "${RAPIDS_CUDA_VERSION}" == "11.8.0" ]]; then
     rapids-mamba-retry install \
       --channel "${CPP_CHANNEL}" \
       --channel "${PYTHON_CHANNEL}" \
-      --channel "${LIBRMM_CHANNEL}" \
-      --channel "${RMM_CHANNEL}" \
-      --channel "${LIBCUDF_CHANNEL}" \
-      --channel "${CUDF_CHANNEL}" \
-      --channel "${LIBRAFT_CHANNEL}" \
-      --channel "${RAFT_CHANNEL}" \
       --channel pytorch \
       --channel nvidia \
       --channel pyg \

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}/CUGRAPH_RAPIDS.cmake)
   file(DOWNLOAD https://raw.githubusercontent.com/rapidsai/rapids-cmake/branch-24.02/RAPIDS.cmake
        ${CMAKE_CURRENT_BINARY_DIR}/CUGRAPH_RAPIDS.cmake