Update to CCCL 2.2.0. #4052

bdice · 2023-12-07T18:03:58Z

This PR updates cuGraph to CCCL 2.2.0. Do not merge until all of RAPIDS is ready to update.

Depends on #3862.

Replaces #3516.

copy-pr-bot · 2023-12-07T18:04:02Z

This pull request requires additional validation before any workflows can run on NVIDIA's runners.

Pull request vetters can view their responsibilities here.

Contributors can view more details about this message here.

@robertmaynard

I saw an error (below) and @robertmaynard helped me identify that this change was needed. I was building cuGraph ([this branch](rapidsai/cugraph#4052)) with rapids-cmake pointing to [this branch](NVIDIA/cuCollections#404) of cuCollections. ``` -- CPM: Adding package cuco@0.0.1 (cccl-2.2.0) CMake Error at build/release/_deps/rapids-cmake-src/rapids-cmake/cmake/make_global.cmake:59 (set_target_properties): Attempt to promote imported target "CCCL::Thrust" to global scope (by setting IMPORTED_GLOBAL) which is not built in this directory. Call Stack (most recent call first): build/release/_deps/rapids-cmake-src/rapids-cmake/cpm/find.cmake:189 (rapids_cmake_make_global) build/release/_deps/rapids-cmake-src/rapids-cmake/cpm/cccl.cmake:85 (rapids_cpm_find) build/release/_deps/cuco-src/cmake/thirdparty/get_cccl.cmake:18 (rapids_cpm_cccl) build/release/_deps/cuco-src/cmake/thirdparty/get_cccl.cmake:21 (find_and_configure_cccl) build/release/_deps/cuco-src/CMakeLists.txt:79 (include) ``` Authors: - Bradley Dice (https://github.com/bdice) Approvers: - Robert Maynard (https://github.com/robertmaynard) URL: #500

bdice · 2023-12-18T15:34:24Z

fetch_rapids.cmake

+set(rapids-cmake-repo bdice/rapids-cmake)
+set(rapids-cmake-branch cuco-cccl-2.2.0)


I will revert this before merging. Depends on NVIDIA/cuCollections#404 merging, and rapids-cmake being updated to use that commit in versions.json.

bdice · 2023-12-18T15:34:35Z

ci/build_cpp.sh

@@ -9,10 +9,18 @@ export CMAKE_GENERATOR=Ninja

 rapids-print-env

+LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1404 cpp)


I will revert changes to CI scripts that use upstream artifacts before merging.

cpp/CMakeLists.txt

bdice · 2023-12-19T05:19:59Z

I don't have a way to test this build in CI with the private cugraph-ops build from https://github.com/rapidsai/cugraph-ops/pull/580. I see there is an error here in the Python conda builds, but it's because we haven't merged that PR to cugraph-ops yet. https://github.com/rapidsai/cugraph/actions/runs/7229496902/job/19701156504?pr=4052#step:7:641

I have tested this locally and it should be fine. We may have to admin-merge this PR depending on the build order / timing of the other repositories, since it's so far down the dependency tree (rmm -> raft -> cugraph-ops -> cugraph). The builds will work themselves out with time, after all the dependencies are rebuilt.

Full error below: it comes from thrust_create_target with an outdated cugraph-ops-config.cmake. This is fixed in https://github.com/rapidsai/cugraph-ops/pull/580.

      -- Found Thrust: /opt/conda/conda-bld/_h_env_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placeho/lib/rapids/cmake/thrust/thrust-config.cmake (found suitable exact version "2.2.0.0")
      -- Found CCCL: /opt/conda/conda-bld/_h_env_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placeho/lib/rapids/cmake/cccl/cccl-config.cmake (found version "2.2.0.0")
      -- Found rmm: /opt/conda/conda-bld/_h_env_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placeho/lib/cmake/rmm/rmm-config.cmake (found version "24.02.0")
      -- Found cuco: /opt/conda/conda-bld/_h_env_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placeho/lib/cmake/cuco/cuco-config.cmake (found version "0.0.1")
      -- Found OpenMP_CXX: -fopenmp (found version "4.5")
      -- Found OpenMP: TRUE (found version "4.5")
      -- Found raft: /opt/conda/conda-bld/_h_env_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placeho/lib/cmake/raft/raft-config.cmake (found version "24.02.0")
      CMake Error at /opt/conda/conda-bld/_h_env_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placeho/targets/sbsa-linux/lib/cmake/thrust/thrust-config.cmake:225 (message):
        The version of CUB found by CMake is not compatible with this release of
        Thrust.  CUB is now included in the CUDA Toolkit, so you no longer need to
        use your own checkout of CUB.  Pass IGNORE_CUB_VERSION_CHECK to
        thrust_create_target to ignore.  (CUB 2.2.0.0, Thrust 2.0.1.0).
      Call Stack (most recent call first):
        /opt/conda/conda-bld/_h_env_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placeho/lib/cmake/cugraph-ops/cugraph-ops-config.cmake:150 (thrust_create_target)
        /opt/conda/conda-bld/_h_env_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placeho/lib/cmake/cugraph/cugraph-dependencies.cmake:34 (find_package)
        /opt/conda/conda-bld/_h_env_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placehold_placeho/lib/cmake/cugraph/cugraph-config.cmake:72 (include)
        CMakeLists.txt:46 (find_package)
      
      
      -- Configuring incomplete, errors occurred!

vyasr · 2023-12-19T23:32:05Z

/merge

github-actions bot added the cuGraph label Dec 7, 2023

bdice mentioned this pull request Dec 7, 2023

Test updates of CCCL (thrust, cub, libcudacxx) to 2.1.0. #3516

Closed

bdice added the DO NOT MERGE Hold off on merging; see PR for details label Dec 7, 2023

bdice mentioned this pull request Dec 7, 2023

Remove CCCL::Thrust from GLOBAL_TARGETS. rapidsai/rapids-cmake#500

Merged

7 tasks

bdice force-pushed the cccl-2.2.0 branch from afd03a5 to 00bf643 Compare December 8, 2023 22:10

github-actions bot removed the cuGraph label Dec 8, 2023

bdice mentioned this pull request Dec 8, 2023

CCCL 2.2.0 migration rapidsai/rapids-cmake#502

Closed

26 tasks

bdice added 2 commits December 14, 2023 11:50

Test with cuCollections.

0b50e3d

Use CCCL.

18788fc

bdice force-pushed the cccl-2.2.0 branch from 00bf643 to 18788fc Compare December 14, 2023 19:59

github-actions bot added cuGraph CMake labels Dec 14, 2023

bdice added 2 commits December 15, 2023 15:54

Test with cuCollections.

5e88138

Use CCCL.

e990a1c

bdice force-pushed the cccl-2.2.0 branch from 18788fc to e990a1c Compare December 15, 2023 21:54

bdice self-assigned this Dec 15, 2023

github-actions bot added the ci label Dec 16, 2023

Use upstream artifacts.

e90d276

bdice force-pushed the cccl-2.2.0 branch from 6383037 to e90d276 Compare December 16, 2023 03:23

bdice marked this pull request as ready for review December 18, 2023 15:34

bdice requested review from a team as code owners December 18, 2023 15:34

bdice commented Dec 18, 2023

View reviewed changes

vyasr requested changes Dec 18, 2023

View reviewed changes

cpp/CMakeLists.txt Show resolved Hide resolved

vyasr approved these changes Dec 18, 2023

View reviewed changes

Merge branch 'cccl-2.2.0' of github.com:bdice/cugraph into cccl-2.2.0

3770799

raydouglass approved these changes Dec 19, 2023

View reviewed changes

Revert testing changes.

3da09ac

bdice added improvement Improvement / enhancement to an existing function breaking Breaking change and removed DO NOT MERGE Hold off on merging; see PR for details labels Dec 19, 2023

rapids-bot bot merged commit 34054b1 into rapidsai:branch-24.02 Dec 20, 2023
85 checks passed

vyasr mentioned this pull request Feb 14, 2024

[BUG]: Version of CUB not compatible with thrust #4170

Closed

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update to CCCL 2.2.0. #4052

Update to CCCL 2.2.0. #4052

bdice commented Dec 7, 2023 •

edited

Loading

copy-pr-bot bot commented Dec 7, 2023

bdice Dec 18, 2023

bdice Dec 18, 2023

bdice commented Dec 19, 2023 •

edited

Loading

vyasr commented Dec 19, 2023

		set(rapids-cmake-repo bdice/rapids-cmake)
		set(rapids-cmake-branch cuco-cccl-2.2.0)

		@@ -9,10 +9,18 @@ export CMAKE_GENERATOR=Ninja

		rapids-print-env

		LIBRMM_CHANNEL=$(rapids-get-pr-conda-artifact rmm 1404 cpp)

Update to CCCL 2.2.0. #4052

Update to CCCL 2.2.0. #4052

Conversation

bdice commented Dec 7, 2023 • edited Loading

copy-pr-bot bot commented Dec 7, 2023

bdice Dec 18, 2023

Choose a reason for hiding this comment

bdice Dec 18, 2023

Choose a reason for hiding this comment

bdice commented Dec 19, 2023 • edited Loading

vyasr commented Dec 19, 2023

bdice commented Dec 7, 2023 •

edited

Loading

bdice commented Dec 19, 2023 •

edited

Loading