From 93f906fe8510ef0f34dd356e562eabee75a1e369 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 18 Dec 2024 09:37:30 -0600 Subject: [PATCH 1/2] remove unused dependencies.yaml entries, other small cleanup --- .github/workflows/pr.yaml | 3 -- build.sh | 2 +- ci/release/update-version.sh | 10 ---- ci/test.sh | 2 +- .../all_cuda-118_arch-x86_64.yaml | 2 - .../all_cuda-121_arch-x86_64.yaml | 2 - .../all_cuda-124_arch-x86_64.yaml | 2 - cpp/cmake/thirdparty/get_raft.cmake | 1 + dependencies.yaml | 52 ------------------- python/pylibwholegraph/CMakeLists.txt | 8 --- 10 files changed, 3 insertions(+), 81 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index f87b30e..0499892 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -42,7 +42,6 @@ jobs: - '!.devcontainer/**' - '!CONTRIBUTING.md' - '!README.md' - - '!docs/**' - '!img/**' - '!mg_utils/**' - '!notebooks/**' @@ -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/**' diff --git a/build.sh b/build.sh index c6f4955..526f91e 100755 --- a/build.sh +++ b/build.sh @@ -45,7 +45,7 @@ VALIDARGS=" HELP="$0 [ ...] [ ...] where 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 diff --git a/ci/release/update-version.sh b/ci/release/update-version.sh index 6782064..8faa75f 100755 --- a/ci/release/update-version.sh +++ b/ci/release/update-version.sh @@ -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" @@ -52,9 +51,6 @@ DEPENDENCIES=( cugraph cugraph-dgl cugraph-pyg - cugraph-service-server - cugraph-service-client - cuxfilter dask-cuda dask-cudf libcudf @@ -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 diff --git a/ci/test.sh b/ci/test.sh index 8559443..ec34fdf 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -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 diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 33af47b..bd59b0e 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -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 @@ -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 diff --git a/conda/environments/all_cuda-121_arch-x86_64.yaml b/conda/environments/all_cuda-121_arch-x86_64.yaml index caed57c..d6a2e3f 100644 --- a/conda/environments/all_cuda-121_arch-x86_64.yaml +++ b/conda/environments/all_cuda-121_arch-x86_64.yaml @@ -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 @@ -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 diff --git a/conda/environments/all_cuda-124_arch-x86_64.yaml b/conda/environments/all_cuda-124_arch-x86_64.yaml index 53c8825..54c95a3 100644 --- a/conda/environments/all_cuda-124_arch-x86_64.yaml +++ b/conda/environments/all_cuda-124_arch-x86_64.yaml @@ -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 @@ -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 diff --git a/cpp/cmake/thirdparty/get_raft.cmake b/cpp/cmake/thirdparty/get_raft.cmake index 7855603..0f73943 100644 --- a/cpp/cmake/thirdparty/get_raft.cmake +++ b/cpp/cmake/thirdparty/get_raft.cmake @@ -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" ) diff --git a/dependencies.yaml b/dependencies.yaml index 0e08523..85bdac9 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -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 @@ -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 diff --git a/python/pylibwholegraph/CMakeLists.txt b/python/pylibwholegraph/CMakeLists.txt index fd26fa9..18a9846 100644 --- a/python/pylibwholegraph/CMakeLists.txt +++ b/python/pylibwholegraph/CMakeLists.txt @@ -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 _ROOT here to take precedence over any other package if (DEFINED ENV{LIBWHOLEGRAPH_DIR}) set(wholegraph_ROOT "$ENV{LIBWHOLEGRAPH_DIR}") @@ -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 From 18b049a95c2ac024de6bd024e7ccefa6da7fd38b Mon Sep 17 00:00:00 2001 From: James Lamb Date: Wed, 18 Dec 2024 09:39:52 -0600 Subject: [PATCH 2/2] more commented-out cmake --- cpp/CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 1110614..a4eecbd 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -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 ) @@ -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