Skip to content

Fix DiskANN: Change to diskannpy #612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix DiskANN: Change to diskannpy #612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 4 additions & 24 deletions ann_benchmarks/algorithms/diskann/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,9 @@
FROM ann-benchmarks

RUN apt-get update
RUN apt-get install -y wget git cmake g++ libaio-dev libgoogle-perftools-dev clang-format libboost-dev python3 python3-setuptools python3-pip
RUN pip3 install pybind11 numpy
RUN apt-get install -y make cmake g++ libaio-dev libgoogle-perftools-dev clang-format libboost-all-dev python3.10-venv
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y libmkl-full-dev

RUN cd /tmp && wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
RUN cd /tmp && apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
RUN cd /tmp && rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
RUN cd /tmp && sh -c 'echo deb https://apt.repos.intel.com/mkl all main > /etc/apt/sources.list.d/intel-mkl.list'
RUN apt-get update
RUN apt-get install -y intel-mkl-64bit-2020.0-088

RUN update-alternatives --install /usr/lib/x86_64-linux-gnu/libblas.so libblas.so-x86_64-linux-gnu /opt/intel/mkl/lib/intel64/libmkl_rt.so 150
RUN update-alternatives --install /usr/lib/x86_64-linux-gnu/libblas.so.3 libblas.so.3-x86_64-linux-gnu /opt/intel/mkl/lib/intel64/libmkl_rt.so 150
RUN update-alternatives --install /usr/lib/x86_64-linux-gnu/liblapack.so liblapack.so-x86_64-linux-gnu /opt/intel/mkl/lib/intel64/libmkl_rt.so 150
RUN update-alternatives --install /usr/lib/x86_64-linux-gnu/liblapack.so.3 liblapack.so.3-x86_64-linux-gnu /opt/intel/mkl/lib/intel64/libmkl_rt.so 150

RUN echo "/opt/intel/lib/intel64" > /etc/ld.so.conf.d/mkl.conf
RUN echo "/opt/intel/mkl/lib/intel64" >> /etc/ld.so.conf.d/mkl.conf
RUN ldconfig
RUN echo "MKL_THREADING_LAYER=GNU" >> /etc/environment
RUN pip install diskannpy==0.7.0

