Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(feat): igraph leiden implementation now included as an option in sc.tl.leiden #2815

Merged
merged 87 commits into from Feb 19, 2024
Merged
Changes from 1 commit
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
eba6a9a
(feat): igraph as option for leiden
ilan-gold Jan 12, 2024
519cad3
(feat): add test for similarity
ilan-gold Jan 15, 2024
25b6705
(feat): migrate defaults to `igraph`
ilan-gold Jan 15, 2024
00f5904
(chore): add test for `directed` + `igraph`
ilan-gold Jan 15, 2024
7f46900
(chore): change expected images
ilan-gold Jan 16, 2024
e306ac3
(fix): weights condition bug
ilan-gold Jan 16, 2024
642235d
Merge branch 'master' into igraph_leiden
ilan-gold Jan 16, 2024
5439d9d
(fix): change `rank_genes_groups` tolerance and update test images
ilan-gold Jan 16, 2024
2449148
Merge branch 'igraph_leiden' of github.com:ilan-gold/scanpy into igra…
ilan-gold Jan 16, 2024
2fe2b9a
(feat): new violin plot based on redone cluster assignments
ilan-gold Jan 16, 2024
a14b13e
(chore): check parameters matching
ilan-gold Jan 16, 2024
8f3b169
(fix): handle import properly
ilan-gold Jan 16, 2024
b89eaa0
(fix): handle `partition_type` with `use_igraph`
ilan-gold Jan 16, 2024
f67225d
(chore): remove unnecessary test args
ilan-gold Jan 16, 2024
202787c
(chore): add test for old defaults
ilan-gold Jan 16, 2024
d738092
(chore): pre-commit?
ilan-gold Jan 16, 2024
2d8ab25
(chore): pre-commit hooks run
ilan-gold Jan 16, 2024
ece40bf
(chore): make violin plot `expected` correct
ilan-gold Jan 16, 2024
b24d1c4
(fix): change `tol` again for violin plots
ilan-gold Jan 17, 2024
a4aebfd
Merge branch 'master' into igraph_leiden
ilan-gold Jan 19, 2024
4fcbcc6
(chore): revert tolerance change - separate issue incoming
ilan-gold Jan 22, 2024
7a75fdf
Merge branch 'igraph_leiden' of github.com:ilan-gold/scanpy into igra…
ilan-gold Jan 22, 2024
a79e00c
Merge branch 'master' into igraph_leiden
ilan-gold Jan 22, 2024
fd748f4
(chore): release note
ilan-gold Jan 22, 2024
be32bc2
(chore): try new plots with random seed set
ilan-gold Jan 22, 2024
07ffc84
(test): try publishing artifacts
ilan-gold Jan 22, 2024
fbd2173
(fix): publish artifact
ilan-gold Jan 22, 2024
214eaa4
Merge branch 'master' into igraph_leiden
ilan-gold Jan 23, 2024
345fcf4
(fix): publish other images
ilan-gold Jan 23, 2024
1f35a00
(chore): umap
ilan-gold Jan 23, 2024
ac75b6b
(fix): fix random seeding for `igraph`
ilan-gold Jan 23, 2024
488ea75
(fix): import in function
ilan-gold Jan 23, 2024
3db3bb5
(fix): remove umap from test
ilan-gold Jan 23, 2024
540a204
(fix): try different random?
ilan-gold Jan 23, 2024
d3afd43
(feat): try marker gene labeling + write results
ilan-gold Jan 23, 2024
0dbfe7b
(fix): publish artifacts
ilan-gold Jan 23, 2024
26e6540
(fix): try writing out data after relabel
ilan-gold Jan 23, 2024
0bcb2b7
(fix): try stable dataset
ilan-gold Jan 23, 2024
d583619
(chore): add more writes
ilan-gold Jan 24, 2024
cf8449c
(fix): sort categories
ilan-gold Jan 24, 2024
6a306e8
(fix): require igraph
ilan-gold Jan 24, 2024
3cdd337
(chore): remove build artifact
ilan-gold Jan 24, 2024
60c53eb
(fix): spelling error
ilan-gold Jan 24, 2024
bf02b53
(fix): swap changed after re-ordering
ilan-gold Jan 24, 2024
8833246
(chore): `use_igraph` -> `use_leidenalg`
ilan-gold Jan 24, 2024
015a2ac
fmt
flying-sheep Jan 25, 2024
3cf18f7
(refactor): `use_leidenalg` -> `backend`
ilan-gold Jan 25, 2024
e903794
(refactor): get `objective_function` from `clustering_args`
ilan-gold Jan 25, 2024
3dc2d95
(fix): docstring links
ilan-gold Jan 25, 2024
0ba3a04
Merge branch 'master' into igraph_leiden
ilan-gold Jan 25, 2024
bd8382d
(refactor): create rng for igraph
ilan-gold Jan 25, 2024
6958e7d
(refactor): less lines
ilan-gold Jan 25, 2024
4f736df
(chore): add test for random state
ilan-gold Jan 26, 2024
eb070d6
(refactor): fix initial state settings for other `igraph` methods by …
ilan-gold Jan 26, 2024
4b8c823
(refactor): `FLAVORS` reuse in test
ilan-gold Jan 26, 2024
66cc1e2
Update scanpy/tools/_leiden.py
ilan-gold Jan 26, 2024
f2fc12b
Merge branch 'master' into igraph_leiden
ilan-gold Jan 26, 2024
5c49c56
Update scanpy/_utils/__init__.py
ilan-gold Jan 26, 2024
04cd7f9
Update scanpy/_utils/__init__.py
ilan-gold Jan 26, 2024
16d822c
(fix): fix heatmap plot
ilan-gold Jan 26, 2024
bca86ff
(fix): change out images for new random seed method
ilan-gold Jan 26, 2024
dd540dc
Merge branch 'igraph_leiden' of github.com:ilan-gold/scanpy into igra…
ilan-gold Jan 26, 2024
b9b5b19
Merge branch 'master' into igraph_leiden
ilan-gold Jan 26, 2024
3482560
Merge branch 'master' into igraph_leiden
ilan-gold Jan 29, 2024
b3bb3d2
Merge branch 'master' into igraph_leiden
ilan-gold Jan 29, 2024
ebe1c16
Update scanpy/tools/_leiden.py
ilan-gold Jan 30, 2024
0736afc
Merge branch 'master' into igraph_leiden
ilan-gold Feb 15, 2024
de7af6a
(chore): switch back to `leidenalg` default
ilan-gold Feb 15, 2024
99aa47c
(chore): fix clustering tests and update message
ilan-gold Feb 15, 2024
726c59e
(fix): plotting test
ilan-gold Feb 15, 2024
f2da795
(fix): `test_leiden_basic` `directed` arg
ilan-gold Feb 15, 2024
13ae6b6
(fix): fix iterations to defaults
ilan-gold Feb 15, 2024
cc31a2e
(fix): correct category swapping
ilan-gold Feb 16, 2024
935d34f
(fix): need to reorder categories as well
ilan-gold Feb 16, 2024
662f918
Merge branch 'master' into igraph_leiden
ilan-gold Feb 16, 2024
5df37d2
(fix): clean up simple tests
ilan-gold Feb 16, 2024
51f0a02
Merge branch 'igraph_leiden' of github.com:ilan-gold/scanpy into igra…
ilan-gold Feb 16, 2024
9f6b535
(fix): remove unnecessary cluster swap.
ilan-gold Feb 16, 2024
102d128
(fix): just use random state that gives same number of categories
ilan-gold Feb 16, 2024
84dd615
(fix): use `np.random` instead of `random` module
ilan-gold Feb 16, 2024
d6b1dff
(chore): remove unnecessary comment in test about state
ilan-gold Feb 19, 2024
f2db271
Merge branch 'master' into igraph_leiden
ilan-gold Feb 19, 2024
5e09532
(refactor): simplify conditions
ilan-gold Feb 19, 2024
579f005
(refactor): `elif` -> `else` when `flavor` already checked
ilan-gold Feb 19, 2024
1cefa19
(fix): move leiden import for test
ilan-gold Feb 19, 2024
6247d76
(fix): revert unnecessary image changes
ilan-gold Feb 19, 2024
2549f61
(chore): address comments
ilan-gold Feb 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 2 additions & 5 deletions scanpy/tests/test_clustering.py
Expand Up @@ -61,17 +61,14 @@ def test_leiden_random_state(adata_neighbors, flavor):
adata_2 = sc.tl.leiden(
adata_neighbors,
flavor=flavor,
random_state=50,
random_state=2,
copy=True,
directed=is_leiden_alg,
n_iterations=n_iterations,
)
assert (adata_1.obs["leiden"] == adata_1_again.obs["leiden"]).all()
# This random state produces different categories so can't check the arrays against each other.
assert (
adata_2.obs["leiden"].cat.categories
!= adata_1_again.obs["leiden"].cat.categories
).any()
assert (adata_2.obs["leiden"] != adata_1_again.obs["leiden"]).any()
ilan-gold marked this conversation as resolved.
Show resolved Hide resolved


@needs.igraph
Expand Down