From 45eebf052192cde7579ac32ee879c816e1510134 Mon Sep 17 00:00:00 2001 From: Dante Gama Dessavre Date: Tue, 17 Dec 2024 13:40:48 -0600 Subject: [PATCH] FIX fixes from pr review and other small things --- context/cuvs-bench/get_datasets.sh | 2 +- cuvs-bench/cpu/Dockerfile | 5 ++++- cuvs-bench/gpu/Dockerfile | 5 ++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/context/cuvs-bench/get_datasets.sh b/context/cuvs-bench/get_datasets.sh index 452ebfcb..47e80d6c 100755 --- a/context/cuvs-bench/get_datasets.sh +++ b/context/cuvs-bench/get_datasets.sh @@ -4,7 +4,7 @@ set -eo pipefail # find cuVS in the environment -PACKAGE_FILE_PATH=$(python -c "import cuvs-bench; print(package_name.__file__)") +PACKAGE_FILE_PATH=$(python -c "import cuvs_bench; print(package_name.__file__)") PACKAGE_DIR=$(dirname "$PACKAGE_FILE_PATH") # Apply the patch diff --git a/cuvs-bench/cpu/Dockerfile b/cuvs-bench/cpu/Dockerfile index 0b23967e..ca0929b0 100644 --- a/cuvs-bench/cpu/Dockerfile +++ b/cuvs-bench/cpu/Dockerfile @@ -32,7 +32,8 @@ mamba install -y -n base "python=${PYTHON_VER}" mamba update --all -y -n base mamba install -y -n base \ "cuvs-bench-cpu=${RAPIDS_VER}.*" \ - "python=${PYTHON_VER}" + "python=${PYTHON_VER}" \ + "requests" conda clean -afy chmod -R 777 /opt/conda EOF @@ -52,6 +53,8 @@ FROM bench-base AS cuvs-bench-cpu-datasets SHELL ["/bin/bash", "-euo", "pipefail", "-c"] +COPY cuvs-bench/cuvs_bench_get_dataset.patch /home/rapids/cuvs-bench/cuvs_bench_get_dataset.patch + COPY cuvs-bench/get_datasets.sh /home/rapids/cuvs-bench/get_datasets.sh COPY cuvs-bench/run_benchmark.sh /data/scripts/run_benchmark_preloaded_datasets.sh diff --git a/cuvs-bench/gpu/Dockerfile b/cuvs-bench/gpu/Dockerfile index 08be5a17..7f785017 100644 --- a/cuvs-bench/gpu/Dockerfile +++ b/cuvs-bench/gpu/Dockerfile @@ -30,7 +30,8 @@ RUN <