forked from scverse/anndata
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathtest_concatenate.py
More file actions
1700 lines (1403 loc) · 53.1 KB
/
test_concatenate.py
File metadata and controls
1700 lines (1403 loc) · 53.1 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
from __future__ import annotations
import warnings
from collections.abc import Hashable
from contextlib import nullcontext
from copy import deepcopy
from functools import partial, singledispatch
from itertools import chain, permutations, product
from operator import attrgetter
from typing import TYPE_CHECKING
import numpy as np
import pandas as pd
import pytest
import scipy
from boltons.iterutils import default_exit, remap, research
from numpy import ma
from packaging.version import Version
from scipy import sparse
from anndata import AnnData, Raw, concat
from anndata._core import merge
from anndata._core.index import _subset
from anndata.compat import AwkArray, CSArray, CSMatrix, CupySparseMatrix, DaskArray
from anndata.tests import helpers
from anndata.tests.helpers import (
BASE_MATRIX_PARAMS,
CUPY_MATRIX_PARAMS,
DASK_MATRIX_PARAMS,
DEFAULT_COL_TYPES,
GEN_ADATA_DASK_ARGS,
as_dense_dask_array,
assert_equal,
gen_adata,
gen_vstr_recarray,
)
from anndata.utils import asarray
if TYPE_CHECKING:
from collections.abc import Callable
from typing import Any, Literal
mark_legacy_concatenate = pytest.mark.filterwarnings(
r"ignore:.*AnnData\.concatenate is deprecated:FutureWarning"
)
@singledispatch
def filled_like(a, fill_value=None):
raise NotImplementedError()
@filled_like.register(np.ndarray)
def _filled_array_np(a, fill_value=None):
if fill_value is None:
fill_value = np.nan
return np.broadcast_to(fill_value, a.shape)
@filled_like.register(DaskArray)
def _filled_array(a, fill_value=None):
return as_dense_dask_array(_filled_array_np(a, fill_value))
@filled_like.register(CSMatrix)
def _filled_sparse(a, fill_value=None):
if fill_value is None:
return sparse.csr_matrix(a.shape)
else:
return sparse.csr_matrix(np.broadcast_to(fill_value, a.shape))
@filled_like.register(CSArray)
def _filled_sparse_array(a, fill_value=None):
return sparse.csr_array(filled_like(sparse.csr_matrix(a)))
@filled_like.register(pd.DataFrame)
def _filled_df(a, fill_value=np.nan):
# dtype from pd.concat can be unintuitive, this returns something close enough
return a.loc[[], :].reindex(index=a.index, fill_value=fill_value)
def check_filled_like(x, fill_value=None, elem_name=None):
if fill_value is None:
assert_equal(x, filled_like(x), elem_name=elem_name)
else:
assert_equal(x, filled_like(x, fill_value=fill_value), elem_name=elem_name)
def make_idx_tuple(idx, axis):
tup = [slice(None), slice(None)]
tup[axis] = idx
return tuple(tup)
# Will call func(sparse_matrix) so these types should be sparse compatible
# See array_type if only dense arrays are expected as input.
@pytest.fixture(params=BASE_MATRIX_PARAMS + DASK_MATRIX_PARAMS + CUPY_MATRIX_PARAMS)
def array_type(request):
return request.param
@pytest.fixture(params=BASE_MATRIX_PARAMS + DASK_MATRIX_PARAMS)
def cpu_array_type(request):
return request.param
@pytest.fixture(params=["inner", "outer"])
def join_type(request):
return request.param
@pytest.fixture(params=[0, np.nan, np.pi])
def fill_val(request):
return request.param
@pytest.fixture(params=["obs", "var"])
def axis_name(request) -> Literal["obs", "var"]:
return request.param
@pytest.fixture(params=list(merge.MERGE_STRATEGIES.keys()))
def merge_strategy(request):
return request.param
def fix_known_differences(
orig: AnnData, result: AnnData, *, backwards_compat: bool = True
):
"""
Helper function for reducing anndata's to only the elements we expect to be
equivalent after concatenation.
Only for the case where orig is the ground truth result of what concatenation should be.
If backwards_compat, checks against what `AnnData.concatenate` could do. Otherwise checks for `concat`.
"""
orig = orig.copy()
result = result.copy()
result.strings_to_categoricals() # Should this be implicit in concatenation?
# TODO
# * merge varm, varp similar to uns
# * merge obsp, but some information should be lost
del orig.obsp # TODO
if backwards_compat:
del orig.varm
del orig.varp
result.obs.drop(columns=["batch"], inplace=True)
# Possibly need to fix this, ordered categoricals lose orderedness
for get_df in [lambda k: getattr(k, "obs"), lambda k: getattr(k, "obsm")["df"]]:
str_to_df_converted = get_df(result)
for k, dtype in get_df(orig).dtypes.items():
if isinstance(dtype, pd.CategoricalDtype) and dtype.ordered:
str_to_df_converted[k] = str_to_df_converted[k].astype(dtype)
return orig, result
def test_concat_interface_errors():
adatas = [gen_adata((5, 10)), gen_adata((5, 10))]
with pytest.raises(ValueError, match="`axis` must be.*0, 1, 'obs', or 'var'"):
concat(adatas, axis=3)
with pytest.raises(ValueError, match="'inner' or 'outer'"):
concat(adatas, join="not implemented")
with pytest.raises(ValueError, match="No objects to concatenate"):
concat([])
@mark_legacy_concatenate
@pytest.mark.parametrize(
("concat_func", "backwards_compat"),
[
(partial(concat, merge="unique"), False),
(lambda x, **kwargs: x[0].concatenate(x[1:], **kwargs), True),
],
)
def test_concatenate_roundtrip(join_type, array_type, concat_func, backwards_compat):
adata = gen_adata((100, 10), X_type=array_type, **GEN_ADATA_DASK_ARGS)
remaining = adata.obs_names
subsets = []
while len(remaining) > 0:
n = min(len(remaining), np.random.choice(50))
subset_idx = np.random.choice(remaining, n, replace=False)
subsets.append(adata[subset_idx])
remaining = remaining.difference(subset_idx)
result = concat_func(subsets, join=join_type, uns_merge="same", index_unique=None)
# Correcting for known differences
orig, result = fix_known_differences(
adata, result, backwards_compat=backwards_compat
)
assert_equal(result[orig.obs_names].copy(), orig)
base_type = type(orig.X)
if sparse.issparse(orig.X):
base_type = CSArray if isinstance(orig.X, CSArray) else CSMatrix
if isinstance(orig.X, CupySparseMatrix):
base_type = CupySparseMatrix
assert isinstance(result.X, base_type)
@mark_legacy_concatenate
def test_concatenate_dense():
# dense data
X1 = np.array([[1, 2, 3], [4, 5, 6]])
X2 = np.array([[1, 2, 3], [4, 5, 6]])
X3 = np.array([[1, 2, 3], [4, 5, 6]])
adata1 = AnnData(
X1,
dict(obs_names=["s1", "s2"], anno1=["c1", "c2"]),
dict(var_names=["a", "b", "c"], annoA=[0, 1, 2]),
obsm=dict(X_1=X1, X_2=X2, X_3=X3),
layers=dict(Xs=X1),
)
adata2 = AnnData(
X2,
dict(obs_names=["s3", "s4"], anno1=["c3", "c4"]),
dict(var_names=["d", "c", "b"], annoA=[0, 1, 2]),
obsm=dict(X_1=X1, X_2=X2, X_3=X3),
layers={"Xs": X2},
)
adata3 = AnnData(
X3,
dict(obs_names=["s1", "s2"], anno2=["d3", "d4"]),
dict(var_names=["d", "c", "b"], annoB=[0, 1, 2]),
obsm=dict(X_1=X1, X_2=X2),
layers=dict(Xs=X3),
)
# inner join
adata = adata1.concatenate(adata2, adata3)
X_combined = [[2, 3], [5, 6], [3, 2], [6, 5], [3, 2], [6, 5]]
assert adata.X.astype(int).tolist() == X_combined
assert adata.layers["Xs"].astype(int).tolist() == X_combined
assert adata.obs_keys() == ["anno1", "anno2", "batch"]
assert adata.var_keys() == ["annoA-0", "annoA-1", "annoB-2"]
assert adata.var.values.tolist() == [[1, 2, 2], [2, 1, 1]]
assert adata.obsm_keys() == ["X_1", "X_2"]
assert adata.obsm["X_1"].tolist() == np.concatenate([X1, X1, X1]).tolist()
# with batch_key and batch_categories
adata = adata1.concatenate(adata2, adata3, batch_key="batch1")
assert adata.obs_keys() == ["anno1", "anno2", "batch1"]
adata = adata1.concatenate(adata2, adata3, batch_categories=["a1", "a2", "a3"])
assert adata.obs["batch"].cat.categories.tolist() == ["a1", "a2", "a3"]
assert adata.var_names.tolist() == ["b", "c"]
# outer join
adata = adata1.concatenate(adata2, adata3, join="outer")
X_ref = np.array(
[
[1.0, 2.0, 3.0, np.nan],
[4.0, 5.0, 6.0, np.nan],
[np.nan, 3.0, 2.0, 1.0],
[np.nan, 6.0, 5.0, 4.0],
[np.nan, 3.0, 2.0, 1.0],
[np.nan, 6.0, 5.0, 4.0],
]
)
np.testing.assert_equal(adata.X, X_ref)
var_ma = ma.masked_invalid(adata.var.values.tolist())
var_ma_ref = ma.masked_invalid(
np.array(
[
[0.0, np.nan, np.nan],
[1.0, 2.0, 2.0],
[2.0, 1.0, 1.0],
[np.nan, 0.0, 0.0],
]
)
)
assert np.array_equal(var_ma.mask, var_ma_ref.mask)
assert np.allclose(var_ma.compressed(), var_ma_ref.compressed())
@mark_legacy_concatenate
def test_concatenate_layers(array_type, join_type):
adatas = []
for _ in range(5):
a = array_type(sparse.random(100, 200, format="csr"))
adatas.append(AnnData(X=a, layers={"a": a}))
merged = adatas[0].concatenate(adatas[1:], join=join_type)
assert_equal(merged.X, merged.layers["a"])
@pytest.fixture
def obsm_adatas():
def gen_index(n):
return [f"cell{i}" for i in range(n)]
return [
AnnData(
X=sparse.csr_matrix((3, 5)),
obs=pd.DataFrame(index=gen_index(3)),
obsm={
"dense": np.arange(6).reshape(3, 2),
"sparse": sparse.csr_matrix(np.arange(6).reshape(3, 2)),
"df": pd.DataFrame(
{
"a": np.arange(3),
"b": list("abc"),
"c": pd.Categorical(list("aab")),
},
index=gen_index(3),
),
},
),
AnnData(
X=sparse.csr_matrix((4, 10)),
obs=pd.DataFrame(index=gen_index(4)),
obsm=dict(
dense=np.arange(12).reshape(4, 3),
df=pd.DataFrame(dict(a=np.arange(3, 7)), index=gen_index(4)),
),
),
AnnData(
X=sparse.csr_matrix((2, 100)),
obs=pd.DataFrame(index=gen_index(2)),
obsm={
"sparse": np.arange(8).reshape(2, 4),
"dense": np.arange(4, 8).reshape(2, 2),
"df": pd.DataFrame(
{
"a": np.arange(7, 9),
"b": list("cd"),
"c": pd.Categorical(list("ab")),
},
index=gen_index(2),
),
},
),
]
@mark_legacy_concatenate
def test_concatenate_obsm_inner(obsm_adatas):
adata = obsm_adatas[0].concatenate(obsm_adatas[1:], join="inner")
assert set(adata.obsm.keys()) == {"dense", "df"}
assert adata.obsm["dense"].shape == (9, 2)
assert adata.obsm["dense"].tolist() == [
[0, 1],
[2, 3],
[4, 5],
[0, 1],
[3, 4],
[6, 7],
[9, 10],
[4, 5],
[6, 7],
]
assert adata.obsm["df"].columns == ["a"]
assert adata.obsm["df"]["a"].tolist() == list(range(9))
# fmt: off
true_df = (
pd.concat([a.obsm["df"] for a in obsm_adatas], join="inner")
.reset_index(drop=True)
)
# fmt: on
cur_df = adata.obsm["df"].reset_index(drop=True)
pd.testing.assert_frame_equal(true_df, cur_df)
@mark_legacy_concatenate
def test_concatenate_obsm_outer(obsm_adatas, fill_val):
outer = obsm_adatas[0].concatenate(
obsm_adatas[1:], join="outer", fill_value=fill_val
)
inner = obsm_adatas[0].concatenate(obsm_adatas[1:], join="inner")
for k, inner_v in inner.obsm.items():
assert np.array_equal(
_subset(outer.obsm[k], (slice(None), slice(None, inner_v.shape[1]))),
inner_v,
)
assert set(outer.obsm.keys()) == {"dense", "df", "sparse"}
assert isinstance(outer.obsm["dense"], np.ndarray)
np.testing.assert_equal(
outer.obsm["dense"],
np.array(
[
[0, 1, fill_val],
[2, 3, fill_val],
[4, 5, fill_val],
[0, 1, 2],
[3, 4, 5],
[6, 7, 8],
[9, 10, 11],
[4, 5, fill_val],
[6, 7, fill_val],
]
),
)
assert isinstance(outer.obsm["sparse"], CSMatrix)
np.testing.assert_equal(
outer.obsm["sparse"].toarray(),
np.array(
[
[0, 1, fill_val, fill_val],
[2, 3, fill_val, fill_val],
[4, 5, fill_val, fill_val],
[fill_val, fill_val, fill_val, fill_val],
[fill_val, fill_val, fill_val, fill_val],
[fill_val, fill_val, fill_val, fill_val],
[fill_val, fill_val, fill_val, fill_val],
[0, 1, 2, 3],
[4, 5, 6, 7],
]
),
)
# fmt: off
true_df = (
pd.concat([a.obsm["df"] for a in obsm_adatas], join="outer")
.reset_index(drop=True)
)
# fmt: on
cur_df = outer.obsm["df"].reset_index(drop=True)
pd.testing.assert_frame_equal(true_df, cur_df)
@pytest.mark.parametrize(
("axis", "axis_name"),
[("obs", 0), ("var", 1)],
)
def test_concat_axis_param(axis, axis_name):
a, b = gen_adata((10, 10)), gen_adata((10, 10))
assert_equal(concat([a, b], axis=axis), concat([a, b], axis=axis_name))
def test_concat_annot_join(obsm_adatas, join_type):
adatas = [
AnnData(sparse.csr_matrix(a.shape), obs=a.obsm["df"], var=a.var)
for a in obsm_adatas
]
pd.testing.assert_frame_equal(
concat(adatas, join=join_type).obs,
pd.concat([a.obs for a in adatas], join=join_type),
)
@mark_legacy_concatenate
def test_concatenate_layers_misaligned(array_type, join_type):
adatas = []
for _ in range(5):
a = array_type(sparse.random(100, 200, format="csr"))
adata = AnnData(X=a, layers={"a": a})
adatas.append(
adata[:, np.random.choice(adata.var_names, 150, replace=False)].copy()
)
merged = adatas[0].concatenate(adatas[1:], join=join_type)
assert_equal(merged.X, merged.layers["a"])
@mark_legacy_concatenate
def test_concatenate_layers_outer(array_type, fill_val):
# Testing that issue #368 is fixed
a = AnnData(
X=np.ones((10, 20)),
layers={"a": array_type(sparse.random(10, 20, format="csr"))},
)
b = AnnData(X=np.ones((10, 20)))
c = a.concatenate(b, join="outer", fill_value=fill_val, batch_categories=["a", "b"])
np.testing.assert_array_equal(
asarray(c[c.obs["batch"] == "b"].layers["a"]), fill_val
)
@mark_legacy_concatenate
def test_concatenate_fill_value(fill_val):
def get_obs_els(adata):
return {
"X": adata.X,
**{f"layer_{k}": adata.layers[k] for k in adata.layers},
**{f"obsm_{k}": adata.obsm[k] for k in adata.obsm},
}
adata1 = gen_adata((10, 10))
adata1.obsm = {
k: v
for k, v in adata1.obsm.items()
if not isinstance(v, pd.DataFrame | AwkArray)
}
adata2 = gen_adata((10, 5))
adata2.obsm = {
k: v[:, : v.shape[1] // 2]
for k, v in adata2.obsm.items()
if not isinstance(v, pd.DataFrame | AwkArray)
}
adata3 = gen_adata((7, 3))
adata3.obsm = {
k: v[:, : v.shape[1] // 3]
for k, v in adata3.obsm.items()
if not isinstance(v, pd.DataFrame | AwkArray)
}
# remove AwkArrays from adata.var, as outer joins are not yet implemented for them
for tmp_ad in [adata1, adata2, adata3]:
for k in [k for k, v in tmp_ad.varm.items() if isinstance(v, AwkArray)]:
del tmp_ad.varm[k]
joined = adata1.concatenate([adata2, adata3], join="outer", fill_value=fill_val)
ptr = 0
for orig in [adata1, adata2, adata3]:
cur = joined[ptr : ptr + orig.n_obs]
cur_els = get_obs_els(cur)
orig_els = get_obs_els(orig)
for k, cur_v in cur_els.items():
orig_v = orig_els.get(k, sparse.csr_matrix((orig.n_obs, 0)))
assert_equal(cur_v[:, : orig_v.shape[1]], orig_v)
np.testing.assert_equal(asarray(cur_v[:, orig_v.shape[1] :]), fill_val)
ptr += orig.n_obs
@mark_legacy_concatenate
def test_concatenate_dense_duplicates():
X1 = np.array([[1, 2, 3], [4, 5, 6]])
X2 = np.array([[1, 2, 3], [4, 5, 6]])
X3 = np.array([[1, 2, 3], [4, 5, 6]])
# inner join duplicates
adata1 = AnnData(
X1,
dict(obs_names=["s1", "s2"], anno1=["c1", "c2"]),
dict(
var_names=["a", "b", "c"],
annoA=[0, 1, 2],
annoB=[1.1, 1.0, 2.0],
annoC=[1.1, 1.0, 2.0],
annoD=[2.1, 2.0, 3.0],
),
)
adata2 = AnnData(
X2,
dict(obs_names=["s3", "s4"], anno1=["c3", "c4"]),
dict(
var_names=["a", "b", "c"],
annoA=[0, 1, 2],
annoB=[1.1, 1.0, 2.0],
annoC=[1.1, 1.0, 2.0],
annoD=[2.1, 2.0, 3.0],
),
)
adata3 = AnnData(
X3,
dict(obs_names=["s1", "s2"], anno2=["d3", "d4"]),
dict(
var_names=["a", "b", "c"],
annoA=[0, 1, 2],
annoB=[1.1, 1.0, 2.0],
annoD=[2.1, 2.0, 3.1],
),
)
adata = adata1.concatenate(adata2, adata3)
assert adata.var_keys() == [
"annoA",
"annoB",
"annoC-0",
"annoD-0",
"annoC-1",
"annoD-1",
"annoD-2",
]
@mark_legacy_concatenate
def test_concatenate_sparse():
# sparse data
from scipy.sparse import csr_matrix
X1 = csr_matrix([[0, 2, 3], [0, 5, 6]])
X2 = csr_matrix([[0, 2, 3], [0, 5, 6]])
X3 = csr_matrix([[1, 2, 0], [0, 5, 6]])
adata1 = AnnData(
X1,
dict(obs_names=["s1", "s2"], anno1=["c1", "c2"]),
dict(var_names=["a", "b", "c"]),
layers=dict(Xs=X1),
)
adata2 = AnnData(
X2,
dict(obs_names=["s3", "s4"], anno1=["c3", "c4"]),
dict(var_names=["d", "c", "b"]),
layers=dict(Xs=X2),
)
adata3 = AnnData(
X3,
dict(obs_names=["s5", "s6"], anno2=["d3", "d4"]),
dict(var_names=["d", "c", "b"]),
layers=dict(Xs=X3),
)
# inner join
adata = adata1.concatenate(adata2, adata3)
X_combined = [[2, 3], [5, 6], [3, 2], [6, 5], [0, 2], [6, 5]]
assert adata.X.toarray().astype(int).tolist() == X_combined
assert adata.layers["Xs"].toarray().astype(int).tolist() == X_combined
# outer join
adata = adata1.concatenate(adata2, adata3, join="outer")
assert adata.X.toarray().tolist() == [
[0.0, 2.0, 3.0, 0.0],
[0.0, 5.0, 6.0, 0.0],
[0.0, 3.0, 2.0, 0.0],
[0.0, 6.0, 5.0, 0.0],
[0.0, 0.0, 2.0, 1.0],
[0.0, 6.0, 5.0, 0.0],
]
@mark_legacy_concatenate
def test_concatenate_mixed():
X1 = sparse.csr_matrix(np.array([[1, 2, 0], [4, 0, 6], [0, 0, 9]]))
X2 = sparse.csr_matrix(np.array([[0, 2, 3], [4, 0, 0], [7, 0, 9]]))
X3 = sparse.csr_matrix(np.array([[1, 0, 3], [0, 0, 6], [0, 8, 0]]))
X4 = np.array([[0, 2, 3], [4, 0, 0], [7, 0, 9]])
adata1 = AnnData(
X1,
dict(obs_names=["s1", "s2", "s3"], anno1=["c1", "c2", "c3"]),
dict(var_names=["a", "b", "c"], annoA=[0, 1, 2]),
layers=dict(counts=X1),
)
adata2 = AnnData(
X2,
dict(obs_names=["s4", "s5", "s6"], anno1=["c3", "c4", "c5"]),
dict(var_names=["d", "c", "b"], annoA=[0, 1, 2]),
layers=dict(counts=X4), # sic
)
adata3 = AnnData(
X3,
dict(obs_names=["s7", "s8", "s9"], anno2=["d3", "d4", "d5"]),
dict(var_names=["d", "c", "b"], annoA=[0, 2, 3], annoB=[0, 1, 2]),
layers=dict(counts=X3),
)
adata4 = AnnData(
X4,
dict(obs_names=["s4", "s5", "s6"], anno1=["c3", "c4", "c5"]),
dict(var_names=["d", "c", "b"], annoA=[0, 1, 2]),
layers=dict(counts=X2), # sic
)
adata_all = AnnData.concatenate(adata1, adata2, adata3, adata4)
assert isinstance(adata_all.X, sparse.csr_matrix)
assert isinstance(adata_all.layers["counts"], sparse.csr_matrix)
@mark_legacy_concatenate
def test_concatenate_with_raw():
# dense data
X1 = np.array([[1, 2, 3], [4, 5, 6]])
X2 = np.array([[1, 2, 3], [4, 5, 6]])
X3 = np.array([[1, 2, 3], [4, 5, 6]])
X4 = np.array([[1, 2, 3, 4], [5, 6, 7, 8]])
adata1 = AnnData(
X1,
dict(obs_names=["s1", "s2"], anno1=["c1", "c2"]),
dict(var_names=["a", "b", "c"], annoA=[0, 1, 2]),
layers=dict(Xs=X1),
)
adata2 = AnnData(
X2,
dict(obs_names=["s3", "s4"], anno1=["c3", "c4"]),
dict(var_names=["d", "c", "b"], annoA=[0, 1, 2]),
layers=dict(Xs=X2),
)
adata3 = AnnData(
X3,
dict(obs_names=["s1", "s2"], anno2=["d3", "d4"]),
dict(var_names=["d", "c", "b"], annoB=[0, 1, 2]),
layers=dict(Xs=X3),
)
adata4 = AnnData(
X4,
dict(obs_names=["s1", "s2"], anno1=["c1", "c2"]),
dict(var_names=["a", "b", "c", "z"], annoA=[0, 1, 2, 3]),
layers=dict(Xs=X4),
)
adata1.raw = adata1.copy()
adata2.raw = adata2.copy()
adata3.raw = adata3.copy()
adata_all = AnnData.concatenate(adata1, adata2, adata3)
assert isinstance(adata_all.raw, Raw)
assert set(adata_all.raw.var_names) == {"b", "c"}
assert_equal(adata_all.raw.to_adata().obs, adata_all.obs)
assert np.array_equal(adata_all.raw.X, adata_all.X)
adata_all = AnnData.concatenate(adata1, adata2, adata3, join="outer")
assert isinstance(adata_all.raw, Raw)
assert set(adata_all.raw.var_names) == set("abcd")
assert_equal(adata_all.raw.to_adata().obs, adata_all.obs)
assert np.array_equal(np.nan_to_num(adata_all.raw.X), np.nan_to_num(adata_all.X))
adata3.raw = adata4.copy()
adata_all = AnnData.concatenate(adata1, adata2, adata3, join="outer")
assert isinstance(adata_all.raw, Raw)
assert set(adata_all.raw.var_names) == set("abcdz")
assert set(adata_all.var_names) == set("abcd")
assert not np.array_equal(
np.nan_to_num(adata_all.raw.X), np.nan_to_num(adata_all.X)
)
del adata3.raw
with pytest.warns(
UserWarning,
match=(
"Only some AnnData objects have `.raw` attribute, "
"not concatenating `.raw` attributes."
),
):
adata_all = AnnData.concatenate(adata1, adata2, adata3)
assert adata_all.raw is None
del adata1.raw
del adata2.raw
assert all(_adata.raw is None for _adata in (adata1, adata2, adata3))
adata_all = AnnData.concatenate(adata1, adata2, adata3)
assert adata_all.raw is None
def test_concatenate_awkward(join_type):
import awkward as ak
a = ak.Array([[{"a": 1, "b": "foo"}], [{"a": 2, "b": "bar"}, {"a": 3, "b": "baz"}]])
b = ak.Array(
[
[{"a": 4}, {"a": 5}],
[{"a": 6}],
[{"a": 7}],
]
)
adata_a = AnnData(np.zeros((2, 0), dtype=float), obsm={"awk": a})
adata_b = AnnData(np.zeros((3, 0), dtype=float), obsm={"awk": b})
if join_type == "inner":
expected = ak.Array(
[
[{"a": 1}],
[{"a": 2}, {"a": 3}],
[{"a": 4}, {"a": 5}],
[{"a": 6}],
[{"a": 7}],
]
)
elif join_type == "outer":
# TODO: This is what we would like to return, but waiting on:
# * https://github.com/scikit-hep/awkward/issues/2182 and awkward 2.1.0
# * https://github.com/scikit-hep/awkward/issues/2173
# expected = ak.Array(
# [
# [{"a": 1, "b": "foo"}],
# [{"a": 2, "b": "bar"}, {"a": 3, "b": "baz"}],
# [{"a": 4, "b": None}, {"a": 5, "b": None}],
# [{"a": 6, "b": None}],
# [{"a": 7, "b": None}],
# ]
# )
expected = ak.concatenate(
[ # I don't think I can construct a UnionArray directly
ak.Array(
[
[{"a": 1, "b": "foo"}],
[{"a": 2, "b": "bar"}, {"a": 3, "b": "baz"}],
]
),
ak.Array(
[
[{"a": 4}, {"a": 5}],
[{"a": 6}],
[{"a": 7}],
]
),
]
)
result = concat([adata_a, adata_b], join=join_type).obsm["awk"]
assert_equal(expected, result)
@pytest.mark.parametrize(
"other",
[
pd.DataFrame({"a": [4, 5, 6], "b": ["foo", "bar", "baz"]}, index=list("cde")),
np.ones((3, 2)),
sparse.random(3, 100, format="csr"),
],
)
def test_awkward_does_not_mix(join_type, other):
import awkward as ak
awk = ak.Array(
[[{"a": 1, "b": "foo"}], [{"a": 2, "b": "bar"}, {"a": 3, "b": "baz"}]]
)
adata_a = AnnData(
np.zeros((2, 3), dtype=float),
obs=pd.DataFrame(index=list("ab")),
obsm={"val": awk},
)
adata_b = AnnData(
np.zeros((3, 3), dtype=float),
obs=pd.DataFrame(index=list("cde")),
obsm={"val": other},
)
with pytest.raises(
NotImplementedError,
match=r"Cannot concatenate an AwkwardArray with other array types",
):
concat([adata_a, adata_b], join=join_type)
def test_pairwise_concat(axis_name, array_type):
axis, axis_name = merge._resolve_axis(axis_name)
_, alt_axis_name = merge._resolve_axis(1 - axis)
axis_sizes = [[100, 200, 50], [50, 50, 50]]
if axis_name == "var":
axis_sizes.reverse()
Ms, Ns = axis_sizes
axis_attr = f"{axis_name}p"
alt_attr = f"{alt_axis_name}p"
def gen_axis_array(m):
return array_type(sparse.random(m, m, format="csr", density=0.1))
adatas = {
k: AnnData(
X=sparse.csr_matrix((m, n)),
obsp={"arr": gen_axis_array(m)},
varp={"arr": gen_axis_array(n)},
)
for k, m, n in zip("abc", Ms, Ns)
}
w_pairwise = concat(adatas, axis=axis, label="orig", pairwise=True)
wo_pairwise = concat(adatas, axis=axis, label="orig", pairwise=False)
# Check that argument controls whether elements are included
assert getattr(wo_pairwise, axis_attr) == {}
assert getattr(w_pairwise, axis_attr) != {}
# Check values of included elements
full_inds = np.arange(w_pairwise.shape[axis])
obs_var: pd.DataFrame = getattr(w_pairwise, axis_name)
groups = obs_var.groupby("orig", observed=True).indices
for k, inds in groups.items():
orig_arr = getattr(adatas[k], axis_attr)["arr"]
full_arr = getattr(w_pairwise, axis_attr)["arr"]
if isinstance(full_arr, DaskArray):
full_arr = full_arr.compute()
# Check original values are intact
assert_equal(orig_arr, _subset(full_arr, (inds, inds)))
# Check that entries are filled with zeroes
assert_equal(
sparse.csr_matrix((len(inds), len(full_inds) - len(inds))),
_subset(full_arr, (inds, np.setdiff1d(full_inds, inds))),
)
assert_equal(
sparse.csr_matrix((len(full_inds) - len(inds), len(inds))),
_subset(full_arr, (np.setdiff1d(full_inds, inds), inds)),
)
# Check that argument does not affect alternative axis
assert "arr" in getattr(
concat(adatas, axis=axis, pairwise=False, merge="first"), alt_attr
)
def test_nan_merge(axis_name, join_type, array_type):
axis, _ = merge._resolve_axis(axis_name)
alt_axis, alt_axis_name = merge._resolve_axis(1 - axis)
mapping_attr = f"{alt_axis_name}m"
adata_shape = (20, 10)
arr = array_type(
sparse.random(adata_shape[alt_axis], 10, density=0.1, format="csr")
)
arr_nan = arr.copy()
with warnings.catch_warnings():
warnings.simplefilter("ignore", category=sparse.SparseEfficiencyWarning)
for _ in range(10):
arr_nan[np.random.choice(arr.shape[0]), np.random.choice(arr.shape[1])] = (
np.nan
)
_data = {"X": sparse.csr_matrix(adata_shape), mapping_attr: {"arr": arr_nan}}
orig1 = AnnData(**_data)
orig2 = AnnData(**_data)
result = concat([orig1, orig2], axis=axis, join=join_type, merge="same")
assert_equal(getattr(orig1, mapping_attr), getattr(result, mapping_attr))
orig_nonan = AnnData(
**{"X": sparse.csr_matrix(adata_shape), mapping_attr: {"arr": arr}}
)
result_nonan = concat([orig1, orig_nonan], axis=axis, merge="same")
assert len(getattr(result_nonan, mapping_attr)) == 0
def test_merge_unique():
from anndata._core.merge import merge_unique
# Simple cases
assert merge_unique([{"a": "b"}, {"a": "b"}]) == {"a": "b"}
assert merge_unique([{"a": {"b": "c"}}, {"a": {"b": "c"}}]) == {"a": {"b": "c"}}
assert merge_unique([{"a": {"b": "c"}}, {"a": {"b": "d"}}]) == {}
assert merge_unique([{"a": {"b": "c", "d": "e"}}, {"a": {"b": "c", "d": "f"}}]) == {
"a": {"b": "c"}
}
assert merge_unique(
[{"a": {"b": {"c": {"d": "e"}}}}, {"a": {"b": {"c": {"d": "e"}}}}]
) == {"a": {"b": {"c": {"d": "e"}}}}
assert (
merge_unique(
[
{"a": {"b": {"c": {"d": "e"}}}},
{"a": {"b": {"c": {"d": "f"}}}},
{"a": {"b": {"c": {"d": "e"}}}},
]
)
== {}
)
assert merge_unique([{"a": 1}, {"b": 2}]) == {"a": 1, "b": 2}
assert merge_unique([{"a": 1}, {"b": 2}, {"a": 1, "b": {"c": 2, "d": 3}}]) == {
"a": 1
}
# Test equivalency between arrays and lists
assert list(
merge_unique([{"a": np.ones(5)}, {"a": list(np.ones(5))}])["a"]
) == list(np.ones(5))
assert merge_unique([{"a": np.ones(5)}, {"a": list(np.ones(4))}]) == {}
def test_merge_same():
from anndata._core.merge import merge_same
# Same as unique for a number of cases:
assert merge_same([{"a": "b"}, {"a": "b"}]) == {"a": "b"}
assert merge_same([{"a": {"b": "c"}}, {"a": {"b": "c"}}]) == {"a": {"b": "c"}}
assert merge_same([{"a": {"b": "c"}}, {"a": {"b": "d"}}]) == {}
assert merge_same([{"a": {"b": "c", "d": "e"}}, {"a": {"b": "c", "d": "f"}}]) == {
"a": {"b": "c"}
}
assert merge_same([{"a": {"b": "c"}, "d": "e"}, {"a": {"b": "c"}, "d": 2}]) == {
"a": {"b": "c"}
}
assert merge_same(
[{"a": {"b": {"c": {"d": "e"}}}}, {"a": {"b": {"c": {"d": "e"}}}}]
) == {"a": {"b": {"c": {"d": "e"}}}}
assert merge_same([{"a": 1}, {"b": 2}]) == {}
assert merge_same([{"a": 1}, {"b": 2}, {"a": 1, "b": {"c": 2, "d": 3}}]) == {}
# Test equivalency between arrays and lists
assert list(merge_same([{"a": np.ones(5)}, {"a": list(np.ones(5))}])["a"]) == list(
np.ones(5)
)
def test_merge_first():
from anndata._core.merge import merge_first
assert merge_first([{"a": "b"}, {"a": "b"}]) == {"a": "b"}
assert merge_first([{"a": {"b": "c"}}, {"a": {"b": "c"}}]) == {"a": {"b": "c"}}
assert merge_first([{"a": 1}, {"a": 2}]) == {"a": 1}
assert merge_first([{"a": 1}, {"a": {"b": {"c": {"d": "e"}}}}]) == {"a": 1}