Skip to content

Commit

Permalink
Minor cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
eriknw committed Nov 8, 2024
1 parent 768c8a9 commit 0dfad33
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
## https://pre-commit.com/
#
# Before first use: `pre-commit install`
# To run: `make lint`
# To update: `make lint-update`
# To run: `pre-commit run --all-files`
# To update: `pre-commit autoupdate`
# - &flake8_dependencies below needs updated manually
exclude: '^thirdparty'
fail_fast: false
Expand Down
5 changes: 2 additions & 3 deletions ci/build_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ source rapids-date-string

rapids-print-env

# TODO: revert this once we start publishing nightly packages
# from the 'cugraph-gnn' repo and stop publishing them from
# the 'cugraph' / 'wholegraph' repos
# 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

Expand Down
3 changes: 1 addition & 2 deletions ci/test_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ 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 'cugraph-gnn' repo and stop publishing them from
# the 'cugraph' / 'wholegraph' repos
# 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"
Expand Down
6 changes: 0 additions & 6 deletions ci/test_wheel_nx-cugraph.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,16 @@ arch=$(uname -m)
if [[ "${arch}" == "aarch64" && ${RAPIDS_BUILD_TYPE} == "pull-request" ]]; then
python ./ci/wheel_smoke_test_${package_name}.py
else
# Test runs that include tests that use dask require
# --import-mode=append. See test_python.sh for details.
# FIXME: Adding PY_IGNORE_IMPORTMISMATCH=1 to workaround conftest.py import
# mismatch error seen by nx-cugraph after using pytest 8 and
# --import-mode=append.
RAPIDS_DATASET_ROOT_DIR=`pwd`/datasets \
PY_IGNORE_IMPORTMISMATCH=1 \
DASK_WORKER_DEVICES="0" \
DASK_DISTRIBUTED__SCHEDULER__WORKER_TTL="1000s" \
DASK_DISTRIBUTED__COMM__TIMEOUTS__CONNECT="1000s" \
DASK_CUDA_WAIT_WORKERS_MIN_TIMEOUT="1000s" \
NX_CUGRAPH_USE_COMPAT_GRAPHS=False \
python -m pytest \
-v \
--import-mode=append \
--benchmark-disable \
-k "not test_property_graph_mg and not test_bulk_sampler_io" \
./${python_package_name}/tests
fi

0 comments on commit 0dfad33

Please sign in to comment.