From 01efafd803bab8e1a0b0e189890fb757db7fb920 Mon Sep 17 00:00:00 2001
From: Divye Gala <divyegala@gmail.com>
Date: Fri, 24 May 2024 09:14:59 -0400
Subject: [PATCH] Change `raft-ann-bench` package name to `raft_ann_bench`
 (#671)

Depends on https://github.com/rapidsai/raft/pull/2333

Authors:
  - Divye Gala (https://github.com/divyegala)

Approvers:
  - Bradley Dice (https://github.com/bdice)
  - Jake Awe (https://github.com/AyodeAwe)

URL: https://github.com/rapidsai/docker/pull/671
---
 context/raft-ann-bench/get_datasets.sh             | 14 +++++++-------
 context/raft-ann-bench/run_benchmark.sh            |  8 ++++----
 .../run_benchmarks_preloaded_datasets.sh           |  8 ++++----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/context/raft-ann-bench/get_datasets.sh b/context/raft-ann-bench/get_datasets.sh
index dee3e6be..6b728eb3 100755
--- a/context/raft-ann-bench/get_datasets.sh
+++ b/context/raft-ann-bench/get_datasets.sh
@@ -5,10 +5,10 @@ set -eo pipefail
 
 export CONDA_PREFIX=/opt/conda
 
-python -m raft-ann-bench.get_dataset --dataset deep-image-96-angular --normalize --dataset-path /home/rapids/preloaded_datasets
-python -m raft-ann-bench.get_dataset --dataset fashion-mnist-784-euclidean --dataset-path /home/rapids/preloaded_datasets
-python -m raft-ann-bench.get_dataset --dataset glove-50-angular --normalize --dataset-path /home/rapids/preloaded_datasets
-python -m raft-ann-bench.get_dataset --dataset glove-100-angular --normalize --dataset-path /home/rapids/preloaded_datasets
-python -m raft-ann-bench.get_dataset --dataset mnist-784-euclidean --dataset-path /home/rapids/preloaded_datasets
-python -m raft-ann-bench.get_dataset --dataset nytimes-256-angular --normalize --dataset-path /home/rapids/preloaded_datasets
-python -m raft-ann-bench.get_dataset --dataset sift-128-euclidean --dataset-path /home/rapids/preloaded_datasets
+python -m raft_ann_bench.get_dataset --dataset deep-image-96-angular --normalize --dataset-path /home/rapids/preloaded_datasets
+python -m raft_ann_bench.get_dataset --dataset fashion-mnist-784-euclidean --dataset-path /home/rapids/preloaded_datasets
+python -m raft_ann_bench.get_dataset --dataset glove-50-angular --normalize --dataset-path /home/rapids/preloaded_datasets
+python -m raft_ann_bench.get_dataset --dataset glove-100-angular --normalize --dataset-path /home/rapids/preloaded_datasets
+python -m raft_ann_bench.get_dataset --dataset mnist-784-euclidean --dataset-path /home/rapids/preloaded_datasets
+python -m raft_ann_bench.get_dataset --dataset nytimes-256-angular --normalize --dataset-path /home/rapids/preloaded_datasets
+python -m raft_ann_bench.get_dataset --dataset sift-128-euclidean --dataset-path /home/rapids/preloaded_datasets
diff --git a/context/raft-ann-bench/run_benchmark.sh b/context/raft-ann-bench/run_benchmark.sh
index 6538866f..04d85c6c 100644
--- a/context/raft-ann-bench/run_benchmark.sh
+++ b/context/raft-ann-bench/run_benchmark.sh
@@ -21,7 +21,7 @@ export RUN_ARGS=$3
 export PLOT_ARGS=$4
 
 # (1) prepare dataset.
-python -m raft-ann-bench.get_dataset ${DATASET_ARG} ${GET_DATASET_ARGS} --dataset-path /data/benchmarks/datasets
+python -m raft_ann_bench.get_dataset ${DATASET_ARG} ${GET_DATASET_ARGS} --dataset-path /data/benchmarks/datasets
 
 if [[ "$DATASET_ARG" == *"angular"* ]]; then
   export DATASET_ARG=${DATASET_ARG/angular/inner}
@@ -30,10 +30,10 @@ if [[ "$DATASET_ARG" == *"angular"* ]]; then
 fi
 
 # (2) build and search index
-python -m raft-ann-bench.run  ${DATASET_ARG} --dataset-path /data/benchmarks/datasets --force ${RUN_ARGS}
+python -m raft_ann_bench.run  ${DATASET_ARG} --dataset-path /data/benchmarks/datasets --force ${RUN_ARGS}
 
 # (3) export data
-python -m raft-ann-bench.data_export  ${DATASET_ARG} --dataset-path /data/benchmarks/datasets
+python -m raft_ann_bench.data_export  ${DATASET_ARG} --dataset-path /data/benchmarks/datasets
 
 # Extract the algorithms from the run command to use in the plot command
 ALGOS=$(grep -oP "algorithms\s+\K(\w+,?\w+)" <<< "$RUN_ARGS")
@@ -44,4 +44,4 @@ fi
 # (4) plot results
 mkdir -p /data/benchmarks/datasets/result
 cd /data/benchmarks/datasets/result
-python -m raft-ann-bench.plot  ${DATASET_ARG} ${ALGOS} ${PLOT_ARGS} --dataset-path /data/benchmarks/datasets --build --search
+python -m raft_ann_bench.plot  ${DATASET_ARG} ${ALGOS} ${PLOT_ARGS} --dataset-path /data/benchmarks/datasets --build --search
diff --git a/context/raft-ann-bench/run_benchmarks_preloaded_datasets.sh b/context/raft-ann-bench/run_benchmarks_preloaded_datasets.sh
index bb383ff6..9ef91741 100644
--- a/context/raft-ann-bench/run_benchmarks_preloaded_datasets.sh
+++ b/context/raft-ann-bench/run_benchmarks_preloaded_datasets.sh
@@ -27,7 +27,7 @@ case $DATASET_ARG in
     export DATASET_PATH=/home/rapids/preloaded_datasets ;;
    *)
     export DATASET_PATH=/data/benchmarks/datasets
-    python -m raft-ann-bench.get_dataset ${DATASET_ARG} ${GET_DATASET_ARGS} --dataset-path $DATASET_PATH ;;
+    python -m raft_ann_bench.get_dataset ${DATASET_ARG} ${GET_DATASET_ARGS} --dataset-path $DATASET_PATH ;;
 esac
 
 if [[ "$DATASET_ARG" == *"angular"* ]]; then
@@ -37,10 +37,10 @@ if [[ "$DATASET_ARG" == *"angular"* ]]; then
 fi
 
 # (2) build and search index
-python -m raft-ann-bench.run  ${DATASET_ARG} --dataset-path $DATASET_PATH ${RUN_ARGS}
+python -m raft_ann_bench.run  ${DATASET_ARG} --dataset-path $DATASET_PATH ${RUN_ARGS}
 
 # (3) export data
-python -m raft-ann-bench.data_export  ${DATASET_ARG} --dataset-path $DATASET_PATH
+python -m raft_ann_bench.data_export  ${DATASET_ARG} --dataset-path $DATASET_PATH
 
 # Extract the algorithms from the run command to use in the plot command
 ALGOS=$(grep -oP "algorithms\s+\K(\w+,?\w+)" <<< "$RUN_ARGS")
@@ -51,4 +51,4 @@ fi
 # (4) plot results
 mkdir -p $DATASET_PATH/result
 cd $DATASET_PATH/result
-python -m raft-ann-bench.plot  ${DATASET_ARG} ${ALGOS} ${PLOT_ARGS} --dataset-path $DATASET_PATH
+python -m raft_ann_bench.plot  ${DATASET_ARG} ${ALGOS} ${PLOT_ARGS} --dataset-path $DATASET_PATH