Skip to content

Commit 4b801f9

Browse files
authored
update scar scvi-tools version to 1.4.3 (#11651)
* update scar scvi-tools version Signed-off-by: Lukas Heumos <lukas.heumos@posteo.net> * hash Signed-off-by: Lukas Heumos <lukas.heumos@posteo.net> * hash Signed-off-by: Lukas Heumos <lukas.heumos@posteo.net> * set torch cache Signed-off-by: Lukas Heumos <lukas.heumos@posteo.net> --------- Signed-off-by: Lukas Heumos <lukas.heumos@posteo.net>
1 parent 6e7d04a commit 4b801f9

6 files changed

Lines changed: 21 additions & 11 deletions

File tree

modules/nf-core/scvitools/scar/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ channels:
44
- conda-forge
55
- bioconda
66
dependencies:
7-
- conda-forge::scvi-tools=1.3.3
7+
- conda-forge::scvi-tools=1.4.3

modules/nf-core/scvitools/scar/main.nf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ process SCVITOOLS_SCAR {
33
label 'process_medium'
44

55
conda "${moduleDir}/environment.yml"
6-
container "${ workflow.containerEngine in ['singularity', 'apptainer'] && !task.ext.singularity_pull_docker_container ?
7-
'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/c8/c8764e4208e9639a54d636fc65c839c55dedbfd68def57baea90d1d2007d6a7f/data':
8-
'community.wave.seqera.io/library/scvi-tools:1.3.3--df115aabdccb7d6b' }"
6+
container "${ task.ext.use_gpu ? 'ghcr.io/scverse/scvi-tools:py3.13-cu12-1.4.3-' :
7+
workflow.containerEngine in ['singularity', 'apptainer'] && !task.ext.singularity_pull_docker_container ?
8+
'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/df/dfb4b54fd5cb5c5624d947914f5ab8ac86eeaa5f762ebc52c034fbd36cf30250/data':
9+
'community.wave.seqera.io/library/scvi-tools:1.4.3--cce8c95b58ececa6' }"
910

1011
input:
1112
tuple val(meta), path(filtered), path(unfiltered)
@@ -16,7 +17,7 @@ process SCVITOOLS_SCAR {
1617

1718
output:
1819
tuple val(meta), path("*.h5ad"), emit: h5ad
19-
path "versions.yml" , emit: versions
20+
path "versions.yml" , emit: versions, topic: versions
2021

2122
when:
2223
task.ext.when == null || task.ext.when

modules/nf-core/scvitools/scar/meta.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ output:
6969
pattern: "versions.yml"
7070
ontologies:
7171
- edam: http://edamontology.org/format_3750 # YAML
72+
topics:
73+
versions:
74+
- versions.yml:
75+
type: string
76+
description: The name of the process
7277
authors:
7378
- "@nictru"
7479
maintainers:

modules/nf-core/scvitools/scar/templates/scar.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
#!/usr/bin/env python3
22

3+
import os
4+
5+
os.environ.setdefault("TORCHINDUCTOR_CACHE_DIR", os.path.join(os.getcwd(), "torch_cache"))
6+
37
import anndata as ad
48
import scvi
59
import yaml
@@ -11,7 +15,6 @@
1115

1216
scvi.settings.seed = 0
1317

14-
1518
adata = ad.read_h5ad("${filtered}")
1619
adata_unfiltered = ad.read_h5ad("${unfiltered}")
1720

modules/nf-core/scvitools/scar/tests/main.nf.test.snap

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"Should run with default parameters": {
33
"content": [
44
[
5-
"versions.yml:md5,295715b77d88ad6a0f3d4299311b7c3e"
5+
"versions.yml:md5,b495dbf7249184fe0484e98f0e1d46b4"
66
],
77
"test.h5ad"
88
],
@@ -15,7 +15,7 @@
1515
"Should run from X to X": {
1616
"content": [
1717
[
18-
"versions.yml:md5,295715b77d88ad6a0f3d4299311b7c3e"
18+
"versions.yml:md5,b495dbf7249184fe0484e98f0e1d46b4"
1919
],
2020
"test.h5ad"
2121
],
@@ -37,7 +37,7 @@
3737
]
3838
],
3939
"1": [
40-
"versions.yml:md5,f6c25be06bfb18cdf3e82e50985d9a9b"
40+
"versions.yml:md5,f906fc3c61697a5598dbdf6d62572fe4"
4141
],
4242
"h5ad": [
4343
[
@@ -48,7 +48,7 @@
4848
]
4949
],
5050
"versions": [
51-
"versions.yml:md5,f6c25be06bfb18cdf3e82e50985d9a9b"
51+
"versions.yml:md5,f906fc3c61697a5598dbdf6d62572fe4"
5252
]
5353
}
5454
],
@@ -61,7 +61,7 @@
6161
"Should run with custom input and output layers": {
6262
"content": [
6363
[
64-
"versions.yml:md5,295715b77d88ad6a0f3d4299311b7c3e"
64+
"versions.yml:md5,b495dbf7249184fe0484e98f0e1d46b4"
6565
],
6666
"test.h5ad"
6767
],

modules/nf-core/scvitools/solo/templates/solo.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import os
44

55
os.environ["MPLCONFIGDIR"] = "./tmp"
6+
os.environ.setdefault("TORCHINDUCTOR_CACHE_DIR", os.path.join(os.getcwd(), "torch_cache"))
67

78
import anndata as ad
89
import scvi

0 commit comments

Comments
 (0)