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

Sfitz input vcfs #274

Merged
merged 34 commits into from
May 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
fbfb984
vcf input yaml
sorelfitzgibbon Feb 14, 2024
4eb7988
overlooked nftest.yml actual paths including tool versions
sorelfitzgibbon Feb 14, 2024
5967e75
working but need to add pipeval for input vcfs and tweak log structure
sorelfitzgibbon Feb 17, 2024
47bba4d
add test vcf yaml
sorelfitzgibbon Feb 17, 2024
f17d4f6
update VCF template yaml
sorelfitzgibbon Mar 11, 2024
92752b5
Merge branch 'main' of github.com:uclahs-cds/pipeline-call-sSNV into …
sorelfitzgibbon Mar 11, 2024
00a2d82
update changelog
sorelfitzgibbon Mar 21, 2024
13542e1
merge from origin main
sorelfitzgibbon May 13, 2024
17159d7
Autofix Nextflow configuration regression tests
sorelfitzgibbon May 14, 2024
a4f96cc
avoid unused process warnings
sorelfitzgibbon May 14, 2024
91865cf
add input vcf to nftest
sorelfitzgibbon May 14, 2024
defe784
update changelog
sorelfitzgibbon May 14, 2024
dc80c74
Merge branch 'sfitz-input-vcfs' with --no-ff
sorelfitzgibbon May 14, 2024
0d22d0f
avoid unused process warnings, all F config
sorelfitzgibbon May 14, 2024
7808bfd
Autofix Nextflow configuration regression tests
sorelfitzgibbon May 14, 2024
cebbe15
merge in from main
sorelfitzgibbon May 15, 2024
1ab2631
fix intersection script resources
sorelfitzgibbon May 15, 2024
59d0137
define input_type before used in F configs
sorelfitzgibbon May 15, 2024
a2b9425
keep configtests from main
sorelfitzgibbon May 15, 2024
40c5fd8
Autofix Nextflow configuration regression tests
sorelfitzgibbon May 15, 2024
31e287a
change process name
sorelfitzgibbon May 29, 2024
fba06b3
remove unused file
sorelfitzgibbon May 29, 2024
a74120d
fix input template
sorelfitzgibbon May 29, 2024
0511693
turn off intermediate output
sorelfitzgibbon May 29, 2024
65cbf52
consolidate include statements
sorelfitzgibbon May 29, 2024
a024846
add input checks
sorelfitzgibbon May 29, 2024
4486115
update configtests
sorelfitzgibbon May 29, 2024
6e6af05
Merge branch 'sfitz-input-vcfs' of github.com:uclahs-cds/pipeline-cal…
sorelfitzgibbon May 29, 2024
a1a92d6
Mask version numbers in tests
nwiltsie May 29, 2024
5480446
Autofix Nextflow configuration regression tests
sorelfitzgibbon May 29, 2024
56a29fb
Merge remote-tracking branch 'origin' into sfitz-input-vcfs
sorelfitzgibbon May 29, 2024
11d4c29
remove unused functions
sorelfitzgibbon May 30, 2024
bc570f0
move channel creation into workflow
sorelfitzgibbon May 30, 2024
f61eb0f
fix changelog
sorelfitzgibbon May 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
- Add `a_mini-all-tools-vcf-input` to `nftest`
- Add option to input VCFs for intersection

## [8.1.0] - 2024-05-15

