From a51ae9a7d6750308adeccdd17c60a8ef043d086a Mon Sep 17 00:00:00 2001 From: harsha vardhan simhadri Date: Tue, 26 Sep 2023 22:12:14 +0000 Subject: [PATCH 1/3] edit python package version for diskann baseline --- neurips23/ood/diskann/Dockerfile | 4 ++-- neurips23/streaming/diskann/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/neurips23/ood/diskann/Dockerfile b/neurips23/ood/diskann/Dockerfile index b33d17df..a61f7e86 100644 --- 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 index b33d17df..a61f7e86 100644 --- 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 From 21b1c4b5f4239fce6b93cfd43509bf8eb0d506af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Aum=C3=BCller?= Date: Mon, 2 Oct 2023 09:20:43 +0200 Subject: [PATCH 2/3] don't plot streaming track results. --- .github/workflows/neurips23.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/neurips23.yml b/.github/workflows/neurips23.yml index d8a20e26..47ba01b2 100644 --- 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: From 30f54f016180c22680cc348885056072fef7c0a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Aum=C3=BCller?= Date: Mon, 2 Oct 2023 11:30:39 +0200 Subject: [PATCH 3/3] remove empty runs --- data_export.py | 1 + 1 file changed, 1 insertion(+) diff --git a/data_export.py b/data_export.py index 7785ae77..1141771e 100644 --- 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"])