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 unused dependencies.yaml entries, other small cleanup #98

Merged
merged 2 commits into from
Dec 20, 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 .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ jobs:
- '!.devcontainer/**'
- '!CONTRIBUTING.md'
- '!README.md'
- '!docs/**'
- '!img/**'
- '!mg_utils/**'
- '!notebooks/**'
Expand All @@ -53,14 +52,12 @@ jobs:
- '!.devcontainer/**'
- '!CONTRIBUTING.md'
- '!README.md'
- '!docs/**'
- '!readme_pages/**'
test_python:
- '**'
- '!.devcontainer/**'
- '!CONTRIBUTING.md'
- '!README.md'
- '!docs/**'
- '!img/**'
- '!notebooks/**'
- '!readme_pages/**'
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ VALIDARGS="
HELP="$0 [<target> ...] [<flag> ...]
where <target> is:
clean - remove all existing build artifacts and configuration (start over)
uninstall - uninstall libcugraph and cugraph from a prior build/install (see also -n)
uninstall - uninstall libwholegraph and GNN Python packages from a prior build/install (see also -n)
cugraph-pyg - build the cugraph-pyg Python package
cugraph-dgl - build the cugraph-dgl extensions for DGL
pylibwholegraph - build the pylibwholegraph Python package
Expand Down
10 changes: 0 additions & 10 deletions ci/release/update-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ CURRENT_SHORT_TAG=${CURRENT_MAJOR}.${CURRENT_MINOR}
NEXT_MAJOR=$(echo $NEXT_FULL_TAG | awk '{split($0, a, "."); print a[1]}')
NEXT_MINOR=$(echo $NEXT_FULL_TAG | awk '{split($0, a, "."); print a[2]}')
NEXT_SHORT_TAG=${NEXT_MAJOR}.${NEXT_MINOR}
NEXT_UCX_PY_VERSION="$(curl -sL https://version.gpuci.io/rapids/${NEXT_SHORT_TAG})"

echo "Preparing release $CURRENT_TAG => $NEXT_FULL_TAG"

Expand All @@ -52,9 +51,6 @@ DEPENDENCIES=(
cugraph
cugraph-dgl
cugraph-pyg
cugraph-service-server
cugraph-service-client
cuxfilter
dask-cuda
dask-cudf
libcudf
Expand All @@ -65,21 +61,15 @@ DEPENDENCIES=(
pylibcugraph
pylibcugraphops
pylibwholegraph
pylibraft
pyraft
raft-dask
rmm
ucx-py
rapids-dask-dependency
)
for DEP in "${DEPENDENCIES[@]}"; do
for FILE in dependencies.yaml conda/environments/*.yaml python/cugraph-{pyg,dgl}/conda/*.yaml; do
sed_runner "/-.* ${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*/==${NEXT_SHORT_TAG_PEP440}.*/g" "${FILE}"
sed_runner "/-.* ucx-py==/ s/==.*/==${NEXT_UCX_PY_VERSION}.*/g" "${FILE}"
done
for FILE in python/**/pyproject.toml; do
sed_runner "/\"${DEP}\(-cu[[:digit:]]\{2\}\)\{0,1\}==/ s/==.*\"/==${NEXT_SHORT_TAG_PEP440}.*\"/g" "${FILE}"
sed_runner "/\"ucx-py==/ s/==.*\"/==${NEXT_UCX_PY_VERSION}.*\"/g" "${FILE}"
done
done

Expand Down
2 changes: 1 addition & 1 deletion ci/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ if hasArg "--run-python-tests"; then

echo "Python pytest for cugraph-dgl (single-GPU only)..."
cd ${CUGRAPH_ROOT}/python/cugraph-dgl
pytest -sv --cache-clear --junitxml=${CUGRAPH_ROOT}/junit-cugraph-service-pytests.xml --benchmark-disable -k "not mg" ./tests
pytest -sv --cache-clear --junitxml=${CUGRAPH_ROOT}/junit-cugraph-dgl-pytests.xml --benchmark-disable -k "not mg" ./tests
echo "Ran Python pytest for cugraph-dgl : return code was: $?, test script exit code is now: $EXITCODE"
fi

Expand Down
2 changes: 0 additions & 2 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ dependencies:
- pre-commit
- pydantic
- pylibcugraphops==25.2.*,>=0.0.0a0
- pylibraft==25.2.*,>=0.0.0a0
- pytest
- pytest-benchmark
- pytest-cov
Expand All @@ -43,7 +42,6 @@ dependencies:
- pytorch-cuda=11.8
- pytorch>=2.3
- pytorch_geometric>=2.5,<2.6
- raft-dask==25.2.*,>=0.0.0a0
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- rmm==25.2.*,>=0.0.0a0
- scikit-build-core>=0.10.0
Expand Down
2 changes: 0 additions & 2 deletions conda/environments/all_cuda-121_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ dependencies:
- pre-commit
- pydantic
- pylibcugraphops==25.2.*,>=0.0.0a0
- pylibraft==25.2.*,>=0.0.0a0
- pytest
- pytest-benchmark
- pytest-cov
Expand All @@ -49,7 +48,6 @@ dependencies:
- pytorch-cuda=12.1
- pytorch>=2.3
- pytorch_geometric>=2.5,<2.6
- raft-dask==25.2.*,>=0.0.0a0
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- rmm==25.2.*,>=0.0.0a0
- scikit-build-core>=0.10.0
Expand Down
2 changes: 0 additions & 2 deletions conda/environments/all_cuda-124_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ dependencies:
- pre-commit
- pydantic
- pylibcugraphops==25.2.*,>=0.0.0a0
- pylibraft==25.2.*,>=0.0.0a0
- pytest
- pytest-benchmark
- pytest-cov
Expand All @@ -49,7 +48,6 @@ dependencies:
- pytorch-cuda=12.4
- pytorch>=2.3
- pytorch_geometric>=2.5,<2.6
- raft-dask==25.2.*,>=0.0.0a0
- rapids-build-backend>=0.3.0,<0.4.0.dev0
- rmm==25.2.*,>=0.0.0a0
- scikit-build-core>=0.10.0
Expand Down
4 changes: 1 addition & 3 deletions cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,6 @@ foreach(file IN LISTS WHOLEGRAPH_PUBLIC_HEADERS)
string(JOIN "/" out_path "include" ${file_out_})
install(FILES "${WHOLEGRAPH_INCLUDE_DIR}/${file}"
DESTINATION "${out_path}")
#install(FILES "${WHOLEGRAPH_INCLUDE_DIR}/${file}"
# DESTINATION "${file}")
endforeach()

rapids_cmake_install_lib_dir( lib_dir )
Expand Down Expand Up @@ -329,7 +327,7 @@ rapids_export(
DOCUMENTATION doc_string
FINAL_CODE_BLOCK code_string)

################################################################################
################################################################################
# - make documentation ---------------------------------------------------------
# requires doxygen and graphviz to be installed
# from build directory, run make doxygen
Expand Down
1 change: 1 addition & 0 deletions cpp/cmake/thirdparty/get_raft.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ function(find_and_configure_raft)
"RAFT_COMPILE_DIST_LIBRARY OFF"
"BUILD_TESTS OFF"
"BUILD_BENCH OFF"
"BUILD_PRIMS_BENCH OFF"
"RAFT_ENABLE_cuco_DEPENDENCY OFF"
)

