diff --git a/ci/build_python.sh b/ci/build_python.sh index af9c3c5640..5ddd764737 100755 --- a/ci/build_python.sh +++ b/ci/build_python.sh @@ -40,16 +40,6 @@ rapids-conda-retry mambabuild \ sccache --show-adv-stats -# NOTE: nothing in nx-cugraph is CUDA-specific, but it is built on each CUDA -# platform to ensure it is included in each set of artifacts, since test -# scripts only install from one set of artifacts based on the CUDA version used -# for the test run. -rapids-conda-retry mambabuild \ - --no-test \ - --channel "${CPP_CHANNEL}" \ - --channel "${RAPIDS_CONDA_BLD_OUTPUT_DIR}" \ - conda/recipes/nx-cugraph - # NOTE: nothing in the cugraph-service packages are CUDA-specific, but they are # built on each CUDA platform to ensure they are included in each set of # artifacts, since test scripts only install from one set of artifacts based on diff --git a/ci/build_wheel.sh b/ci/build_wheel.sh index 944975c55e..8c4eb94cf8 100755 --- a/ci/build_wheel.sh +++ b/ci/build_wheel.sh @@ -30,8 +30,7 @@ python -m pip wheel \ sccache --show-adv-stats # pure-python packages should be marked as pure, and not have auditwheel run on them. -if [[ ${package_name} == "nx-cugraph" ]] || \ - [[ ${package_name} == "cugraph-dgl" ]] || \ +if [[ ${package_name} == "cugraph-dgl" ]] || \ [[ ${package_name} == "cugraph-pyg" ]] || \ [[ ${package_name} == "cugraph-equivariant" ]]; then RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" RAPIDS_PY_WHEEL_PURE="1" rapids-upload-wheels-to-s3 python dist diff --git a/ci/test_python.sh b/ci/test_python.sh index 29b4c7be19..57d60bf42e 100755 --- a/ci/test_python.sh +++ b/ci/test_python.sh @@ -39,7 +39,6 @@ rapids-mamba-retry install \ "libcugraph=${RAPIDS_VERSION_MAJOR_MINOR}.*" \ "pylibcugraph=${RAPIDS_VERSION_MAJOR_MINOR}.*" \ "cugraph=${RAPIDS_VERSION_MAJOR_MINOR}.*" \ - "nx-cugraph=${RAPIDS_VERSION_MAJOR_MINOR}.*" \ "cugraph-service-server=${RAPIDS_VERSION_MAJOR_MINOR}.*" \ "cugraph-service-client=${RAPIDS_VERSION_MAJOR_MINOR}.*" @@ -91,44 +90,6 @@ rapids-logger "pytest cugraph" rapids-logger "pytest cugraph benchmarks (run as tests)" ./ci/run_cugraph_benchmark_pytests.sh --verbose -rapids-logger "pytest nx-cugraph" -./ci/run_nx_cugraph_pytests.sh \ - --verbose \ - --junitxml="${RAPIDS_TESTS_DIR}/junit-nx-cugraph.xml" \ - --cov-config=../../.coveragerc \ - --cov=nx_cugraph \ - --cov-report=xml:"${RAPIDS_COVERAGE_DIR}/nx-cugraph-coverage.xml" \ - --cov-report=term - -rapids-logger "pytest networkx using nx-cugraph backend" -pushd python/nx-cugraph/nx_cugraph -../run_nx_tests.sh -# run_nx_tests.sh outputs coverage data, so check that total coverage is >0.0% -# in case nx-cugraph failed to load but fallback mode allowed the run to pass. -_coverage=$(coverage report|grep "^TOTAL") -echo "nx-cugraph coverage from networkx tests: $_coverage" -echo $_coverage | awk '{ if ($NF == "0.0%") exit 1 }' -# Ensure all algorithms were called by comparing covered lines to function lines. -# Run our tests again (they're fast enough) to add their coverage, then create coverage.json -NX_CUGRAPH_USE_COMPAT_GRAPHS=False pytest \ - --pyargs nx_cugraph \ - --config-file=../pyproject.toml \ - --cov-config=../pyproject.toml \ - --cov=nx_cugraph \ - --cov-append \ - --cov-report= -coverage report \ - --include="*/nx_cugraph/algorithms/*" \ - --omit=__init__.py \ - --show-missing \ - --rcfile=../pyproject.toml -coverage json --rcfile=../pyproject.toml -python -m nx_cugraph.tests.ensure_algos_covered -# Exercise (and show results of) scripts that show implemented networkx algorithms -python -m nx_cugraph.scripts.print_tree --dispatch-name --plc --incomplete --different -python -m nx_cugraph.scripts.print_table -popd - rapids-logger "pytest cugraph-service (single GPU)" ./ci/run_cugraph_service_pytests.sh \ --verbose \ diff --git a/ci/test_wheel.sh b/ci/test_wheel.sh index dfba25bbe1..959279b61e 100755 --- a/ci/test_wheel.sh +++ b/ci/test_wheel.sh @@ -10,12 +10,8 @@ python_package_name=$(echo ${package_name}|sed 's/-/_/g') mkdir -p ./dist RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" -# nx-cugraph is a pure wheel, which is part of generating the download path -if [[ "${package_name}" == "nx-cugraph" ]]; then - RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" RAPIDS_PY_WHEEL_PURE="1" rapids-download-wheels-from-s3 ./dist -else - RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./dist -fi +RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./dist + # use 'ls' to expand wildcard before adding `[extra]` requires for pip # pip creates wheels using python package names python -m pip install $(ls ./dist/${python_package_name}*.whl)[test] @@ -41,6 +37,6 @@ else -v \ --import-mode=append \ --benchmark-disable \ - -k "not test_property_graph_mg and not test_bulk_sampler_io" \ - ./python/${package_name}/${python_package_name}/tests + -k "test_pagerank_non_convergence" \ + ./python/${package_name}/${python_package_name}/tests/link_analysis/ fi