From 9903ddace5cd8abf05ba489636aa77d328c871d0 Mon Sep 17 00:00:00 2001 From: Sevag Hanssian Date: Thu, 2 Feb 2023 10:43:08 -0500 Subject: [PATCH] Revert "Try disabling parallelism" This reverts commit 24ad67569c0ee95ffb7eb73db3b87d3e184b6335. --- .github/workflows/pr.yaml | 2 ++ cpp/CMakeLists.txt | 1 - cpp/cmake/thirdparty/get_raft.cmake | 5 ++--- python/cugraph/CMakeLists.txt | 4 ++-- python/pylibcugraph/CMakeLists.txt | 3 +-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 66444e77883..e2576e00866 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -74,6 +74,7 @@ jobs: extra-repo-sha: branch-23.02 extra-repo-deploy-key: CUGRAPH_OPS_SSH_PRIVATE_DEPLOY_KEY skbuild-configure-options: "-DDETECT_CONDA_ENV=OFF -DCUGRAPH_BUILD_WHEELS=ON -DFIND_CUGRAPH_CPP=OFF -DCPM_cugraph-ops_SOURCE=/project/cugraph-ops/" + skbuild-build-options: "-j8" wheel-tests-pylibcugraph: needs: wheel-build-pylibcugraph secrets: inherit @@ -98,6 +99,7 @@ jobs: extra-repo-deploy-key: CUGRAPH_OPS_SSH_PRIVATE_DEPLOY_KEY before-wheel: "RAPIDS_PY_WHEEL_NAME=pylibcugraph_cu11 rapids-download-wheels-from-s3 ./local-wheelhouse" skbuild-configure-options: "-DDETECT_CONDA_ENV=OFF -DCUGRAPH_BUILD_WHEELS=ON -DFIND_CUGRAPH_CPP=OFF -DCPM_cugraph-ops_SOURCE=/project/cugraph-ops/" + skbuild-build-options: "-j8" wheel-tests-cugraph: needs: wheel-build-cugraph secrets: inherit diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 5dd1308637b..fe65da84327 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -80,7 +80,6 @@ option(CMAKE_CUDA_LINEINFO "Enable the -lineinfo option for nvcc (useful for cud option(BUILD_TESTS "Configure CMake to build tests" ON) option(USE_CUGRAPH_OPS "Enable all functions that call cugraph-ops" ON) option(USE_RAFT_STATIC "Build raft as a static library" OFF) -option(CUGRAPH_COMPILE_RAFT_DIST_LIBS "Compile the raft library instead of using it header-only" ON) option(CUDA_STATIC_RUNTIME "Statically link the CUDA toolkit runtime and libraries" OFF) option(CUGRAPH_USE_CUGRAPH_OPS_STATIC "Build and statically link the cugraph-ops library" OFF) option(CUGRAPH_EXCLUDE_CUGRAPH_OPS_FROM_ALL "Exclude cugraph-ops targets from cuGraph's 'all' target" OFF) diff --git a/cpp/cmake/thirdparty/get_raft.cmake b/cpp/cmake/thirdparty/get_raft.cmake index d94827b4e81..43226664e5d 100644 --- a/cpp/cmake/thirdparty/get_raft.cmake +++ b/cpp/cmake/thirdparty/get_raft.cmake @@ -19,7 +19,7 @@ set(CUGRAPH_BRANCH_VERSION_raft "${CUGRAPH_VERSION_MAJOR}.${CUGRAPH_VERSION_MINO function(find_and_configure_raft) - set(oneValueArgs VERSION FORK PINNED_TAG CLONE_ON_PIN USE_RAFT_STATIC COMPILE_RAFT_DIST_LIBS) + set(oneValueArgs VERSION FORK PINNED_TAG CLONE_ON_PIN USE_RAFT_STATIC) cmake_parse_arguments(PKG "" "${oneValueArgs}" "" ${ARGN} ) if(PKG_CLONE_ON_PIN AND NOT PKG_PINNED_TAG STREQUAL "branch-${CUGRAPH_BRANCH_VERSION_raft}") @@ -47,7 +47,7 @@ function(find_and_configure_raft) SOURCE_SUBDIR cpp OPTIONS "RAFT_COMPILE_LIBRARIES OFF" - "RAFT_COMPILE_DIST_LIBRARY ${PKG_COMPILE_RAFT_DIST_LIBS}" + "RAFT_COMPILE_DIST_LIBRARY ON" "BUILD_TESTS OFF" "BUILD_BENCH OFF" "BUILD_SHARED_LIBS ${BUILD_RAFT_SHARED}" @@ -74,5 +74,4 @@ find_and_configure_raft(VERSION ${CUGRAPH_MIN_VERSION_raft} # even if it's already installed. CLONE_ON_PIN ON USE_RAFT_STATIC ${USE_RAFT_STATIC} - COMPILE_RAFT_DIST_LIBS ${CUGRAPH_COMPILE_RAFT_DIST_LIBS} ) diff --git a/python/cugraph/CMakeLists.txt b/python/cugraph/CMakeLists.txt index ac3b0bc3fd9..9acce421b9d 100644 --- a/python/cugraph/CMakeLists.txt +++ b/python/cugraph/CMakeLists.txt @@ -1,5 +1,5 @@ # ============================================================================= -# Copyright (c) 2022-2023, NVIDIA CORPORATION. +# Copyright (c) 2022, 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 @@ -59,13 +59,13 @@ if(NOT cugraph_FOUND) set(BUILD_TESTS OFF) set(BUILD_CUGRAPH_MG_TESTS OFF) set(BUILD_CUGRAPH_OPS_CPP_TESTS OFF) + set(BUILD_CUGRAPH_OPS_CPP_TESTS OFF) set(_exclude_from_all "") if(CUGRAPH_BUILD_WHEELS) # Statically link dependencies if building wheels set(CUDA_STATIC_RUNTIME ON) set(USE_RAFT_STATIC ON) - set(CUGRAPH_COMPILE_RAFT_DIST_LIBS OFF) set(CUGRAPH_USE_CUGRAPH_OPS_STATIC ON) set(CUGRAPH_EXCLUDE_CUGRAPH_OPS_FROM_ALL ON) set(ALLOW_CLONE_CUGRAPH_OPS ON) diff --git a/python/pylibcugraph/CMakeLists.txt b/python/pylibcugraph/CMakeLists.txt index 1316be28ed3..eb0ecd42457 100644 --- a/python/pylibcugraph/CMakeLists.txt +++ b/python/pylibcugraph/CMakeLists.txt @@ -1,5 +1,5 @@ # ============================================================================= -# Copyright (c) 2022-2023, NVIDIA CORPORATION. +# Copyright (c) 2022, 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 @@ -65,7 +65,6 @@ if (NOT cugraph_FOUND) # Statically link dependencies if building wheels set(CUDA_STATIC_RUNTIME ON) set(USE_RAFT_STATIC ON) - set(CUGRAPH_COMPILE_RAFT_DIST_LIBS OFF) set(CUGRAPH_USE_CUGRAPH_OPS_STATIC ON) set(CUGRAPH_EXCLUDE_CUGRAPH_OPS_FROM_ALL ON) set(ALLOW_CLONE_CUGRAPH_OPS ON)