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 2 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
26 changes: 1 addition & 25 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
cugraph-equivariant
nx-cugraph
cpp-mgtests
Expand Down Expand Up @@ -58,8 +56,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
cugraph-equivariant - build the cugraph-equivariant Python package
nx-cugraph - build the nx-cugraph Python package
cpp-mgtests - build libcugraph and libcugraph_etl MG tests. Builds MPI communicator, adding MPI as a dependency.
Expand Down Expand Up @@ -88,12 +84,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 @@ -212,7 +206,7 @@ if hasArg uninstall; then
# removes the latest one and leaves the others installed. build.sh uninstall
# can be run multiple times to remove all of them, but that is not obvious.
pip uninstall -y pylibcugraph cugraph cugraph-service-client cugraph-service-server \
cugraph-dgl cugraph-pyg cugraph-equivariant nx-cugraph
cugraph-equivariant nx-cugraph
fi

if hasArg clean; then
Expand Down Expand Up @@ -330,24 +324,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 and install the cugraph-equivariant Python package
if hasArg cugraph-equivariant || hasArg all; then
if hasArg --clean; then
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
153 changes: 5 additions & 148 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ files:
- depends_on_pytorch
- python_run_cugraph
- python_run_nx_cugraph
- python_run_cugraph_dgl
- python_run_cugraph_pyg
- test_notebook
- test_python_common
- test_python_cugraph
Expand Down Expand Up @@ -176,60 +174,6 @@ files:
includes:
- test_python_common
- test_python_nx_cugraph
py_build_cugraph_dgl:
output: pyproject
pyproject_dir: python/cugraph-dgl
extras:
table: build-system
includes:
- python_build_rapids
- python_build_wheel
py_run_cugraph_dgl:
output: pyproject
pyproject_dir: python/cugraph-dgl
extras:
table: project
includes:
- python_run_cugraph_dgl
# Deprecate pylibcugraphops
- depends_on_pylibcugraphops
py_test_cugraph_dgl:
output: pyproject
pyproject_dir: python/cugraph-dgl
extras:
table: project.optional-dependencies
key: test
includes:
- test_python_common
- depends_on_pylibwholegraph
- depends_on_pytorch
py_build_cugraph_pyg:
output: pyproject
pyproject_dir: python/cugraph-pyg
extras:
table: build-system
includes:
- python_build_rapids
- python_build_wheel
py_run_cugraph_pyg:
output: pyproject
pyproject_dir: python/cugraph-pyg
extras:
table: project
includes:
- python_run_cugraph_pyg
# Deprecate pylibcugraphops
- depends_on_pylibcugraphops
py_test_cugraph_pyg:
output: pyproject
pyproject_dir: python/cugraph-pyg
extras:
table: project.optional-dependencies
key: test
includes:
- test_python_common
- depends_on_pylibwholegraph
- depends_on_pytorch
py_build_cugraph_equivariant:
output: pyproject
pyproject_dir: python/cugraph-equivariant
Expand Down Expand Up @@ -297,33 +241,10 @@ files:
includes:
- test_python_common
- test_python_cugraph
cugraph_dgl_dev:
matrix:
cuda: ["11.8"]
output: conda
conda_dir: python/cugraph-dgl/conda
includes:
- checks
# Deprecate pylibcugraphops
- depends_on_pylibcugraphops
- cugraph_dgl_dev
- test_python_common
cugraph_pyg_dev:
matrix:
cuda: ["11.8"]
output: conda
conda_dir: python/cugraph-pyg/conda
includes:
- checks
# Deprecate pylibcugraphops
- depends_on_pylibcugraphops
- cugraph_pyg_dev
- test_python_common
channels:
- rapidsai
- rapidsai-nightly
- dask/label/dev
- dglteam/label/th23_cu118
- conda-forge
- nvidia
dependencies:
Expand Down Expand Up @@ -559,50 +480,6 @@ dependencies:
packages:
- networkx>=3.0
- *numpy
python_run_cugraph_dgl:
common:
- output_types: [conda, pyproject]
packages:
- *numba
- *numpy
specific:
- output_types: [pyproject]
matrices:
- matrix:
cuda: "11.*"
cuda_suffixed: "true"
packages:
- &cugraph_cu11 cugraph-cu11==24.12.*,>=0.0.0a0
- matrix:
cuda: "12.*"
cuda_suffixed: "true"
packages:
- &cugraph_cu12 cugraph-cu12==24.12.*,>=0.0.0a0
- matrix:
packages:
- &cugraph_unsuffixed cugraph==24.12.*,>=0.0.0a0
python_run_cugraph_pyg:
common:
- output_types: [conda, pyproject]
packages:
- *numba
- *numpy
specific:
- output_types: [pyproject]
matrices:
- matrix:
cuda: "11.*"
cuda_suffixed: "true"
packages:
- *cugraph_cu11
- matrix:
cuda: "12.*"
cuda_suffixed: "true"
packages:
- *cugraph_cu12
- matrix:
packages:
- *cugraph_unsuffixed
python_run_cugraph_service_client:
common:
- output_types: [conda, pyproject]
Expand All @@ -627,19 +504,19 @@ dependencies:
cuda: "11.*"
cuda_suffixed: "true"
packages:
- *cugraph_cu11
- &cugraph_cu11 cugraph-cu11==24.12.*,>=0.0.0a0
- cugraph-service-client-cu11==24.12.*,>=0.0.0a0
- *ucx_py_cu11
- matrix:
cuda: "12.*"
cuda_suffixed: "true"
packages:
- *cugraph_cu12
- &cugraph_cu12 cugraph-cu12==24.12.*,>=0.0.0a0
- cugraph-service-client-cu12==24.12.*,>=0.0.0a0
- *ucx_py_cu12
- matrix:
packages:
- *cugraph_unsuffixed
- &cugraph_unsuffixed cugraph==24.12.*,>=0.0.0a0
- cugraph-service-client==24.12.*,>=0.0.0a0
- *ucx_py_unsuffixed
test_cpp:
Expand Down Expand Up @@ -689,32 +566,12 @@ dependencies:
packages:
# not needed by nx-cugraph tests, but is required for running networkx tests
- pytest-mpl
cugraph_dgl_dev:
common:
- output_types: [conda]
packages:
- *cugraph_unsuffixed
# ceiling could be removed when this is fixed:
# https://github.com/conda-forge/pytorch-cpu-feedstock/issues/254
- &pytorch_conda pytorch>=2.3,<2.4.0a0
- pytorch-cuda==11.8
- &tensordict tensordict>=0.1.2
- dgl>=2.4.0.cu*
cugraph_pyg_dev:
common:
- output_types: [conda]
packages:
- *cugraph_unsuffixed
- *pytorch_conda
- pytorch-cuda==11.8
- *tensordict
- pytorch_geometric>=2.5,<2.6

depends_on_pytorch:
common:
- output_types: [conda]
packages:
- *pytorch_conda
- &pytorch_conda pytorch>=2.3,<2.4.0a0
- torchdata
- pydantic
- ogb
Expand All @@ -735,7 +592,7 @@ dependencies:
- matrix: {cuda: "12.*"}
packages:
- &pytorch_pip torch>=2.3,<2.4.0a0
- *tensordict
- &tensordict tensordict>=0.1.2
- matrix: {cuda: "11.*"}
packages:
- *pytorch_pip
Expand Down
1 change: 0 additions & 1 deletion python/cugraph-dgl/LICENSE

This file was deleted.

57 changes: 0 additions & 57 deletions python/cugraph-dgl/README.md

This file was deleted.

24 changes: 0 additions & 24 deletions python/cugraph-dgl/conda/cugraph_dgl_dev_cuda-118.yaml

This file was deleted.

1 change: 0 additions & 1 deletion python/cugraph-dgl/cugraph_dgl/VERSION

This file was deleted.

Loading
Loading