[med-svn] [Git][med-team/umap-learn][master] 2 commits: Fix one further test failure

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / umap-learn


Commits:
9e45a525 by Andreas Tille at 2023-02-10T08:36:02+01:00
Fix one further test failure

- - - - -
c2064ba6 by Andreas Tille at 2023-02-10T08:54:01+01:00
Fix last build time errors

- - - - -


3 changed files:

- + debian/patches/588e1f724c9f5de528eb1500b0c85a1a609fe947.patch
- + debian/patches/949abd082524fce8c45dfb147bcd8e8ef49eade3.patch
- debian/patches/series


Changes:

=====================================
debian/patches/588e1f724c9f5de528eb1500b0c85a1a609fe947.patch
=====================================
@@ -0,0 +1,22 @@
+From 588e1f724c9f5de528eb1500b0c85a1a609fe947 Mon Sep 17 00:00:00 2001
+From: Leland McInnes <leland.mcinnes at gmail.com>
+Date: Wed, 18 Jan 2023 11:20:49 -0500
+Subject: [PATCH] cast rows appropriately
+
+---
+ umap/utils.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/umap/utils.py b/umap/utils.py
+index 41332dee..6bdffc21 100644
+--- a/umap/utils.py
++++ b/umap/utils.py
+@@ -156,7 +156,7 @@ def csr_unique(matrix, return_index=True, return_inverse=True, return_counts=Tru
+     unique_matrix[inverse]
+     """
+     lil_matrix = matrix.tolil()
+-    rows = [x + y for x, y in zip(lil_matrix.rows, lil_matrix.data)]
++    rows = np.asarray([tuple(x + y) for x, y in zip(lil_matrix.rows, lil_matrix.data)], dtype=object)
+     return_values = return_counts + return_inverse + return_index
+     return np.unique(
+         rows,


=====================================
debian/patches/949abd082524fce8c45dfb147bcd8e8ef49eade3.patch
=====================================
@@ -0,0 +1,40 @@
+From 949abd082524fce8c45dfb147bcd8e8ef49eade3 Mon Sep 17 00:00:00 2001
+From: Leland McInnes <leland.mcinnes at gmail.com>
+Date: Mon, 26 Dec 2022 17:11:22 -0500
+Subject: [PATCH] Random_state in sklearn has more strict constraints now
+
+---
+ umap/tests/test_umap_ops.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/umap/tests/test_umap_ops.py b/umap/tests/test_umap_ops.py
+index d01f7317..c3e88cc3 100644
+--- a/umap/tests/test_umap_ops.py
++++ b/umap/tests/test_umap_ops.py
+@@ -292,7 +292,7 @@ def test_component_layout_options(nn_data):
+         n_components,
+         component_labels,
+         2,
+-        np.random,
++        None,
+         metric="precomputed",
+         metric_kwds={"linkage": "single"},
+     )
+@@ -301,7 +301,7 @@ def test_component_layout_options(nn_data):
+         n_components,
+         component_labels,
+         2,
+-        np.random,
++        None,
+         metric="precomputed",
+         metric_kwds={"linkage": "average"},
+     )
+@@ -310,7 +310,7 @@ def test_component_layout_options(nn_data):
+         n_components,
+         component_labels,
+         2,
+-        np.random,
++        None,
+         metric="precomputed",
+         metric_kwds={"linkage": "complete"},
+     )


=====================================
debian/patches/series
=====================================
@@ -6,3 +6,5 @@ c7d05683325589ad432a55e109cacb9d631cfaa9.patch
 3ca4cf8620e25ceb8b4602648f4092d7a904a282.patch
 fix_further_tests.patch
 numpy_1.24.patch
+949abd082524fce8c45dfb147bcd8e8ef49eade3.patch
+588e1f724c9f5de528eb1500b0c85a1a609fe947.patch



View it on GitLab: https://salsa.debian.org/med-team/umap-learn/-/compare/0f6789fe301f8ad7377f6c5d0eeea6b558d318ae...c2064ba6c402d8671e5455147ac1897781287df7

-- 
View it on GitLab: https://salsa.debian.org/med-team/umap-learn/-/compare/0f6789fe301f8ad7377f6c5d0eeea6b558d318ae...c2064ba6c402d8671e5455147ac1897781287df7
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20230210/efb48795/attachment-0001.htm>