RUN git clone --single-branch --branch python_bindings https://github.com/microsoft/diskann
RUN mkdir -p diskann/build
RUN cd diskann/build && cmake -DCMAKE_BUILD_TYPE=Release ..
RUN cd diskann/build && make -j
RUN cd diskann/python && pip install -e .
RUN python3 -c 'import vamanapy'
RUN python -c 'import diskannpy'
162 changes: 24 additions & 138 deletions ann_benchmarks/algorithms/diskann/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,139 +1,25 @@
float:
angular:
- base_args: ['@metric']
constructor: Vamana
disabled: false
docker_tag: ann-benchmarks-diskann
module: ann_benchmarks.algorithms.diskann
name: vamana(diskann)
run_groups:
vamana_125_32_1:
args: [{alpha: 1, l_build: 125, max_outdegree: 32}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_125_32_1-1:
args: [{alpha: 1.1, l_build: 125, max_outdegree: 32}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_125_32_1-2:
args: [{alpha: 1.2, l_build: 125, max_outdegree: 32}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_125_64_1:
args: [{alpha: 1, l_build: 125, max_outdegree: 64}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_125_64_1-1:
args: [{alpha: 1.1, l_build: 125, max_outdegree: 64}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_125_64_1-2:
args: [{alpha: 1.2, l_build: 125, max_outdegree: 64}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
- base_args: ['@metric']
constructor: VamanaPQ
disabled: false
docker_tag: ann-benchmarks-diskann_pq
module: ann_benchmarks.algorithms.diskann
name: vamana-pq(diskann)
run_groups:
vamana_pq_125_32_1-2_14:
args: [{alpha: 1.2, chunks: 14, l_build: 125, max_outdegree: 32}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_pq_125_32_1-2_28:
args: [{alpha: 1.2, chunks: 28, l_build: 125, max_outdegree: 32}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_pq_125_32_1-2_42:
args: [{alpha: 1.2, chunks: 42, l_build: 125, max_outdegree: 32}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_pq_125_32_1_14:
args: [{alpha: 1, chunks: 14, l_build: 125, max_outdegree: 32}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_pq_125_32_1_28:
args: [{alpha: 1, chunks: 28, l_build: 125, max_outdegree: 32}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_pq_125_32_1_42:
args: [{alpha: 1, chunks: 42, l_build: 125, max_outdegree: 32}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_pq_125_64_1-2_14:
args: [{alpha: 1.2, chunks: 14, l_build: 125, max_outdegree: 64}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_pq_125_64_1-2_28:
args: [{alpha: 1.2, chunks: 28, l_build: 125, max_outdegree: 64}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_pq_125_64_1-2_42:
args: [{alpha: 1.2, chunks: 42, l_build: 125, max_outdegree: 64}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_pq_125_64_1_14:
args: [{alpha: 1, chunks: 14, l_build: 125, max_outdegree: 64}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_pq_125_64_1_28:
args: [{alpha: 1, chunks: 28, l_build: 125, max_outdegree: 64}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_pq_125_64_1_42:
args: [{alpha: 1, chunks: 42, l_build: 125, max_outdegree: 64}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
euclidean:
- base_args: ['@metric']
constructor: Vamana
disabled: false
docker_tag: ann-benchmarks-diskann
module: ann_benchmarks.algorithms.diskann
name: vamana(diskann)
run_groups:
vamana_100_64_1:
args: [{alpha: 1, l_build: 100, max_outdegree: 64}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_100_64_1-1:
args: [{alpha: 1.1, l_build: 100, max_outdegree: 64}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_100_64_1-2:
args: [{alpha: 1.2, l_build: 100, max_outdegree: 64}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_125_32_1:
args: [{alpha: 1, l_build: 125, max_outdegree: 32}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_125_32_1-1:
args: [{alpha: 1.1, l_build: 125, max_outdegree: 32}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_125_32_1-2:
args: [{alpha: 1.2, l_build: 125, max_outdegree: 32}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
- base_args: ['@metric']
constructor: VamanaPQ
disabled: false
docker_tag: ann-benchmarks-diskann_pq
module: ann_benchmarks.algorithms.diskann
name: vamana-pq(diskann)
run_groups:
vamana_pq_100_64_1-2_32:
args: [{alpha: 1.2, chunks: 32, l_build: 100, max_outdegree: 64}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_pq_100_64_1_32:
args: [{alpha: 1, chunks: 32, l_build: 100, max_outdegree: 64}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_pq_125_32_1-2_112:
args: [{alpha: 1.2, chunks: 112, l_build: 125, max_outdegree: 32}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_pq_125_32_1-2_32:
args: [{alpha: 1.2, chunks: 32, l_build: 125, max_outdegree: 32}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_pq_125_32_1-2_96:
args: [{alpha: 1.2, chunks: 96, l_build: 125, max_outdegree: 32}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_pq_125_32_1_112:
args: [{alpha: 1, chunks: 112, l_build: 125, max_outdegree: 32}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_pq_125_32_1_32:
args: [{alpha: 1, chunks: 32, l_build: 125, max_outdegree: 32}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_pq_125_32_1_96:
args: [{alpha: 1, chunks: 96, l_build: 125, max_outdegree: 32}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_pq_80_64_1-2_112:
args: [{alpha: 1.2, chunks: 112, l_build: 80, max_outdegree: 64}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_pq_80_64_1-2_96:
args: [{alpha: 1.2, chunks: 96, l_build: 80, max_outdegree: 64}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_pq_80_64_1_112:
args: [{alpha: 1, chunks: 112, l_build: 80, max_outdegree: 64}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
vamana_pq_80_64_1_96:
args: [{alpha: 1, chunks: 96, l_build: 80, max_outdegree: 64}]
query_args: [[10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120]]
any:
- base_args: ['@metric']
constructor: DiskANN
disabled: false
docker_tag: ann-benchmarks-diskann
module: ann_benchmarks.algorithms.diskann
name: diskann
run_groups:
R-60:
arg_groups: [{max_degree: 60, complexity: 100, alpha: 1.2}]
args: {}
query_args: [[10, 20, 40, 80, 120, 200, 400, 600, 800]]
R-80:
arg_groups: [{max_degree: 80, complexity: 150, alpha: 1.2}]
args: {}
query_args: [[10, 20, 40, 80, 120, 200, 400, 600, 800]]
R-100:
arg_groups: [{max_degree: 100, complexity: 175, alpha: 1.2}]
args: {}
query_args: [[10, 20, 40, 80, 120, 200, 400, 600, 800]]
R-150:
arg_groups: [{max_degree: 150, complexity: 200, alpha: 1.2}]
args: {}
query_args: [[10, 20, 40, 80, 120, 200, 400, 600, 800]]
Loading