Skip to content

Commit f77c5f4

Browse files
AyodeAwerlratzelseunghwakbdicerobertmaynard
authored
Forward-merge branch-25.06 into branch-25.08 (#5079)
Fixes forward merger xref #5071 --------- Co-authored-by: Rick Ratzel <[email protected]> Co-authored-by: Seunghwa Kang <[email protected]> Co-authored-by: Bradley Dice <[email protected]> Co-authored-by: Robert Maynard <[email protected]> Co-authored-by: Alex Barghi <[email protected]> Co-authored-by: Tom Augspurger <[email protected]> Co-authored-by: Michael Schellenberger Costa <[email protected]>
2 parents 2d7ec38 + 5cc0590 commit f77c5f4

File tree

108 files changed

+1082
-4934
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+1082
-4934
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ repos:
3535
additional_dependencies:
3636
- flake8==7.1.1
3737
- repo: https://github.com/pre-commit/mirrors-clang-format
38-
rev: v16.0.6
38+
rev: v20.1.4
3939
hooks:
4040
- id: clang-format
4141
types_or: [c, c++, cuda]

benchmarks/cugraph/notebooks/feature_storage.ipynb

Lines changed: 0 additions & 162 deletions
This file was deleted.

benchmarks/dgl/README.md

Lines changed: 0 additions & 16 deletions
This file was deleted.

benchmarks/dgl/create_dataset.py

Lines changed: 0 additions & 46 deletions
This file was deleted.

benchmarks/dgl/pytest-based/dgl_benchmark.py

Lines changed: 0 additions & 134 deletions
This file was deleted.

ci/run_cugraph_pytests.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Copyright (c) 2024, NVIDIA CORPORATION.
2+
# Copyright (c) 2024-2025, NVIDIA CORPORATION.
33

44
set -euo pipefail
55

@@ -11,6 +11,6 @@ DASK_DISTRIBUTED__SCHEDULER__WORKER_TTL="${DASK_DISTRIBUTED__SCHEDULER__WORKER_T
1111
DASK_DISTRIBUTED__COMM__TIMEOUTS__CONNECT="${DASK_DISTRIBUTED__COMM__TIMEOUTS__CONNECT:-1000s}" \
1212
DASK_CUDA_WAIT_WORKERS_MIN_TIMEOUT="${DASK_CUDA_WAIT_WORKERS_MIN_TIMEOUT:-1000s}" \
1313
pytest --cache-clear --import-mode=append --benchmark-disable \
14-
-k "not test_property_graph_mg and not test_bulk_sampler_io" \
14+
-k "not test_property_graph_mg" \
1515
"$@" \
1616
tests

0 commit comments

Comments
 (0)