Skip to content

Commit

Permalink
removed maxcpus
Browse files Browse the repository at this point in the history
  • Loading branch information
erinyoung committed Dec 6, 2024
1 parent 5c3e115 commit 6745531
Show file tree
Hide file tree
Showing 16 changed files with 75 additions and 147 deletions.
130 changes: 2 additions & 128 deletions .github/workflows/github_actions.config
Original file line number Diff line number Diff line change
@@ -1,134 +1,8 @@
process {
errorStrategy = { task.attempt < 2 ? 'retry' : 'terminate'}
withName:aci{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:artic{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:artic_read_filtering{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:bbnorm{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:bcftools_variants{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:bwa{
publishDir = [ path: "cecret", mode: 'link', pattern: 'logs/*/*log' ]
}
withName:download{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:fasta_prep{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:summary{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:unzip{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:fastp{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:fastqc{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:freyja_variants{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:freyja_demix{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:freyja_aggregate{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:heatcluster{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:igv_reports{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:iqtree2{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
withName:ivar_consensus{
memory = '4 GB'
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:ivar_variants{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:ivar_trim{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:kraken2{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:mafft{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:minimap2{
publishDir = [ path: "cecret", mode: 'link', pattern: 'logs/*/*log' ]
}
withName:multiqc_combine{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:nextclade_dataset{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:nextclade{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:pango_collapse{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:pangolin{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:phytreeviz{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:samtools_stats{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:samtools_coverage{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:samtools_flagstat{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:samtools_depth{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:samtools_ampliconstats{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:samtools_plot_ampliconstats{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:samtools_sort{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:samtools_filter{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:samtools_ampliconclip{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:samtools_markdup{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:seqyclean{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:snpdists{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
}
withName:vadr{
publishDir = [ path: "cecret", mode: 'link', saveAs: { filename -> filename.equals('versions.yml') ? null : filename }]
memory = '4 GB'
}
}

6 changes: 6 additions & 0 deletions .github/workflows/sample_sheet.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
sample,fastq_1,fastq_2
paired_test,reads/SRR13957123_1.fastq.gz,reads/SRR13957123_2.fastq.gz
single_test,reads/SRR25097869.fastq.gz,single
wastewater_test,reads/SRR31220305_1.fastq.gz,reads/SRR31220305_2.fastq.gz
fasta_test,fastas/SRR13957123DB.fa,fasta
nanopore_test,nanopore/SRR31458670_1.fastq.gz,ont
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
mv SRR13957123.consensus.fa SRR13957123DB.fa
mv *fa fastas/.
nextflow run . -profile docker -c .github/workflows/github_actions.config --primer_set ncov_V3 --maxcpus 2 --medcpus 2 --cleaner 'fastp' --aligner 'minimap2' --mpileup_depth 200
nextflow run . -profile docker -c .github/workflows/github_actions.config --primer_set ncov_V3 --cleaner 'fastp' --aligner 'minimap2' --mpileup_depth 200 --fastas fastas --reads reads
ls cecret*
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_kraken2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
run: |
nextflow run . -profile docker,test \
-c .github/workflows/github_actions.config \
--maxcpus 2 --medcpus 2 --cleaner 'fastp' --aligner 'minimap2' --mpileup_depth 200 --vadr false \
--cleaner 'fastp' --aligner 'minimap2' --mpileup_depth 200 --vadr false \
--kraken2_db kraken2_db --kraken2
ls cecret*
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_mpx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Run Cecret
run: |
nextflow run . -profile docker,mpx -c .github/workflows/github_actions.config --maxcpus 2 --medcpus 2
nextflow run . -profile docker,mpx -c .github/workflows/github_actions.config --single_reads reads
ls cecret*
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_mpx_idt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Run Cecret
run: |
nextflow run . -profile docker,mpx_idt -c .github/workflows/github_actions.config --maxcpus 2 --medcpus 2
nextflow run . -profile docker,mpx_idt -c .github/workflows/github_actions.config --reads reads
ls cecret*
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_mpx_primalseq.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Run Cecret
run: |
nextflow run . -profile docker,mpx_primalseq -c .github/workflows/github_actions.config --maxcpus 2 --medcpus 2
nextflow run . -profile docker,mpx_primalseq -c .github/workflows/github_actions.config --reads reads
ls cecret*
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_mpx_yale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Run Cecret
run: |
nextflow run . -profile docker,mpx_yale -c .github/workflows/github_actions.config --maxcpus 2 --medcpus 2
nextflow run . -profile docker,mpx_yale -c .github/workflows/github_actions.config --reads reads
ls cecret*
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_nanopore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Run Cecret
run: |
nextflow run . -profile docker -c .github/workflows/github_actions.config --maxcpus 2 --medcpus 2 --freyja false
nextflow run . -profile docker -c .github/workflows/github_actions.config --freyja false --nanopore nanopore
ls cecret*
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/test_primers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ jobs:
- name: Run Cecret
run: |
nextflow run . -profile docker -c .github/workflows/github_actions.config \
--maxcpus 2 \
--medcpus 2 \
--primer_set ${{ matrix.primer }} \
--bcftools_variants false \
--fastqc false \
Expand All @@ -63,7 +61,8 @@ jobs:
--bamsnap false \
--rename false \
--filter false \
--multiqc false
--multiqc false \
--nanopore nanopore
ls cecret*
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_profile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Run Cecret
run: |
nextflow run . -profile docker,test -c .github/workflows/github_actions.config --maxcpus 2 --medcpus 2 --cleaner 'fastp' --aligner 'minimap2' --mpileup_depth 200
nextflow run . -profile docker,test -c .github/workflows/github_actions.config --cleaner 'fastp' --aligner 'minimap2' --mpileup_depth 200
ls cecret*
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_profile1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Run Cecret
run: |
nextflow run . -profile docker,test1 -c .github/workflows/github_actions.config --maxcpus 2 --medcpus 2 --cleaner 'fastp' --aligner 'minimap2' --mpileup_depth 200
nextflow run . -profile docker,test1 -c .github/workflows/github_actions.config --cleaner 'fastp' --aligner 'minimap2' --mpileup_depth 200
ls cecret*
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_profile2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Run Cecret
run: |
nextflow run . -profile docker,test2 -c .github/workflows/github_actions.config --maxcpus 2 --medcpus 2 --cleaner 'fastp' --aligner 'minimap2' --mpileup_depth 200
nextflow run . -profile docker,test2 -c .github/workflows/github_actions.config --cleaner 'fastp' --aligner 'minimap2' --mpileup_depth 200
ls cecret*
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/test_relatedness.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,13 @@ jobs:
- name: Run Cecret
run: |
nextflow run . -profile docker -c .github/workflows/github_actions.config --maxcpus 2 --medcpus 2 --relatedness true --outdir cecret1
nextflow run . -profile docker -resume -c .github/workflows/github_actions.config --maxcpus 2 --medcpus 2 --relatedness true --outdir cecret2 --msa nextclade
nextflow run . -profile docker -c .github/workflows/github_actions.config --relatedness true --fastas fastas
ls cecret*
head cecret*/cecret_results.txt
head cecret/cecret_results.txt
head cecret*/iqtree2/iqtree2.treefile
head cecret/iqtree2/iqtree2.treefile
- name: Clean
run: rm -rf work .nextflow*
51 changes: 51 additions & 0 deletions .github/workflows/test_samplesheet.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Test SARS-CoV-2 workflow

on: [pull_request, workflow_dispatch]

run-name: Download fastq and fasta and run

jobs:
test:
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@master
with:
lfs: true

- name: Checkout LFS objects
run: git lfs checkout

- name: Install Nextflow
run: |
wget -qO- get.nextflow.io | bash
sudo mv nextflow /usr/local/bin/
- name: Run Cecret
run: |
docker --version
mkdir reads
wget -q ftp://ftp.sra.ebi.ac.uk/vol1/fastq/SRR139/023/SRR13957123/SRR13957123_1.fastq.gz
wget -q ftp://ftp.sra.ebi.ac.uk/vol1/fastq/SRR139/023/SRR13957123/SRR13957123_2.fastq.gz
wget -q ftp://ftp.sra.ebi.ac.uk/vol1/fastq/SRR250/069/SRR25097869/SRR25097869.fastq.gz
wget -q ftp://ftp.sra.ebi.ac.uk/vol1/fastq/SRR312/005/SRR31220305/SRR31220305_1.fastq.gz
wget -q ftp://ftp.sra.ebi.ac.uk/vol1/fastq/SRR312/005/SRR31220305/SRR31220305_2.fastq.gz
mv *fastq.gz reads/.
mkdir -p fastas
wget -q https://raw.githubusercontent.com/StaPH-B/docker-builds/master/tests/SARS-CoV-2/SRR13957123.consensus.fa
mv SRR13957123.consensus.fa fastas/SRR13957123DB.fa
mkdir nanopore
wget -q ftp://ftp.sra.ebi.ac.uk/vol1/fastq/SRR314/070/SRR31458670/SRR31458670_1.fastq.gz
mv SRR31458670_1.fastq.gz nanopore/SRR31458670_1.fastq.gz
nextflow run . -profile docker -c .github/workflows/github_actions.config --cleaner 'fastp' --aligner 'minimap2' --mpileup_depth 200 --sample_sheet .github/workflows/sample_sheet.csv
ls cecret*
cat cecret*/cecret_results.txt
- name: Clean
run: rm -rf work .nextflow*
2 changes: 1 addition & 1 deletion .github/workflows/test_wastewater.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
wget -q ftp://ftp.sra.ebi.ac.uk/vol1/fastq/SRR194/096/SRR19433296/SRR19433296.fastq.gz
mv *fastq.gz single_reads/.
nextflow run . -profile docker -c .github/workflows/github_actions.config --primer_set ncov_V3 --maxcpus 2 --medcpus 2 --cleaner 'fastp' --aligner 'minimap2' --mpileup_depth 200
nextflow run . -profile docker -c .github/workflows/github_actions.config --primer_set ncov_V3 --cleaner 'fastp' --aligner 'minimap2' --mpileup_depth 200 --single_reads single_reads
ls cecret*
Expand Down

0 comments on commit 6745531

Please sign in to comment.