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

Jump to bottom

Fix caching calls to _vector_for_key_cached and _out_of_vocab_vector_cached #47

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix caching calls to _vector_for_key_cached and _out_of_vocab_vector_cached #47

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c452881
Update __init__.py
zfang Feb 7, 2019
4b2afc3
Merge pull request #1 from zfang/zfang-patch-1
zfang Feb 7, 2019
1043fc1
Fix another caching issue with _out_of_vocab_vector_cached
Feb 9, 2019
25cf26c
Fix calls args and kwargs inconsistencies because lru_cache treats th…
Feb 9, 2019
fd5f132
Use looked up vectors directly instead of calling query; fix _out_of_…
Feb 9, 2019
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
21 changes: 12 additions & 9 deletions pymagnitude/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1066,8 +1066,9 @@ def _vectors_for_keys_cached(self, keys, normalized=None, force=False):
if self._is_lm() and not force:
keys = [self._key_t(key) for key in keys]
return self._process_lm_output(keys, normalized)
cached_vectors = {key: self._query_cached(key, normalized, force) for key in keys}
unseen_keys = tuple(
key for key in keys if not self._query_is_cached(key, normalized))
key for key in keys if cached_vectors[key] is None)
unseen_keys_map = {}
if len(unseen_keys) > 0:
unseen_keys_map = {self._key_t(k): i for i, k in
Expand Down Expand Up @@ -1106,8 +1107,8 @@ def _vectors_for_keys_cached(self, keys, normalized=None, force=False):
unseen_vectors[i])
if unseen_vectors[i] is None:
unseen_vectors[i] = self._out_of_vocab_vector_cached(
unseen_keys[i], normalized, force=force)
vectors = [self.query(key, normalized=normalized)
unseen_keys[i], normalized=normalized, force=force)
vectors = [cached_vectors[key]
if key not in unseen_keys_map else
unseen_vectors[unseen_keys_map[self._key_t(key)]]
for key in keys]
Expand Down Expand Up @@ -1208,9 +1209,9 @@ def query(self, q, pad_to_length=None,
truncate_left = truncate_left or self.truncate_left

if not isinstance(q, list): # Single key
vec = self._vector_for_key_cached(q, normalized)
vec = self._vector_for_key_cached(q, normalized=normalized)
if vec is None:
return self._out_of_vocab_vector_cached(q, normalized)
return self._out_of_vocab_vector_cached(q, normalized=normalized)
else:
return vec
elif isinstance(q, list) \
Expand Down Expand Up @@ -1305,11 +1306,13 @@ def _query_numpy(self, key, contextualize=False, normalized=None):
else:
return r_val

def _query_is_cached(self, key, normalized=None):
def _query_cached(self, key, normalized=None, force=False):
"""Checks if the query been cached by Magnitude."""
normalized = normalized if normalized is not None else self.normalized
return ((self._vector_for_key_cached._cache.get((key, frozenset([('normalized', normalized)]))) is not None) or ( # noqa
self._out_of_vocab_vector_cached._cache.get((key, frozenset([('normalized', normalized)]))) is not None)) # noqa
cached = self._vector_for_key_cached._cache.get(((key,), frozenset([('normalized', normalized)])))
if cached is not None:
return cached
return self._out_of_vocab_vector_cached._cache.get(((key,), frozenset([('normalized', normalized), ('force', force)])))

@lru_cache(DEFAULT_LRU_CACHE_SIZE, ignore_unhashable_args=True)
def distance(self, key, q):
Expand Down Expand Up @@ -1906,7 +1909,7 @@ def __len__(self):

def __contains__(self, key):
"""Checks whether a key exists in the vectors"""
return self._vector_for_key_cached(key) is not None
return self._vector_for_key_cached(key, normalized=self.normalized) is not None

def __getitem__(self, q):
"""Performs the index method when indexed."""
Expand Down