Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix building cugraph with CCCL main #4404

Merged
merged 43 commits into from
May 29, 2024
Merged
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
5d83412
proclaim return types for CCCL 2.4+
trxcllnt May 8, 2024
658b71e
hide RAFT pragma deprecation messages
trxcllnt May 8, 2024
c365372
use cuda::proclaim_return_type
trxcllnt May 8, 2024
cbca140
fix lint
trxcllnt May 8, 2024
4233439
add kv_store_t overload for thrust::tuple construction changes
trxcllnt May 8, 2024
d8a5733
fix lint
trxcllnt May 9, 2024
87a1d3d
use thrust::get
trxcllnt May 9, 2024
c5c5176
Merge branch 'branch-24.06' into fix/cccl-2.5
trxcllnt May 9, 2024
3aaedf4
define cxx and cuda standards
trxcllnt May 9, 2024
f5b1e77
update devcontainer workflow to use NVIDIA/cccl#pull-request/1667
trxcllnt May 9, 2024
7ed06f3
uncomment failing test
trxcllnt May 9, 2024
499aa5e
add multi-gpu dependencies to pip devcontainer
trxcllnt May 9, 2024
e373115
Merge branch 'branch-24.06' into fix/cccl-2.5
nv-rliu May 13, 2024
b613e43
extract_transform_e's e_op can't take a tagged key, fix the MG tests
seunghwak May 13, 2024
2997240
Merge branch 'bug_mg_extract_transform_e_test_build' of github.com:se…
trxcllnt May 13, 2024
23d5cf4
don't wrap an exec policy in another exec policy
trxcllnt May 13, 2024
5edef0c
test rapids-cmake with CCCL 2.5
trxcllnt May 14, 2024
c3e8547
revert changes to pr.yaml
trxcllnt May 14, 2024
f388cf8
Merge branch 'branch-24.06' into fix/cccl-2.5
trxcllnt May 14, 2024
8193526
Merge branch 'branch-24.06' into fix/cccl-2.5
trxcllnt May 21, 2024
1928e98
install ucx feature after cuda
trxcllnt May 21, 2024
603e839
use devcontainers with ucx and openmpi prebuilt
trxcllnt May 23, 2024
afbee0a
DOC: doc-update-link-for-cugraphops (#4279)
raybellwaves May 22, 2024
72af4e3
Merge branch 'branch-24.06' into fix/cccl-2.5
trxcllnt May 23, 2024
4797274
fix devcontainer name for codespaces
trxcllnt May 23, 2024
cc23928
Merge branch 'branch-24.06' of github.com:rapidsai/cugraph into fix/c…
trxcllnt May 23, 2024
4a953cc
Merge branch 'fix/cccl-2.5' of github.com:trxcllnt/cugraph into fix/c…
trxcllnt May 23, 2024
b08b655
Merge branch 'branch-24.06' of github.com:rapidsai/cugraph into fix/c…
trxcllnt May 23, 2024
34f6138
use trxcllnt/cudf#fix/cccl-2.5 branch when building libcudf from source
trxcllnt May 23, 2024
47be146
fix lint
trxcllnt May 23, 2024
f7a54c9
Merge branch 'branch-24.06' of github.com:rapidsai/cugraph into fix/c…
trxcllnt May 24, 2024
c8f66e4
make similar changes as in https://github.com/rapidsai/cugraph/pull/4…
trxcllnt May 24, 2024
476a24c
add cuda ver
trxcllnt May 24, 2024
96633db
limit CI parallelism to n_cpus - 1
trxcllnt May 24, 2024
4f5c543
move env to top level
trxcllnt May 24, 2024
feb4b2c
add PARALLEL_LEVEL to ci/build_{cpp,wheel}.sh
trxcllnt May 24, 2024
80a091c
override parallel_level to n_cpus - 1
trxcllnt May 24, 2024
a2c383e
limit parallelism to 8
trxcllnt May 24, 2024
c1f5d40
Merge branch 'branch-24.06' of github.com:rapidsai/cugraph into fix/c…
trxcllnt May 28, 2024
394b07b
increase parallelism to 16
trxcllnt May 28, 2024
c626420
Merge branch 'branch-24.06' of github.com:rapidsai/cugraph into fix/c…
trxcllnt May 28, 2024
325e0f6
revert changes to rapids_config.cmake
trxcllnt May 28, 2024
06dee7e
remove workaround kv_store ctor
trxcllnt May 28, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
revert changes to pr.yaml
trxcllnt committed May 14, 2024
commit c3e8547bdcce075aa271e637b3525dde8b280488
17 changes: 1 addition & 16 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
@@ -195,21 +195,6 @@ jobs:
node_type: cpu32
extra-repo-deploy-key: CUGRAPH_OPS_SSH_PRIVATE_DEPLOY_KEY
build_command: |
# Tell rapids-cmake to use custom CCCL and cuCollections forks
rapids_branch="$(yq '.x-git-defaults.tag' /opt/rapids-build-utils/manifest.yaml)";
rapids_version="${rapids_branch#branch-}";
curl -fsSL -o- https://raw.githubusercontent.com/trxcllnt/rapids-cmake/branch-24.04-cccl-2.4.0/rapids-cmake/cpm/patches/cccl/revert_pr_211.diff \
| tee ~/rapids-cmake-revert_pr_211.diff;
curl -fsSL -o- "https://raw.githubusercontent.com/rapidsai/rapids-cmake/${rapids_branch}/rapids-cmake/cpm/versions.json" \
| jq -r ".packages.CCCL *= {\"version\": \"2.5.0\", \"git_tag\": \"pull-request/1667\"}" \
| jq -r "(.packages.CCCL.patches[] | select(.file == \"cccl/revert_pr_211.diff\")).file = \"${HOME}/rapids-cmake-revert_pr_211.diff\"" \
| jq -r ".packages.cuco *= {\"git_url\": \"https://github.com/trxcllnt/cuCollections.git\", \"git_tag\": \"rapids-${rapids_version}-cccl-2.5.0\", \"always_download\": true}" \
| tee ~/rapids-cmake-override-versions.json;
sccache -z;
build-all \
-j$(nproc --ignore=1) -v \
-DBUILD_CUGRAPH_MG_TESTS=ON \
-DCMAKE_CXX_FLAGS="-ftemplate-backtrace-limit=0" \
-DCMAKE_CUDA_FLAGS="-ftemplate-backtrace-limit=0" \
-DRAPIDS_CMAKE_CPM_DEFAULT_VERSION_FILE="${HOME}/rapids-cmake-override-versions.json";
build-all --verbose -j$(nproc --ignore=1) -DBUILD_CUGRAPH_MG_TESTS=ON;
sccache -s;