Expand Down
156 changes: 79 additions & 77 deletions config/F16.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,99 +6,101 @@ process {
cpus = 1
memory = 1.GB
}
withName: call_sSNV_SomaticSniper {
cpus = 1
memory = 1.GB
retry_strategy {
memory {
strategy = 'add'
operand = 3.GB
if (params.input_type == 'bam') {
withName: call_sSNV_SomaticSniper {
yashpatel6 marked this conversation as resolved.
Show resolved Hide resolved
cpus = 1
memory = 1.GB
retry_strategy {
memory {
strategy = 'add'
operand = 3.GB
}
}
}
}
withName: convert_BAM2Pileup_SAMtools {
cpus = 1
memory = 1.GB
retry_strategy {
memory {
strategy = 'add'
operand = 5.GB
withName: convert_BAM2Pileup_SAMtools {
cpus = 1
memory = 1.GB
retry_strategy {
memory {
strategy = 'add'
operand = 5.GB
}
}
}
}
withName: create_IndelCandidate_SAMtools {
cpus = 1
memory = 1.GB
retry_strategy {
memory {
strategy = 'add'
operand = 5.GB
withName: create_IndelCandidate_SAMtools {
cpus = 1
memory = 1.GB
retry_strategy {
memory {
strategy = 'add'
operand = 5.GB
}
}
}
}
withName: call_sIndel_Manta {
cpus = 6
memory = 6.GB
retry_strategy {
memory {
strategy = 'add'
operand = 5.GB
withName: call_sIndel_Manta {
cpus = 6
memory = 6.GB
retry_strategy {
memory {
strategy = 'add'
operand = 5.GB
}
}
}
}
withName: call_sSNV_Strelka2 {
cpus = 6
memory = 2.GB
retry_strategy {
memory {
strategy = 'add'
operand = 12.GB
withName: call_sSNV_Strelka2 {
cpus = 6
memory = 2.GB
retry_strategy {
memory {
strategy = 'add'
operand = 12.GB
}
}
}
}
}
withName: call_sSNV_Mutect2 {
cpus = 1
memory = 2.GB
retry_strategy {
memory {
strategy = 'add'
operand = 2.GB
withName: call_sSNV_Mutect2 {
cpus = 1
memory = 2.GB
retry_strategy {
memory {
strategy = 'add'
operand = 2.GB
}
}
}
}
withName: run_LearnReadOrientationModel_GATK {
cpus = 1
memory = 8.GB
retry_strategy {
memory {
strategy = 'add'
operand = 20.GB
withName: run_LearnReadOrientationModel_GATK {
cpus = 1
memory = 8.GB
retry_strategy {
memory {
strategy = 'add'
operand = 20.GB
}
}
}
}
withName: call_sSNV_MuSE {
cpus = 6
memory = 24.GB
retry_strategy {
memory {
strategy = 'add'
operand = 8.GB
withName: call_sSNV_MuSE {
cpus = 6
memory = 24.GB
retry_strategy {
memory {
strategy = 'add'
operand = 8.GB
}
}
}
}
}
withName: run_sump_MuSE {
cpus = 8
memory = 16.GB
retry_strategy {
memory {
strategy = 'add'
operand = 16.GB
withName: run_sump_MuSE {
cpus = 8
memory = 16.GB
retry_strategy {
memory {
strategy = 'add'
operand = 16.GB
}
}
}
}
withName: plot_VennDiagram_R {
cpus = 2
memory = 5.GB
cpus = 1
memory = 1.GB
yashpatel6 marked this conversation as resolved.
Show resolved Hide resolved
retry_strategy {
memory {
strategy = 'add'
Expand All @@ -107,8 +109,8 @@ process {
}
}
withName: concat_VCFs_BCFtools {
cpus = 2
memory = 5.GB
cpus = 1
memory = 1.GB
retry_strategy {
memory {
strategy = 'add'
Expand Down
40 changes: 21 additions & 19 deletions config/F2.config
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,30 @@ process {
cpus = 1
memory = 1500.MB
}
withName: call_sSNV_SomaticSniper {
cpus = 1
memory = 1500.MB
}
withName: convert_BAM2Pileup_SAMtools {
cpus = 1
memory = 1500.MB
}
withName: create_IndelCandidate_SAMtools {
cpus = 1
memory = 1500.MB
}
withName: call_sIndel_Manta {
cpus = 2
}
withName: call_sSNV_Strelka2 {
cpus = 2
if (params.input_type == 'bam') {
withName: call_sSNV_SomaticSniper {
cpus = 1
memory = 1500.MB
}
withName: convert_BAM2Pileup_SAMtools {
cpus = 1
memory = 1500.MB
}
withName: create_IndelCandidate_SAMtools {
cpus = 1
memory = 1500.MB
}
withName: call_sIndel_Manta {
cpus = 2
}
withName: call_sSNV_Strelka2 {
cpus = 2
}
}
withName: plot_VennDiagram_R {
cpus = 2
cpus = 1
}
withName: concat_VCFs_BCFtools {
cpus = 2
cpus = 1
}
}
Loading