support somacore>=1.0.24 / tiledbsoma>=1.15.0rc4

single-cell-data · Dec 19, 2024 · eb880b4 · eb880b4
1 parent 68a8fa2
commit eb880b4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.github/workflows/python-tilledbsoma-ml-compat.yml b/.github/workflows/python-tilledbsoma-ml-compat.yml
@@ -31,6 +31,7 @@ jobs:
           - "tiledbsoma~=1.12.0"
           - "tiledbsoma~=1.13.0"
           - "tiledbsoma~=1.14.0"
+          - "tiledbsoma~=1.15.0rc4"
 
     runs-on: ${{ matrix.os }}
 

diff --git a/src/tiledbsoma_ml/pytorch.py b/src/tiledbsoma_ml/pytorch.py
@@ -27,7 +27,6 @@
 import scipy.sparse as sparse
 import tiledbsoma as soma
 import torch
-from somacore.query._eager_iter import EagerIterator as _EagerIterator
 
 from tiledbsoma_ml._csr import CSR_IO_Buffer
 from tiledbsoma_ml._distributed import (
@@ -37,6 +36,13 @@
 from tiledbsoma_ml._experiment_locator import ExperimentLocator
 from tiledbsoma_ml._utils import NDArrayNumber, batched, splits
 
+try:
+    # somacore<1.0.24 / tiledbsoma<1.15
+    from somacore.query._eager_iter import EagerIterator as _EagerIterator
+except ImportError:
+    # somacore>=1.0.24 / tiledbsoma>=1.15
+    from tiledbsoma._eager_iter import EagerIterator as _EagerIterator
+
 logger = logging.getLogger("tiledbsoma_ml.pytorch")
 
 NDArrayJoinId = npt.NDArray[np.int64]