Skip to content

Commit 8468855

Browse files
committed
testing segfree methods
1 parent dc84908 commit 8468855

File tree

6 files changed

+29
-18
lines changed

6 files changed

+29
-18
lines changed

.github/workflows/ci.yml

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,22 @@ jobs:
8282
- name: Clean up Disk space
8383
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
8484

85-
- name: "Run pipeline image mode with test data ${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }}"
85+
- name: "Run pipeline in image mode with test data ${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }}"
8686
continue-on-error: ${{ matrix.NXF_VER == 'latest-everything' }}
8787
run: |
88-
nextflow run ${GITHUB_WORKSPACE} -profile ${{ matrix.test_name }},${{ matrix.profile }} --outdir ./results --mode image -stub
88+
nextflow run ${GITHUB_WORKSPACE} -profile ${{ matrix.test_name }},${{ matrix.profile }} -stub --outdir ./results --mode image
8989
90-
- name: "Run pipeline coordinate mode with test data ${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }}"
90+
- name: "Run pipeline in coordinate mode with test data ${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }}"
9191
continue-on-error: ${{ matrix.NXF_VER == 'latest-everything' }}
9292
run: |
93-
nextflow run ${GITHUB_WORKSPACE} -profile ${{ matrix.test_name }},${{ matrix.profile }} --outdir ./results --mode coordinate -stub
93+
nextflow run ${GITHUB_WORKSPACE} -profile ${{ matrix.test_name }},${{ matrix.profile }} -stub --outdir ./results --mode coordinate
94+
95+
- name: "Run pipeline in preview mode with test data ${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }}"
96+
continue-on-error: ${{ matrix.NXF_VER == 'latest-everything' }}
97+
run: |
98+
nextflow run ${GITHUB_WORKSPACE} -profile ${{ matrix.test_name }},${{ matrix.profile }} -stub --outdir ./results --mode preview
99+
100+
- name: "Run pipeline in segfree mode with test data ${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }}"
101+
continue-on-error: ${{ matrix.NXF_VER == 'latest-everything' }}
102+
run: |
103+
nextflow run ${GITHUB_WORKSPACE} -profile ${{ matrix.test_name }},${{ matrix.profile }} -stub --outdir ./results --mode segfree

conf/test.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ process {
1515
resourceLimits = [
1616
cpus: 4,
1717
memory: '15.GB',
18-
time: '6.h'
18+
time: '2.h'
1919
]
2020

2121
withName: UNTAR {

modules/local/baysor/create_dataset/templates/create_dataset.py

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

33
import csv
44
import random

subworkflows/local/ficture_preprocess_model/main.nf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ workflow FICTURE_PREPROCESS_MODEL {
2323
ch_versions = ch_versions.mix ( PARQUET_TO_CSV.out.versions )
2424

2525
// run ficture preprocessing
26-
FICTURE_PREPROCESS ( PARQUET_TO_CSV.out.transcripts_csv, ch_features )
26+
ch_transcripts = PARQUET_TO_CSV.out.transcripts_csv
27+
28+
FICTURE_PREPROCESS ( ch_transcripts, ch_features )
2729
ch_versions = ch_versions.mix ( FICTURE_PREPROCESS.out.versions )
2830

2931
// run the ficture wrapper pipeline

subworkflows/local/utils_nfcore_spatialxe_pipeline/main.nf

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -255,12 +255,12 @@ def validateXeniumBundle(ch_samplesheet) {
255255
def missing_files = []
256256

257257
def allExist = xenium_bundle.every { filename ->
258-
def fullPath = file("${path}/${filename}")
259-
if (!fullPath.exists()) {
260-
missing_files.add(filename)
261-
return false
262-
}
263-
return true
258+
def fullPath = file("${path}/${filename}")
259+
if (!fullPath.exists()) {
260+
missing_files.add(filename)
261+
return false
262+
}
263+
return true
264264
}
265265

266266
if (!allExist) {
@@ -269,7 +269,7 @@ def validateXeniumBundle(ch_samplesheet) {
269269
}
270270
}
271271
}
272-
log.info "INFO Xenium bundle validated ✅ "
272+
log.info "INFO Xenium bundle validated ✅ \n"
273273
}
274274

275275
//

workflows/spatialxe.nf

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,9 @@ workflow SPATIALXE {
147147

148148
// get a list of features if provided with the --features for the ficture method
149149
if ( params.features ) {
150-
ch_features = Channel.of (
151-
params.features.split(',')
150+
ch_features = Channel.fromPath (
151+
params.features,
152+
checkIfExists: true
152153
)
153154
}
154155

@@ -383,7 +384,6 @@ workflow SPATIALXE {
383384
ch_transcripts_parquet,
384385
ch_config
385386
)
386-
ch_redefined_bundle = BAYSOR_RUN_TRANSCRIPTS_PARQUET.out.redefined_bundle
387387
}
388388

389389
// run ficture with transcripts.parquet
@@ -393,7 +393,6 @@ workflow SPATIALXE {
393393
ch_transcripts_parquet,
394394
ch_features
395395
)
396-
ch_redefined_bundle = BAYSOR_RUN_TRANSCRIPTS_PARQUET.out.redefined_bundle
397396
}
398397
}
399398
}

0 commit comments

Comments
 (0)