Merge remote-tracking branch 'upstream/branch-25.08' into branch-25.08_update-cugraph-api

Author: jnke2016

ci/run_cugraph_pytests.sh

@@ -11,6 +11,5 @@ DASK_DISTRIBUTED__SCHEDULER__WORKER_TTL="${DASK_DISTRIBUTED__SCHEDULER__WORKER_T
 DASK_DISTRIBUTED__COMM__TIMEOUTS__CONNECT="${DASK_DISTRIBUTED__COMM__TIMEOUTS__CONNECT:-1000s}" \
 DASK_CUDA_WAIT_WORKERS_MIN_TIMEOUT="${DASK_CUDA_WAIT_WORKERS_MIN_TIMEOUT:-1000s}" \
 pytest --cache-clear --import-mode=append --benchmark-disable \
-  -k "not test_property_graph_mg" \
   "$@" \
   tests

ci/test_python.sh

@@ -82,31 +82,43 @@ rapids-logger "pytest cugraph (not mg, with xdist)"
   --cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cugraph-coverage.xml" \
   --cov-report=term
 
-# Some tests fail with pytest-xdist enabled.
-# See https://github.com/rapidsai/cugraph/issues/5048
-rapids-logger "pytest cugraph (not mg, without xdist)"
+# The datasets tests may modify global states and interfere with tests running on other workers
+# these tests are typically only limited by network speed and run fairly quickly, so they can be
+# run separately
+rapids-logger "pytest cugraph (datasets APIs)"
 ./ci/run_cugraph_pytests.sh \
   --verbose \
   --junitxml="${RAPIDS_TESTS_DIR}/junit-cugraph.xml" \
-  --numprocesses=1 \
-  --dist=worksteal \
-  -m "not mg" \
-  -k "not test_dataset and (test_bulk_sampler or test_create_undirected_graph_from_asymmetric_adj_list or test_uniform_neighbor_sample or test_node2vec)" \
+  -k "test_dataset" \
   --cov-config=../../.coveragerc \
   --cov=cugraph \
   --cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cugraph-coverage.xml" \
   --cov-report=term
 
-rapids-logger "pytest cugraph (mg)"
+# excludes known failures that will always fail when run in combination
+rapids-logger "pytest cugraph (mg, with xdist)"
 ./ci/run_cugraph_pytests.sh \
   --verbose \
   --junitxml="${RAPIDS_TESTS_DIR}/junit-cugraph.xml" \
+  --numprocesses=8 \
+  --dist=worksteal \
   -m "mg" \
+  -k "not test_dataset and not test_property_graph_mg and not test_dist_sampler_mg and not test_uniform_neighbor_sample_mg" \
   --cov-config=../../.coveragerc \
   --cov=cugraph \
   --cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cugraph-coverage.xml" \
   --cov-report=term
 
+rapids-logger "pytest cugraph (mg dist_sampler and uns)"
+./ci/run_cugraph_pytests.sh \
+  --verbose \
+  --junitxml="${RAPIDS_TESTS_DIR}/junit-cugraph.xml" \
+  -m "mg" \
+  -k "test_dist_sampler_mg or test_uniform_neighbor_sample_mg" \
+  --cov-config=../../.coveragerc \
+  --cov=cugraph \
+  --cov-report=xml:"${RAPIDS_COVERAGE_DIR}/cugraph-coverage.xml" \
+  --cov-report=term
 
 rapids-logger "pytest cugraph benchmarks (run as tests)"
 ./ci/run_cugraph_benchmark_pytests.sh --verbose

python/.coveragerc

@@ -6,3 +6,4 @@ include = cugraph/cugraph/*
 omit = cugraph/cugraph/tests/*
        cugraph-service/tests/*
        pylibcugraph/pylibcugraph/tests/*
+disable_warnings = include-ignored

python/cugraph/cugraph/dask/common/mg_utils.py

@@ -56,7 +56,7 @@ def is_single_gpu():
     status, count = runtime.cudaGetDeviceCount()
     if status != runtime.cudaError_t.cudaSuccess:
         raise RuntimeError("Could not get CUDA device count.")
-    return count > 1
+    return count == 1
 
 
 def get_visible_devices():

python/cugraph/pyproject.toml

@@ -103,3 +103,6 @@ select = [
 
 # PyPI limit is 100 MiB, fail CI before we get too close to that
 max_allowed_size_compressed = '75M'
+
+[tool.coverage.run]
+disable_warnings = ["module-not-measured"]