From 26c7d07cb89185beffa542dc269fa50a39fdb175 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 21 Oct 2024 11:24:33 -0500 Subject: [PATCH] remove docs support in build.sh, other small cleanup --- build.sh | 39 ------------------------------- ci/build_wheel_pylibwholegraph.sh | 1 - ci/test_wheel.sh | 6 ++--- ci/wheel_smoke_test_cugraph.py | 37 ----------------------------- 4 files changed, 3 insertions(+), 80 deletions(-) delete mode 100644 ci/wheel_smoke_test_cugraph.py diff --git a/build.sh b/build.sh index 16c68f5..edece26 100755 --- a/build.sh +++ b/build.sh @@ -29,7 +29,6 @@ VALIDARGS=" pylibwholegraph libwholegraph tests - docs all -v -g @@ -50,7 +49,6 @@ HELP="$0 [ ...] [ ...] pylibwholegraph - build the pylibwholegraph Python package libwholegraph - build the libwholegraph library tests - build the C++ tests - docs - build the docs all - build everything and is: -v - verbose build mode @@ -260,40 +258,3 @@ if hasArg cugraph-dgl || buildDefault ||hasArg all; then 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 - mkdir -p ${LIBCUGRAPH_BUILD_DIR} - cd ${LIBCUGRAPH_BUILD_DIR} - cmake -B "${LIBCUGRAPH_BUILD_DIR}" -S "${REPODIR}/cpp" \ - -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \ - -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ - ${CMAKE_GENERATOR_OPTION} \ - ${CMAKE_VERBOSE_OPTION} - fi - - for PROJECT in libcugraphops libwholegraph; do - XML_DIR="${REPODIR}/docs/cugraph/${PROJECT}" - rm -rf "${XML_DIR}" - mkdir -p "${XML_DIR}" - export XML_DIR_${PROJECT^^}="$XML_DIR" - - echo "downloading xml for ${PROJECT} into ${XML_DIR}. Environment variable XML_DIR_${PROJECT^^} is set to ${XML_DIR}" - curl -O "https://d1664dvumjb44w.cloudfront.net/${PROJECT}/xml_tar/${RAPIDS_VERSION}/xml.tar.gz" - tar -xzf xml.tar.gz -C "${XML_DIR}" - rm "./xml.tar.gz" - done - - cd ${LIBCUGRAPH_BUILD_DIR} - cmake --build "${LIBCUGRAPH_BUILD_DIR}" -j${PARALLEL_LEVEL} --target docs_cugraph ${VERBOSE_FLAG} - - echo "making libcugraph doc dir" - rm -rf ${REPODIR}/docs/cugraph/libcugraph - mkdir -p ${REPODIR}/docs/cugraph/libcugraph - - export XML_DIR_LIBCUGRAPH="${REPODIR}/cpp/doxygen/xml" - - cd ${REPODIR}/docs/cugraph - make html -fi diff --git a/ci/build_wheel_pylibwholegraph.sh b/ci/build_wheel_pylibwholegraph.sh index c9c6b59..4b3809f 100755 --- a/ci/build_wheel_pylibwholegraph.sh +++ b/ci/build_wheel_pylibwholegraph.sh @@ -1,4 +1,3 @@ - #!/bin/bash # Copyright (c) 2024, NVIDIA CORPORATION. diff --git a/ci/test_wheel.sh b/ci/test_wheel.sh index 39d2c1f..d9b6d31 100755 --- a/ci/test_wheel.sh +++ b/ci/test_wheel.sh @@ -12,9 +12,9 @@ mkdir -p ./dist RAPIDS_PY_CUDA_SUFFIX="$(rapids-wheel-ctk-name-gen ${RAPIDS_CUDA_VERSION})" RAPIDS_PY_WHEEL_NAME="${package_name}_${RAPIDS_PY_CUDA_SUFFIX}" rapids-download-wheels-from-s3 ./dist -# use 'ls' to expand wildcard before adding `[extra]` requires for pip -# pip creates wheels using python package names -python -m pip install $(ls ./dist/${python_package_name}*.whl)[test] +# echo to expand wildcard before adding `[extra]` requires for pip +python -m pip install \ + "$(echo ./dist/${python_package_name}*.whl)[test]" # Run smoke tests for aarch64 pull requests arch=$(uname -m) diff --git a/ci/wheel_smoke_test_cugraph.py b/ci/wheel_smoke_test_cugraph.py deleted file mode 100644 index fb88dcd..0000000 --- a/ci/wheel_smoke_test_cugraph.py +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (c) 2023-2024, NVIDIA CORPORATION. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -import cudf -import cugraph - -if __name__ == "__main__": - edgelist = cudf.DataFrame({"source": ["a", "b", "c"], "destination": ["b", "c", "d"]}) - - # directed graph - G = cugraph.Graph(directed=True) - G.from_cudf_edgelist(edgelist, store_transposed=True) - result_df = cugraph.pagerank(G) - - assert(result_df["pagerank"].sum() == 1.0) - assert(result_df.sort_values(by="pagerank")["vertex"].values_host.tolist() - == ["a", "b", "c", "d"]) - - # undirected graph - G = cugraph.Graph(directed=False) - G.from_cudf_edgelist(edgelist, store_transposed=True) - result_df = cugraph.pagerank(G) - - assert(result_df["pagerank"].sum() == 1.0) - result_df.set_index("vertex", inplace=True) - assert(result_df.loc["a", "pagerank"] == result_df.loc["d", "pagerank"]) - assert(result_df.loc["b", "pagerank"] == result_df.loc["c", "pagerank"])