From 4793c07739e96f08e91d05c5101600126a30d2b2 Mon Sep 17 00:00:00 2001 From: Jordan Jacobelli Date: Mon, 22 Feb 2021 10:07:06 +0100 Subject: [PATCH 1/3] ENH Pass ccache variables to conda recipe Signed-off-by: Jordan Jacobelli --- conda/recipes/libcugraph/meta.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/conda/recipes/libcugraph/meta.yaml b/conda/recipes/libcugraph/meta.yaml index cd83e5a9b7a..8f7495eab3c 100644 --- a/conda/recipes/libcugraph/meta.yaml +++ b/conda/recipes/libcugraph/meta.yaml @@ -21,6 +21,13 @@ build: - CUDAHOSTCXX - PARALLEL_LEVEL - VERSION_SUFFIX + - CCACHE_DIR + - CCACHE_NOHASHDIR + - CCACHE_COMPILERCHECK + - CMAKE_GENERATOR + - CMAKE_C_COMPILER_LAUNCHER + - CMAKE_CXX_COMPILER_LAUNCHER + - CMAKE_CUDA_COMPILER_LAUNCHER requirements: build: From b3217c6fd8dce7ab17cc7c297a3448e8d6ce0f66 Mon Sep 17 00:00:00 2001 From: Jordan Jacobelli Date: Wed, 17 Feb 2021 16:36:00 +0100 Subject: [PATCH 2/3] ENH Build with cmake --build Signed-off-by: Jordan Jacobelli --- build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index ef210e841c6..54634e2ca6e 100755 --- a/build.sh +++ b/build.sh @@ -46,7 +46,7 @@ CUGRAPH_BUILD_DIR=${REPODIR}/python/build BUILD_DIRS="${LIBCUGRAPH_BUILD_DIR} ${CUGRAPH_BUILD_DIR}" # Set defaults for vars modified by flags to this script -VERBOSE="" +VERBOSE_FLAG="" BUILD_TYPE=Release INSTALL_TARGET=install BUILD_DISABLE_DEPRECATION_WARNING=ON @@ -86,7 +86,7 @@ fi # Process flags if hasArg -v; then - VERBOSE=1 + VERBOSE_FLAG="-v" fi if hasArg -g; then BUILD_TYPE=Debug @@ -143,7 +143,7 @@ if buildAll || hasArg libcugraph; then -DBUILD_STATIC_FAISS=${BUILD_STATIC_FAISS} \ -DBUILD_CUGRAPH_MG_TESTS=${BUILD_CPP_MG_TESTS} \ ${REPODIR}/cpp - make -j${PARALLEL_LEVEL} VERBOSE=${VERBOSE} ${INSTALL_TARGET} + cmake --build "${LIBCUGRAPH_BUILD_DIR}" -j${PARALLEL_LEVEL} --target ${INSTALL_TARGET} ${VERBOSE_FLAG} fi # Build and install the cugraph Python package @@ -169,7 +169,7 @@ if buildAll || hasArg docs; then -DBUILD_STATIC_FAISS=${BUILD_STATIC_FAISS} fi cd ${LIBCUGRAPH_BUILD_DIR} - make -j${PARALLEL_LEVEL} VERBOSE=${VERBOSE} docs_cugraph + cmake --build "${LIBCUGRAPH_BUILD_DIR}" -j${PARALLEL_LEVEL} --target docs_cugraph ${VERBOSE_FLAG} cd ${REPODIR}/docs make html fi From a16c20f8cd2050a2a34fe1af370574fb817e7278 Mon Sep 17 00:00:00 2001 From: Jordan Jacobelli Date: Fri, 19 Feb 2021 13:54:49 +0100 Subject: [PATCH 3/3] ENH Use Ninja to build in CI Signed-off-by: Jordan Jacobelli --- ci/cpu/build.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ci/cpu/build.sh b/ci/cpu/build.sh index 2c6dc899be2..d69448cda4e 100755 --- a/ci/cpu/build.sh +++ b/ci/cpu/build.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (c) 2018-2020, NVIDIA CORPORATION. +# Copyright (c) 2018-2021, NVIDIA CORPORATION. ######################################### # cuGraph CPU conda build script for CI # ######################################### @@ -24,6 +24,9 @@ fi export GPUCI_CONDA_RETRY_MAX=1 export GPUCI_CONDA_RETRY_SLEEP=30 +# Use Ninja to build +export CMAKE_GENERATOR="Ninja" + ################################################################################ # SETUP - Check environment ################################################################################