Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove GNN Packages #4765

Merged
merged 12 commits into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,3 @@ ENV SCCACHE_REGION="us-east-2"
ENV SCCACHE_BUCKET="rapids-sccache-devs"
ENV AWS_ROLE_ARN="arn:aws:iam::279114543810:role/nv-gha-token-sccache-devs"
ENV HISTFILE="/home/coder/.cache/._bash_history"

# cugraph_pyg's setup.py needs this defined when building in a conda env
ENV CUDA_HOME="${CUDA_HOME:-/home/coder/.conda/envs/$DEFAULT_CONDA_ENV}"
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ That's it. NetworkX now leverages cuGraph for accelerated graph algorithms.
- [libcugraph (C/C++/CUDA)](./readme_pages/libcugraph.md)
- [nx-cugraph](https://rapids.ai/nx-cugraph/)
- [cugraph-service](./readme_pages/cugraph_service.md)
- [cugraph-dgl](./readme_pages/cugraph_dgl.md)
- [cugraph-ops](./readme_pages/cugraph_ops.md)
- API Docs
- Python
Expand Down
24 changes: 0 additions & 24 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ VALIDARGS="
pylibcugraph
cugraph
cugraph-service
cugraph-pyg
cugraph-dgl
cpp-mgtests
cpp-mtmgtests
docs
Expand All @@ -56,8 +54,6 @@ HELP="$0 [<target> ...] [<flag> ...]
pylibcugraph - build the pylibcugraph Python package
cugraph - build the cugraph Python package
cugraph-service - build the cugraph-service_client and cugraph-service_server Python package
cugraph-pyg - build the cugraph-pyg Python package
cugraph-dgl - build the cugraph-dgl extensions for DGL
cpp-mgtests - build libcugraph and libcugraph_etl MG tests. Builds MPI communicator, adding MPI as a dependency.
cpp-mtmgtests - build libcugraph MTMG tests. Adds UCX as a dependency (temporary).
docs - build the docs
Expand All @@ -84,12 +80,10 @@ LIBCUGRAPH_ETL_BUILD_DIR=${LIBCUGRAPH_ETL_BUILD_DIR:=${REPODIR}/cpp/libcugraph_e
CUGRAPH_SERVICE_BUILD_DIRS="${REPODIR}/python/cugraph-service/server/build
${REPODIR}/python/cugraph-service/client/build
"
CUGRAPH_DGL_BUILD_DIR=${REPODIR}/python/cugraph-dgl/build

BUILD_DIRS="${LIBCUGRAPH_BUILD_DIR}
${LIBCUGRAPH_ETL_BUILD_DIR}
${CUGRAPH_SERVICE_BUILD_DIRS}
${CUGRAPH_DGL_BUILD_DIR}
"

# Set defaults for vars modified by flags to this script
Expand Down Expand Up @@ -325,24 +319,6 @@ if hasArg cugraph-service || hasArg all; then
fi
fi

# Build and install the cugraph-pyg Python package
if hasArg cugraph-pyg || hasArg all; then
if hasArg --clean; then
cleanPythonDir ${REPODIR}/python/cugraph-pyg
else
python ${PYTHON_ARGS_FOR_INSTALL} ${REPODIR}/python/cugraph-pyg
fi
fi

# Install the cugraph-dgl extensions for DGL
if hasArg cugraph-dgl || hasArg all; then
if hasArg --clean; then
cleanPythonDir ${REPODIR}/python/cugraph-dgl
else
python ${PYTHON_ARGS_FOR_INSTALL} ${REPODIR}/python/cugraph-dgl
fi
fi

# Build the docs
if hasArg docs || hasArg all; then
if [ ! -d ${LIBCUGRAPH_BUILD_DIR} ]; then
Expand Down
4 changes: 1 addition & 3 deletions ci/release/update-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ NEXT_UCXX_SHORT_TAG_PEP440=$(python -c "from packaging.version import Version; p
DEPENDENCIES=(
cudf
cugraph
cugraph-dgl
cugraph-pyg
cugraph-service-server
cugraph-service-client
cuxfilter
Expand All @@ -75,7 +73,7 @@ DEPENDENCIES=(
UCXX_DEPENDENCIES=(
ucx-py
)
for FILE in dependencies.yaml conda/environments/*.yaml python/cugraph-{pyg,dgl}/conda/*.yaml; do
for FILE in dependencies.yaml conda/environments/*.yaml; do
for DEP in "${DEPENDENCIES[@]}"; do
sed_runner "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*,>=0.0.0a0/g" "${FILE}"
done
Expand Down
9 changes: 0 additions & 9 deletions ci/run_cugraph_dgl_pytests.sh

This file was deleted.

18 changes: 0 additions & 18 deletions ci/run_cugraph_pyg_pytests.sh

This file was deleted.

7 changes: 0 additions & 7 deletions ci/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,6 @@ if hasArg "--run-python-tests"; then
pytest -sv -m sg -m "managedmem_on and poolallocator_on and tiny" --benchmark-disable
echo "Ran Python benchmarks for cuGraph (running as tests) : return code was: $?, test script exit code is now: $EXITCODE"

echo "Python pytest for cugraph_pyg (single-GPU only)..."
conda list
cd ${CUGRAPH_ROOT}/python/cugraph-pyg/cugraph_pyg
# rmat is not tested because of MG testing
pytest -sv -m sg --cache-clear --junitxml=${CUGRAPH_ROOT}/junit-cugraph-pytests.xml -v --cov-config=.coveragerc --cov=cugraph_pyg --cov-report=xml:${WORKSPACE}/python/cugraph_pyg/cugraph-coverage.xml --cov-report term --ignore=raft --benchmark-disable
echo "Ran Python pytest for cugraph_pyg : return code was: $?, test script exit code is now: $EXITCODE"

echo "Python pytest for cugraph-service (single-GPU only)..."
cd ${CUGRAPH_ROOT}/python/cugraph-service
pytest -sv --cache-clear --junitxml=${CUGRAPH_ROOT}/junit-cugraph-service-pytests.xml --benchmark-disable -k "not mg" ./tests
Expand Down
1 change: 0 additions & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ channels:
- rapidsai
- rapidsai-nightly
- dask/label/dev
- dglteam/label/th23_cu118
- conda-forge
- nvidia
dependencies:
Expand Down
1 change: 0 additions & 1 deletion conda/environments/all_cuda-125_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ channels:
- rapidsai
- rapidsai-nightly
- dask/label/dev
- dglteam/label/th23_cu118
- conda-forge
- nvidia
dependencies:
Expand Down
7 changes: 0 additions & 7 deletions conda/recipes/cugraph-dgl/build.sh

This file was deleted.

46 changes: 0 additions & 46 deletions conda/recipes/cugraph-dgl/meta.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions conda/recipes/cugraph-pyg/build.sh

This file was deleted.

19 changes: 0 additions & 19 deletions conda/recipes/cugraph-pyg/conda_build_config.yaml

This file was deleted.

50 changes: 0 additions & 50 deletions conda/recipes/cugraph-pyg/meta.yaml

This file was deleted.

Loading
Loading