Merge branch 'branch-24.12' into dispatch_methods_gpu_cpu

.github/workflows/build.yaml

@@ -1,13 +1,11 @@
 name: build
 
 on:
-  # TODO: uncomment this condition when ready to start publishing
-  #       packages from this repo
-  # push:
-  #   branches:
-  #     - "branch-*"
-  #   tags:
-  #     - v[0-9][0-9].[0-9][0-9].[0-9][0-9]
+  push:
+    branches:
+      - "branch-*"
+    tags:
+      - v[0-9][0-9].[0-9][0-9].[0-9][0-9]
   workflow_dispatch:
     inputs:
       branch:
@@ -28,8 +26,24 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  conda-python-build:
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
+    with:
+      build_type: ${{ inputs.build_type || 'branch' }}
+      branch: ${{ inputs.branch }}
+      date: ${{ inputs.date }}
+      sha: ${{ inputs.sha }}
+  upload-conda:
+    needs: conda-python-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
+    with:
+      build_type: ${{ inputs.build_type || 'branch' }}
+      branch: ${{ inputs.branch }}
+      date: ${{ inputs.date }}
+      sha: ${{ inputs.sha }}
   wheel-build-nx-cugraph:
-    needs: wheel-publish-nx-cugraph
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/[email protected]
     with:

ci/build_python.sh

@@ -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"
 

ci/build_wheel_nx-cugraph.sh

@@ -3,5 +3,5 @@
 
 set -euo pipefail
 
-#                   pkg-name   pkg-dir
 ./ci/build_wheel.sh nx-cugraph .
+./ci/validate_wheel.sh dist

ci/test_python.sh

@@ -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

ci/validate_wheel.sh

@@ -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)"

nx_cugraph/algorithms/core.py

@@ -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)
 
 

pyproject.toml

@@ -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