Skip to content

Commit

Permalink
Make import depend on anndata version.
Browse files Browse the repository at this point in the history
  • Loading branch information
alam-shahul committed Oct 10, 2024
1 parent 387795b commit dff6eb1
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions src/squidpy/gr/_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@
from contextlib import contextmanager
from typing import TYPE_CHECKING, Any

import anndata
import numpy as np
import pandas as pd
from anndata import AnnData
from anndata._core.views import ArrayView, SparseCSCMatrixView, SparseCSRMatrixView
from anndata.utils import make_index_unique
from packaging.version import Version
from pandas import CategoricalDtype
from pandas.api.types import infer_dtype
from scanpy import logging as logg
Expand All @@ -19,6 +20,14 @@
from squidpy._docs import d
from squidpy._utils import NDArrayA, _unique_order_preserving

CAN_USE_SPARSE_ARRAY = Version(anndata.__version__) >= Version("0.11.0")
if not CAN_USE_SPARSE_ARRAY:
from anndata._core.views import ArrayView
from anndata._core.views import SparseCSCMatrixView as SparseCSCView
from anndata._core.views import SparseCSRMatrixView as SparseCSRView
else:
from anndata._core.views import ArrayView, SparseCSCView, SparseCSRView


def _check_tuple_needles(
needles: Sequence[tuple[Any, Any]],
Expand Down Expand Up @@ -233,7 +242,7 @@ def _extract_expression(
# handle views
if isinstance(res, ArrayView):
return np.asarray(res), genes
if isinstance(res, (SparseCSRMatrixView, SparseCSCMatrixView)):
if isinstance(res, (SparseCSRView, SparseCSCView)):
mro = type(res).mro()
if csr_matrix in mro:
return csr_matrix(res), genes
Expand Down

0 comments on commit dff6eb1

Please sign in to comment.