Skip to content

Commit

Permalink
Merge branch 'branch-24.12' into add-devcontainers
Browse files Browse the repository at this point in the history
  • Loading branch information
jameslamb authored Nov 15, 2024
2 parents 9baa8d9 + c960cbc commit 082f4f7
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 8 deletions.
5 changes: 1 addition & 4 deletions ci/build_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@ source rapids-date-string

rapids-print-env

# TODO: revert this once we start publishing nightly packages from the
# 'nx-cugraph' repo and stop publishing them from the 'cugraph' repo
# rapids-generate-version > ./VERSION
echo "24.12.00a1000" > ./VERSION
rapids-generate-version > ./VERSION

rapids-logger "Begin py build"

Expand Down
2 changes: 1 addition & 1 deletion ci/build_wheel_nx-cugraph.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@

set -euo pipefail

# pkg-name pkg-dir
./ci/build_wheel.sh nx-cugraph .
./ci/validate_wheel.sh dist
4 changes: 1 addition & 3 deletions ci/test_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,9 @@ mkdir -p "${RAPIDS_TESTS_DIR}" "${RAPIDS_COVERAGE_DIR}"

rapids-print-env

# TODO: remove the '>=24.12.00a1000' once we start publishing nightly packages
# from the 'nx-cugraph' repo and stop publishing them from the 'cugraph' repo
rapids-mamba-retry install \
--channel "${PYTHON_CHANNEL}" \
"nx-cugraph=${RAPIDS_VERSION}.*,>=24.12.00a1000"
"nx-cugraph=${RAPIDS_VERSION}.*"

rapids-logger "Check GPU usage"
nvidia-smi
Expand Down
18 changes: 18 additions & 0 deletions ci/validate_wheel.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/bin/bash
# Copyright (c) 2024, NVIDIA CORPORATION.

set -euo pipefail

wheel_dir_relative_path=$1

rapids-logger "validate packages with 'pydistcheck'"

pydistcheck \
--inspect \
"$(echo ${wheel_dir_relative_path}/*.whl)"

rapids-logger "validate packages with 'twine'"

twine check \
--strict \
"$(echo ${wheel_dir_relative_path}/*.whl)"
1 change: 1 addition & 0 deletions nx_cugraph/algorithms/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ def core_number(G):
degree_type="bidirectional",
do_expensive_check=False,
)
core_numbers = core_numbers // 2 # Added this in 24.12 (behavior changed)
return G._nodearrays_to_dict(node_ids, core_numbers)


Expand Down
8 changes: 8 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,14 @@ exclude_lines = [
"raise NotImplementedError",
]

[tool.pydistcheck]
select = [
"distro-too-large-compressed",
]

# PyPI limit is 100 MiB, fail CI before we get too close to that
max_allowed_size_compressed = '75M'

[tool.ruff]
# https://github.com/charliermarsh/ruff/
line-length = 88
Expand Down

0 comments on commit 082f4f7

Please sign in to comment.