From 4e7d3d87c577910b836d00d155ee65502232f20f Mon Sep 17 00:00:00 2001 From: BradReesWork Date: Thu, 5 Oct 2023 14:14:49 -0400 Subject: [PATCH 1/3] new build all option --- build.sh | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/build.sh b/build.sh index 8dca89aeedd..b2f41350e4d 100755 --- a/build.sh +++ b/build.sh @@ -24,14 +24,15 @@ VALIDARGS=" uninstall libcugraph libcugraph_etl + pylibcugraph cugraph cugraph-service - pylibcugraph - cpp-mgtests cugraph-pyg cugraph-dgl nx-cugraph + cpp-mgtests docs + all -v -g -n @@ -52,13 +53,14 @@ HELP="$0 [ ...] [ ...] libcugraph - build libcugraph.so and SG test binaries libcugraph_etl - build libcugraph_etl.so and SG test binaries pylibcugraph - build the pylibcugraph Python package - cugraph-pyg - build the cugraph-pyg Python package cugraph - build the cugraph Python package - nx-cugraph - build the nx-cugraph Python package cugraph-service - build the cugraph-service_client and cugraph-service_server Python package - cpp-mgtests - build libcugraph and libcugraph_etl MG tests. Builds MPI communicator, adding MPI as a dependency. + cugraph-pyg - build the cugraph-pyg Python package cugraph-dgl - build the cugraph-dgl extensions for DGL + nx-cugraph - build the nx-cugraph Python package + cpp-mgtests - build libcugraph and libcugraph_etl MG tests. Builds MPI communicator, adding MPI as a dependency. docs - build the docs + all - build everything and is: -v - verbose build mode -g - build for debug @@ -119,7 +121,7 @@ function hasArg { (( ${NUMARGS} != 0 )) && (echo " ${ARGS} " | grep -q " $1 ") } -function buildAll { +function buildDefault { (( ${NUMARGS} == 0 )) || !(echo " ${ARGS} " | grep -q " [^-][a-zA-Z0-9\_\-]\+ ") } @@ -170,7 +172,7 @@ fi if hasArg --without_cugraphops; then BUILD_WITH_CUGRAPHOPS=OFF fi -if hasArg cpp-mgtests; then +if hasArg cpp-mgtests || hasArg all; then BUILD_CPP_MG_TESTS=ON fi if hasArg --cmake_default_generator; then @@ -240,7 +242,7 @@ fi ################################################################################ # Configure, build, and install libcugraph -if buildAll || hasArg libcugraph; then +if buildDefault || hasArg libcugraph || hasArg all; then if hasArg --clean; then if [ -d ${LIBCUGRAPH_BUILD_DIR} ]; then find ${LIBCUGRAPH_BUILD_DIR} -mindepth 1 -delete @@ -270,7 +272,7 @@ if buildAll || hasArg libcugraph; then fi # Configure, build, and install libcugraph_etl -if buildAll || hasArg libcugraph_etl; then +if buildDefault || hasArg libcugraph_etl || hasArg all; then if hasArg --clean; then if [ -d ${LIBCUGRAPH_ETL_BUILD_DIR} ]; then find ${LIBCUGRAPH_ETL_BUILD_DIR} -mindepth 1 -delete @@ -301,7 +303,7 @@ if buildAll || hasArg libcugraph_etl; then fi # Build, and install pylibcugraph -if buildAll || hasArg pylibcugraph; then +if buildDefault || hasArg pylibcugraph || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/pylibcugraph else @@ -328,7 +330,7 @@ if buildAll || hasArg pylibcugraph; then fi # Build and install the cugraph Python package -if buildAll || hasArg cugraph; then +if buildDefault || hasArg cugraph || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/cugraph else @@ -355,7 +357,7 @@ if buildAll || hasArg cugraph; then fi # Install the cugraph-service-client and cugraph-service-server Python packages -if hasArg cugraph-service; then +if hasArg cugraph-service || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/cugraph-service else @@ -365,7 +367,7 @@ if hasArg cugraph-service; then fi # Build and install the cugraph-pyg Python package -if hasArg cugraph-pyg; then +if hasArg cugraph-pyg || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/cugraph-pyg else @@ -374,7 +376,7 @@ if hasArg cugraph-pyg; then fi # Install the cugraph-dgl extensions for DGL -if hasArg cugraph-dgl; then +if hasArg cugraph-dgl || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/cugraph-dgl else @@ -383,7 +385,7 @@ if hasArg cugraph-dgl; then fi # Build and install the nx-cugraph Python package -if hasArg nx-cugraph; then +if hasArg nx-cugraph || hasArg all; then if hasArg --clean; then cleanPythonDir ${REPODIR}/python/nx-cugraph else @@ -392,7 +394,7 @@ if hasArg nx-cugraph; then fi # Build the docs -if hasArg docs; then +if hasArg docs || hasArg all; then if [ ! -d ${LIBCUGRAPH_BUILD_DIR} ]; then mkdir -p ${LIBCUGRAPH_BUILD_DIR} cd ${LIBCUGRAPH_BUILD_DIR} From 07453364bae8704eb4cdb9da607bb399b65713dc Mon Sep 17 00:00:00 2001 From: BradReesWork Date: Fri, 6 Oct 2023 13:37:58 -0400 Subject: [PATCH 2/3] build update --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index b2f41350e4d..7763e285cb4 100755 --- a/build.sh +++ b/build.sh @@ -73,7 +73,7 @@ HELP="$0 [ ...] [ ...] --clean - clean an individual target (note: to do a complete rebuild, use the clean target described above) -h - print this text - default action (no args) is to build and install 'libcugraph' then 'libcugraph_etl' then 'pylibcugraph' then 'cugraph' targets + default action (no args) is to build and install 'libcugraph' then 'pylibcugraph' and then 'cugraph' targets libcugraph build dir is: ${LIBCUGRAPH_BUILD_DIR} From 4bdc0625fbc31a582d46f927b9deecef87dfa488 Mon Sep 17 00:00:00 2001 From: BradReesWork Date: Wed, 11 Oct 2023 15:04:20 -0400 Subject: [PATCH 3/3] updated text on default build libraries --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 7763e285cb4..99082fa96fb 100755 --- a/build.sh +++ b/build.sh @@ -73,7 +73,7 @@ HELP="$0 [ ...] [ ...] --clean - clean an individual target (note: to do a complete rebuild, use the clean target described above) -h - print this text - default action (no args) is to build and install 'libcugraph' then 'pylibcugraph' and then 'cugraph' targets + default action (no args) is to build and install 'libcugraph' then 'libcugraph_etl' then 'pylibcugraph' and then 'cugraph' targets libcugraph build dir is: ${LIBCUGRAPH_BUILD_DIR}