Merge pull request #169 from harsha-simhadri/harshasi/diskann_dockerp…

…ath_fix edit python package version for diskann baseline
harsha-simhadri · Oct 2, 2023 · 36b81c8 · 36b81c8
2 parents 5a8d106 + 30f54f0
commit 36b81c8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/.github/workflows/neurips23.yml b/.github/workflows/neurips23.yml
@@ -44,7 +44,10 @@ jobs:
         python create_dataset.py --dataset $DATASET
         python run.py --algorithm $ALGO --max-n-algorithms 2 --neurips23track $TRACK --dataset $DATASET --timeout 600
         sudo chmod -R 777 results/
-        python plot.py --dataset $DATASET --neurips23track $TRACK --output plot.png
+        if [ $TRACK != streaming ]
+        then
+          python plot.py --dataset $DATASET --neurips23track $TRACK --output plot.png
+        fi
         python data_export.py --output test.csv
 
       env:

diff --git a/data_export.py b/data_export.py
@@ -106,6 +106,7 @@ def cleaned_run_metric(run_metrics):
                 run_metrics = compute_metrics_all_runs(dataset, dataset_name, results, args.recompute, \
                         args.sensors, args.search_times, args.private_query, neurips23track=track)
                 dfs.append(pd.DataFrame(cleaned_run_metric(run_metrics)))
+    dfs = [e for e in dfs if len(e) > 0]
     if len(dfs) > 0:
         data = pd.concat(dfs)
         data = data.sort_values(by=["algorithm", "dataset", "recall/ap"])        

diff --git a/neurips23/ood/diskann/Dockerfile b/neurips23/ood/diskann/Dockerfile
@@ -6,9 +6,9 @@ RUN add-apt-repository -y ppa:git-core/ppa
 RUN apt update
 RUN DEBIAN_FRONTEND=noninteractive apt install -y git make cmake g++ libaio-dev libgoogle-perftools-dev libunwind-dev clang-format libboost-dev libboost-program-options-dev libmkl-full-dev libcpprest-dev python3.10
 
-RUN git clone https://github.com/microsoft/DiskANN.git --branch  0.5.0.rc3
+RUN git clone https://github.com/microsoft/DiskANN.git --branch  0.5.0.rc3.post1
 WORKDIR /home/app/DiskANN
 RUN pip3 install virtualenv build
 RUN python3 -m build
-RUN pip install dist/diskannpy-0.5.0rc3-cp310-cp310-linux_x86_64.whl
+RUN pip install dist/diskannpy-0.5.0rc3.post1-cp310-cp310-linux_x86_64.whl
 WORKDIR /home/app
diff --git a/neurips23/streaming/diskann/Dockerfile b/neurips23/streaming/diskann/Dockerfile
@@ -6,9 +6,9 @@ RUN add-apt-repository -y ppa:git-core/ppa
 RUN apt update
 RUN DEBIAN_FRONTEND=noninteractive apt install -y git make cmake g++ libaio-dev libgoogle-perftools-dev libunwind-dev clang-format libboost-dev libboost-program-options-dev libmkl-full-dev libcpprest-dev python3.10
 
-RUN git clone https://github.com/microsoft/DiskANN.git --branch  0.5.0.rc3
+RUN git clone https://github.com/microsoft/DiskANN.git --branch  0.5.0.rc3.post1
 WORKDIR /home/app/DiskANN
 RUN pip3 install virtualenv build
 RUN python3 -m build
-RUN pip install dist/diskannpy-0.5.0rc3-cp310-cp310-linux_x86_64.whl
+RUN pip install dist/diskannpy-0.5.0rc3.post1-cp310-cp310-linux_x86_64.whl
 WORKDIR /home/app