Merge pull request #592 from mdekstrand/fix/torch-numpy-version

Fix NumPy/PyTorch version problem and item KNN type problem w/ NumPy array
lenskit · Jan 7, 2025 · 9909d6b · 9909d6b
2 parents 51ef299 + 8472e4b
commit 9909d6b
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 614 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -115,8 +115,6 @@ jobs:
         shell: bash
         env:
           PYTHON: '${{steps.install-python.outputs.python-path}}'
-          UV_EXTRA_INDEX_URL: 'https://download.pytorch.org/whl/cpu'
-          UV_INDEX_STRATEGY: unsafe-first-match
       - name: "🔍 Inspect environment"
         run: |
           python -m lenskit.util.envcheck
@@ -204,8 +202,6 @@ jobs:
         shell: bash
         env:
           PYTHON: '${{steps.install-python.outputs.python-path}}'
-          UV_EXTRA_INDEX_URL: 'https://download.pytorch.org/whl/cpu'
-          UV_INDEX_STRATEGY: unsafe-first-match
       - name: "🔍 Inspect environment"
         run: |
           python -m lenskit.util.envcheck
@@ -297,8 +293,6 @@ jobs:
         shell: bash
         env:
           PYTHON: '${{steps.install-python.outputs.python-path}}'
-          UV_EXTRA_INDEX_URL: 'https://download.pytorch.org/whl/cpu'
-          UV_INDEX_STRATEGY: unsafe-first-match
       - name: "🔍 Inspect environment"
         run: |
           python -m lenskit.util.envcheck
@@ -389,8 +383,6 @@ jobs:
         shell: bash
         env:
           PYTHON: '${{steps.install-python.outputs.python-path}}'
-          UV_EXTRA_INDEX_URL: 'https://download.pytorch.org/whl/cpu'
-          UV_INDEX_STRATEGY: unsafe-first-match
       - name: "🔍 Inspect environment"
         run: |
           python -m lenskit.util.envcheck
@@ -481,8 +473,6 @@ jobs:
         shell: bash
         env:
           PYTHON: '${{steps.install-python.outputs.python-path}}'
-          UV_EXTRA_INDEX_URL: 'https://download.pytorch.org/whl/cpu'
-          UV_INDEX_STRATEGY: unsafe-first-match
       - name: "🔍 Inspect environment"
         run: |
           python -m lenskit.util.envcheck

diff --git a/lenskit/lenskit/knn/item.py b/lenskit/lenskit/knn/item.py
@@ -241,7 +241,7 @@ def __call__(self, query: QueryInput, items: ItemList) -> ItemList:
 
         # subset the model to rated and target items
         model = self.sim_matrix_
-        model = model[ri_valid_nums, :]
+        model = model[ri_valid_nums.numpy(), :]
         assert isinstance(model, csr_array)
         model = model[:, ti_valid_nums]
         assert isinstance(model, csr_array)

diff --git a/lenskit/pyproject.toml b/lenskit/pyproject.toml
@@ -66,3 +66,12 @@ raw-options = { root = "..", version_scheme = "guess-next-dev" }
 
 [tool.hatch.build.hooks.vcs]
 version-file = "lenskit/_version.py"
+
+# override where UV gets pytorch
+[[tool.uv.index]]
+name = "pytorch-cpu"
+url = "https://download.pytorch.org/whl/cpu"
+explicit = true
+
+[tool.uv.sources]
+torch = [{ index = "pytorch-cpu" }]