Skip to content

fix error scipy 'n_jobs', now it's 'workers' #2

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
Kalessia wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix error scipy 'n_jobs', now it's 'workers' #2

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
6 changes: 3 additions & 3 deletions diversity_algorithms/algorithms/quality_diversity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def get_nov(self, bd, extra_indivs=[], in_archive=False):
for ind in extra_indivs:
dists.append(np.linalg.norm(np.array(bd)-np.array(ind.bd)))
# Query KNN in archive
dists_archive, _ = self.kdtree.query(np.array(bd),self.k+1, n_jobs=-1)
dists_archive, _ = self.kdtree.query(np.array(bd),self.k+1, workers=-1)
dists += list(dists_archive)
dists.sort()
if(in_archive):
Expand Down Expand Up @@ -204,7 +204,7 @@ def get_nov(self, bd, extra_indivs=[], in_archive=False):
for ind in extra_indivs:
dists.append(np.linalg.norm(np.array(bd)-np.array(ind.bd)))
# Query KNN in archive
dists_archive, _ = self.kdtree.query(np.array(bd),self.k+1, n_jobs=-1)
dists_archive, _ = self.kdtree.query(np.array(bd),self.k+1, workers=-1)
dists += list(dists_archive)
dists.sort()
if(in_archive):
Expand All @@ -223,7 +223,7 @@ def post_add_update(self):

def try_add(self,indiv):
bd = indiv.bd
close_neighbors = ([] if((self.kdtree is None) or (self.r == 0)) else self.kdtree.query_ball_point(bd, self.r, n_jobs=-1))
close_neighbors = ([] if((self.kdtree is None) or (self.r == 0)) else self.kdtree.query_ball_point(bd, self.r, workers=-1))
if not close_neighbors: # No neighbors in ball, no problem - add indiv
self.archive.append(indiv)
self.post_add_update()
Expand Down