From 26d7bcc518f3bdc9b0d8f854f2879ed9c219e440 Mon Sep 17 00:00:00 2001 From: Marc Glisse Date: Thu, 3 Nov 2022 14:56:34 +0100 Subject: Translate n_jobs to workers for SciPy --- src/python/gudhi/point_cloud/knn.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/python/gudhi/point_cloud/knn.py b/src/python/gudhi/point_cloud/knn.py index de5844f9..7dc83817 100644 --- a/src/python/gudhi/point_cloud/knn.py +++ b/src/python/gudhi/point_cloud/knn.py @@ -314,7 +314,9 @@ class KNearestNeighbors: return None if self.params["implementation"] == "ckdtree": - qargs = {key: val for key, val in self.params.items() if key in {"p", "eps", "n_jobs"}} + qargs = {key: val for key, val in self.params.items() if key in {"p", "eps"}} + # SciPy renamed n_jobs to workers + qargs["workers"] = self.params.get("workers") or self.params.get("n_jobs") or 1 distances, neighbors = self.kdtree.query(X, k=self.k, **qargs) if k == 1: # SciPy decided to squeeze the last dimension for k=1 -- cgit v1.2.3 From 95330fb658db4184813d8720c52da5e25bcdd38c Mon Sep 17 00:00:00 2001 From: Marc Glisse Date: Fri, 4 Nov 2022 11:01:43 +0100 Subject: Mention SciPy version in the doc --- src/python/doc/installation.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python/doc/installation.rst b/src/python/doc/installation.rst index b704f778..276ac4e2 100644 --- a/src/python/doc/installation.rst +++ b/src/python/doc/installation.rst @@ -391,7 +391,7 @@ The :doc:`persistence graphical tools ` and mathematics, science, and engineering. :class:`~gudhi.point_cloud.knn.KNearestNeighbors` can use the Python package -`SciPy `_ as a backend if explicitly requested. +`SciPy `_ :math:`\geq` 1.6.0 as a backend if explicitly requested. TensorFlow ---------- -- cgit v1.2.3