Expand Down
52 changes: 0 additions & 52 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ files:
- depends_on_cugraph
- depends_on_cudf
- depends_on_dask_cudf
- depends_on_pylibraft
- depends_on_raft_dask
- depends_on_pylibcugraphops
- depends_on_cupy
- depends_on_pytorch
Expand Down Expand Up @@ -592,56 +590,6 @@ dependencies:
- dask-cudf-cu11==25.2.*,>=0.0.0a0
- {matrix: null, packages: [*dask_cudf_unsuffixed]}

depends_on_pylibraft:
common:
- output_types: conda
packages:
- &pylibraft_unsuffixed pylibraft==25.2.*,>=0.0.0a0
- output_types: requirements
packages:
# pip recognizes the index as a global option for the requirements.txt file
- --extra-index-url=https://pypi.nvidia.com
- --extra-index-url=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple
specific:
- output_types: [requirements, pyproject]
matrices:
- matrix:
cuda: "12.*"
cuda_suffixed: "true"
packages:
- pylibraft-cu12==25.2.*,>=0.0.0a0
- matrix:
cuda: "11.*"
cuda_suffixed: "true"
packages:
- pylibraft-cu11==25.2.*,>=0.0.0a0
- {matrix: null, packages: [*pylibraft_unsuffixed]}

depends_on_raft_dask:
common:
- output_types: conda
packages:
- &raft_dask_unsuffixed raft-dask==25.2.*,>=0.0.0a0
- output_types: requirements
packages:
# pip recognizes the index as a global option for the requirements.txt file
- --extra-index-url=https://pypi.nvidia.com
- --extra-index-url=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple
specific:
- output_types: [requirements, pyproject]
matrices:
- matrix:
cuda: "12.*"
cuda_suffixed: "true"
packages:
- raft-dask-cu12==25.2.*,>=0.0.0a0
- matrix:
cuda: "11.*"
cuda_suffixed: "true"
packages:
- raft-dask-cu11==25.2.*,>=0.0.0a0
- {matrix: null, packages: [*raft_dask_unsuffixed]}

depends_on_pylibcugraph:
common:
- output_types: conda
Expand Down
8 changes: 0 additions & 8 deletions python/pylibwholegraph/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,6 @@ include(../../cpp/cmake/thirdparty/get_raft.cmake)
##############################################################################
# - Dependencies ------------------------------------------------------------

#find_package(PythonInterp 3 REQUIRED)

#include(${CMAKE_CURRENT_LIST_DIR}/../cmake/thirdparty/nanobind.cmake)

# use <package>_ROOT here to take precedence over any other package
if (DEFINED ENV{LIBWHOLEGRAPH_DIR})
set(wholegraph_ROOT "$ENV{LIBWHOLEGRAPH_DIR}")
Expand Down Expand Up @@ -158,7 +154,3 @@ message(STATUS "PYLIBWHOLEGRAPH: CXX_DEFINITIONS='${CXX_DEFINITIONS}'")
set(WHOLEGRAPH_CPP_TARGET "wholegraph::wholegraph" CACHE STRING "libwholegraph target name")

add_subdirectory(pylibwholegraph/binding)

# when used without setup.py, command is like:
# export LIBWHOLEGRAPH_DIR=`pwd`/../../cpp/build/install
# cmake ../ -DSKBUILD=ON
Loading