-
Notifications
You must be signed in to change notification settings - Fork 112
Annotation API #24
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
Closed
Closed
Annotation API #24
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
|
|
||
| import java.nio.file.Path | ||
| import nextflow.io.ValueObject | ||
| import nextflow.util.KryoHelper | ||
|
|
||
| @ValueObject | ||
| class Sample { | ||
| String id | ||
| List<Path> reads | ||
|
|
||
| static { | ||
| KryoHelper.register(Sample) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,22 @@ | ||
| params.outdir = 'results' | ||
|
|
||
| process FASTQC { | ||
| tag "FASTQC on $sample_id" | ||
| conda 'fastqc=0.12.1' | ||
| publishDir params.outdir, mode:'copy' | ||
|
|
||
| input: | ||
| tuple val(sample_id), path(reads) | ||
|
|
||
| output: | ||
| path "fastqc_${sample_id}_logs" | ||
|
|
||
| script: | ||
| @ProcessFn( | ||
| directives={ | ||
| tag { "FASTQC on $sample.id" } | ||
| conda 'fastqc=0.12.1' | ||
| publishDir params.outdir, mode:'copy' | ||
| }, | ||
| inputs={ | ||
| path { sample.reads } | ||
| }, | ||
| outputs={ | ||
| path '$file0', { "fastqc_${sample.id}_logs" } | ||
| emit { path('$file0') } | ||
| }, | ||
| script=true | ||
| ) | ||
| def FASTQC(Sample sample) { | ||
| """ | ||
| fastqc.sh "$sample_id" "$reads" | ||
| fastqc.sh "$sample.id" "$sample.reads" | ||
| """ | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,21 @@ | ||
|
|
||
| process QUANT { | ||
| tag "$pair_id" | ||
| conda 'salmon=1.10.2' | ||
|
|
||
| input: | ||
| path index | ||
| tuple val(pair_id), path(reads) | ||
|
|
||
| output: | ||
| path pair_id | ||
|
|
||
| script: | ||
| @ProcessFn( | ||
| directives={ | ||
| tag { pair.id } | ||
| conda 'salmon=1.10.2' | ||
| }, | ||
| inputs={ | ||
| path { index } | ||
| path { pair.reads } | ||
| }, | ||
| outputs={ | ||
| path '$file0', { pair.id } | ||
| emit { path('$file0') } | ||
| }, | ||
| script=true | ||
| ) | ||
| def QUANT(Path index, Sample pair) { | ||
| """ | ||
| salmon quant --threads $task.cpus --libType=U -i $index -1 ${reads[0]} -2 ${reads[1]} -o $pair_id | ||
| salmon quant --threads $task.cpus --libType=U -i $index -1 ${pair.reads[0]} -2 ${pair.reads[1]} -o $pair.id | ||
| """ | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I appreciate the typing on input channels. It makes me wonder if it would be possible to add a decorator like this:
To the current syntax that could be both checked, and generate some automatic documentation. It would be especially nice if the type of channel -- value or queue -- was included. This would be helpful in development and maintenance, I think.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The syntax would have to be something like this:
But you have the right idea.
As for channels, I think the process definition should be decoupled from whether the input channels are queue or value, because it shouldn't really matter