From 1523fc1532350fa057e669c060e7c16961796d1a Mon Sep 17 00:00:00 2001 From: Hiroyuki Ootomo Date: Tue, 8 Aug 2023 14:43:03 +0900 Subject: [PATCH 1/5] Add NEIGHBORS_ANN_CAGRA_TEST to TEST_TARGETS --- build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 1213500159..57745b7366 100755 --- a/build.sh +++ b/build.sh @@ -76,7 +76,7 @@ INSTALL_TARGET=install BUILD_REPORT_METRICS="" BUILD_REPORT_INCL_CACHE_STATS=OFF -TEST_TARGETS="CLUSTER_TEST;CORE_TEST;DISTANCE_TEST;LABEL_TEST;LINALG_TEST;MATRIX_TEST;RANDOM_TEST;SOLVERS_TEST;SPARSE_TEST;SPARSE_DIST_TEST;SPARSE_NEIGHBORS_TEST;NEIGHBORS_TEST;STATS_TEST;UTILS_TEST" +TEST_TARGETS="CLUSTER_TEST;CORE_TEST;DISTANCE_TEST;LABEL_TEST;LINALG_TEST;MATRIX_TEST;RANDOM_TEST;SOLVERS_TEST;SPARSE_TEST;SPARSE_DIST_TEST;SPARSE_NEIGHBORS_TEST;NEIGHBORS_TEST;STATS_TEST;UTILS_TEST;NEIGHBORS_ANN_CAGRA_TEST" BENCH_TARGETS="CLUSTER_BENCH;NEIGHBORS_BENCH;DISTANCE_BENCH;LINALG_BENCH;MATRIX_BENCH;SPARSE_BENCH;RANDOM_BENCH" CACHE_ARGS="" @@ -319,6 +319,7 @@ if hasArg tests || (( ${NUMARGS} == 0 )); then $CMAKE_TARGET == *"SPARSE_NEIGHBORS_TEST"* || \ $CMAKE_TARGET == *"MATRIX_TEST"* || \ $CMAKE_TARGET == *"NEIGHBORS_TEST" || \ + $CMAKE_TARGET == *"NEIGHBORS_ANN_CAGRA_TEST" || \ $CMAKE_TARGET == *"STATS_TEST"* ]]; then echo "-- Enabling compiled lib for gtests" COMPILE_LIBRARY=ON From fbad5bc73d49a099586ec45d84c3a2afbe6b5291 Mon Sep 17 00:00:00 2001 From: tsuki <12711693+enp1s0@users.noreply.github.com> Date: Wed, 9 Aug 2023 09:30:44 +0900 Subject: [PATCH 2/5] Update build.sh Co-authored-by: Bradley Dice --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 57745b7366..4bf33cf42f 100755 --- a/build.sh +++ b/build.sh @@ -319,7 +319,7 @@ if hasArg tests || (( ${NUMARGS} == 0 )); then $CMAKE_TARGET == *"SPARSE_NEIGHBORS_TEST"* || \ $CMAKE_TARGET == *"MATRIX_TEST"* || \ $CMAKE_TARGET == *"NEIGHBORS_TEST" || \ - $CMAKE_TARGET == *"NEIGHBORS_ANN_CAGRA_TEST" || \ + $CMAKE_TARGET == *"NEIGHBORS_ANN_CAGRA_TEST"* || \ $CMAKE_TARGET == *"STATS_TEST"* ]]; then echo "-- Enabling compiled lib for gtests" COMPILE_LIBRARY=ON From 92cbebcdb73f5885ecd703fee109e7574803147b Mon Sep 17 00:00:00 2001 From: tsuki <12711693+enp1s0@users.noreply.github.com> Date: Wed, 9 Aug 2023 09:30:51 +0900 Subject: [PATCH 3/5] Update build.sh Co-authored-by: Bradley Dice --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 4bf33cf42f..6559b4506a 100755 --- a/build.sh +++ b/build.sh @@ -318,7 +318,7 @@ if hasArg tests || (( ${NUMARGS} == 0 )); then $CMAKE_TARGET == *"SPARSE_DIST_TEST" || \ $CMAKE_TARGET == *"SPARSE_NEIGHBORS_TEST"* || \ $CMAKE_TARGET == *"MATRIX_TEST"* || \ - $CMAKE_TARGET == *"NEIGHBORS_TEST" || \ + $CMAKE_TARGET == *"NEIGHBORS_TEST"* || \ $CMAKE_TARGET == *"NEIGHBORS_ANN_CAGRA_TEST"* || \ $CMAKE_TARGET == *"STATS_TEST"* ]]; then echo "-- Enabling compiled lib for gtests" From 9c5cd74f3c215b092c18bfb1a28515f4d735e679 Mon Sep 17 00:00:00 2001 From: tsuki <12711693+enp1s0@users.noreply.github.com> Date: Wed, 9 Aug 2023 09:30:56 +0900 Subject: [PATCH 4/5] Update build.sh Co-authored-by: Bradley Dice --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 6559b4506a..c054bac58c 100755 --- a/build.sh +++ b/build.sh @@ -76,7 +76,7 @@ INSTALL_TARGET=install BUILD_REPORT_METRICS="" BUILD_REPORT_INCL_CACHE_STATS=OFF -TEST_TARGETS="CLUSTER_TEST;CORE_TEST;DISTANCE_TEST;LABEL_TEST;LINALG_TEST;MATRIX_TEST;RANDOM_TEST;SOLVERS_TEST;SPARSE_TEST;SPARSE_DIST_TEST;SPARSE_NEIGHBORS_TEST;NEIGHBORS_TEST;STATS_TEST;UTILS_TEST;NEIGHBORS_ANN_CAGRA_TEST" +TEST_TARGETS="CLUSTER_TEST;CORE_TEST;DISTANCE_TEST;LABEL_TEST;LINALG_TEST;MATRIX_TEST;NEIGHBORS_TEST;NEIGHBORS_ANN_CAGRA_TEST;RANDOM_TEST;SOLVERS_TEST;SPARSE_TEST;SPARSE_DIST_TEST;SPARSE_NEIGHBORS_TEST;STATS_TEST;UTILS_TEST" BENCH_TARGETS="CLUSTER_BENCH;NEIGHBORS_BENCH;DISTANCE_BENCH;LINALG_BENCH;MATRIX_BENCH;SPARSE_BENCH;RANDOM_BENCH" CACHE_ARGS="" From b97071a0d1a4d0e0107facd0a53fc1fe18bf437f Mon Sep 17 00:00:00 2001 From: Hiroyuki Ootomo Date: Wed, 9 Aug 2023 09:37:38 +0900 Subject: [PATCH 5/5] Alphabetize test list --- build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index c054bac58c..8706f1b138 100755 --- a/build.sh +++ b/build.sh @@ -315,11 +315,11 @@ if hasArg tests || (( ${NUMARGS} == 0 )); then # Force compile library when needed test targets are specified if [[ $CMAKE_TARGET == *"CLUSTER_TEST"* || \ $CMAKE_TARGET == *"DISTANCE_TEST"* || \ - $CMAKE_TARGET == *"SPARSE_DIST_TEST" || \ - $CMAKE_TARGET == *"SPARSE_NEIGHBORS_TEST"* || \ $CMAKE_TARGET == *"MATRIX_TEST"* || \ - $CMAKE_TARGET == *"NEIGHBORS_TEST"* || \ $CMAKE_TARGET == *"NEIGHBORS_ANN_CAGRA_TEST"* || \ + $CMAKE_TARGET == *"NEIGHBORS_TEST"* || \ + $CMAKE_TARGET == *"SPARSE_DIST_TEST" || \ + $CMAKE_TARGET == *"SPARSE_NEIGHBORS_TEST"* || \ $CMAKE_TARGET == *"STATS_TEST"* ]]; then echo "-- Enabling compiled lib for gtests" COMPILE_LIBRARY=ON