Skip to content
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

Change ScaNN submission to pin version and use all available cores. #310

Merged
merged 1 commit into from
Sep 25, 2024
Merged

Change ScaNN submission to pin version and use all available cores. #310

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
2 changes: 1 addition & 1 deletion neurips23/ood/scann/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ FROM neurips23

RUN apt update
RUN apt install -y software-properties-common
RUN pip install --no-cache-dir scann
RUN pip install --no-cache-dir scann==1.3.2

WORKDIR /home/app
12 changes: 7 additions & 5 deletions neurips23/ood/scann/scann.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

import os
from pathlib import Path

Expand All @@ -10,6 +9,7 @@
import numpy as np
import scann
from scann.proto import scann_pb2
import multiprocessing


class Scann(BaseOODANN):
Expand All @@ -19,6 +19,8 @@ def __init__(self, metric, index_params):
self.download = index_params.get('download', False)
self.tree_size = index_params.get('tree_size', 40_000)
self.serialized_dir = 'data/scann/ood'
# To account for hyper-threading.
self.num_cpus = multiprocessing.cpu_count() // 2
print('ScaNN: Init')

def load_index(self, dataset):
Expand Down Expand Up @@ -54,7 +56,7 @@ def load_index(self, dataset):
os.rename(src, dst)
self.searcher = scann.scann_ops_pybind.load_searcher(
self.serialized_dir)
self.searcher.set_num_threads(8)
self.searcher.set_num_threads(self.num_cpus)

def fit(self, dataset):
if hasattr(self, 'searcher'):
Expand Down Expand Up @@ -143,9 +145,9 @@ def fit(self, dataset):
del data
gc.collect()
if not trained and s >= 8_000_000:
self.searcher.set_num_threads(8)
self.searcher.set_num_threads(self.num_cpus)
self.searcher.rebalance(config)
self.searcher.set_num_threads(8)
self.searcher.set_num_threads(self.num_cpus)
trained = True
del ds
# path = Path(self.serialized_dir)
Expand All @@ -158,7 +160,7 @@ def query(self, X, k):
X,
leaves_to_search=self.leaves_to_search,
pre_reorder_num_neighbors=self.reorder,
batch_size=12500
batch_size=(X.shape[0] // self.num_cpus)
)[0]

def set_query_arguments(self, query_args):
Expand Down
Loading