-
Notifications
You must be signed in to change notification settings - Fork 20
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
new parameter --setup to preload all DBs and ref files, closes #102 #161
Merged
Merged
Changes from all commits
Commits
Show all changes
32 commits
Select commit
Hold shift + click to select a range
52d18b9
added buscoGetDB process
fischer-hub c0bc992
busco download fix
fischer-hub e3afb65
add busco_db_ch
fischer-hub c7e69aa
add default value for param --setup
fischer-hub 0a744d5
use tabs to seperate
fischer-hub 256f439
add setup wf
fischer-hub 53a86ee
add setup default val
fischer-hub 5d86abf
remove wrong process labels
fischer-hub 8007198
add containerGet.nf
fischer-hub cb6c604
remove containerGet(), not working yet
fischer-hub 66446bf
turn core count back up
fischer-hub 7880a41
remove comments, revert containerGet changes
fischer-hub 9b659cd
remove empty input from auto ref calls
fischer-hub 2648c4a
seperate colswith tabs
fischer-hub c8be049
fix containerGet feature
fischer-hub 22f5cd2
set queue size to 1 for setup runs to prevent parallel container pull
fischer-hub adacb32
fix docker pull
b3f9853
remove conda support for setup mode
4086309
Merge branch 'master' into setup
fischer-hub 81e3a2f
add rattle container
fischer-hub 2141a9b
bypass input.csv and autodownload checks if --setup is set
fischer-hub cb7a14b
readd set cores to 1 if --setup is seet
fischer-hub 2f85ae0
replace spaces with tabs in rattle container
fischer-hub 1f177b7
fix temp dir issue on hpc nodes
fischer-hub 84c82c4
add documentation for --setup
fischer-hub ddbe541
Merge branch 'master' into setup
fischer-hub 081e236
remove params.setup
fischer-hub 364bce4
readd setup
fischer-hub 10a0d48
remove max_cores to 1 if setup is set
fischer-hub fd5c233
replace ':' with '-' in iimage file name
fischer-hub 7d9e902
Merge branch 'master' into setup
fischer-hub 29fc6c4
add misssing bracket
fischer-hub 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 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 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,19 +1,20 @@ | ||
process { | ||
withLabel: hisat2 { container = 'nanozoo/hisat2:2.1.0--66dae66' } | ||
withLabel: minimap2 { container = 'nanozoo/minimap2:2.22--b178b67' } | ||
withLabel: python3 { container = 'nanozoo/python_rnaseq:3--23823db' } | ||
withLabel: deseq2 { container = 'nanozoo/deseq2:1.28.0--0df1612' } | ||
withLabel: fastp { container = 'nanozoo/fastp:0.23.1--9f2e255' } | ||
withLabel: fastqc { container = 'nanozoo/fastqc:0.11.8--fbfa1d7' } | ||
withLabel: subread { container = 'nanozoo/subread:2.0.1--713a8e7' } | ||
withLabel: multiqc { container = 'nanozoo/multiqc:1.11--9dfdee6' } | ||
withLabel: nanoplot { container = 'nanozoo/nanoplot:1.38.1--e303519' } | ||
withLabel: sortmerna { container = 'nanozoo/sortmerna:2.1b--ceea1a1' } | ||
withLabel: trinity { container = 'trinityrnaseq/trinityrnaseq:2.13.2' } | ||
withLabel: stringtie { container = 'nanozoo/stringtie:2.1.7--420b0db' } | ||
withLabel: busco { container = 'ezlabgva/busco:v5.2.1_cv1' } | ||
withLabel: dammit { container = 'nanozoo/dammit:1.2--b47259e' } | ||
withLabel: dammitDB { container = 'nanozoo/dammit:1.2--b47259e' } | ||
withLabel: basic_tools { container = 'nanozoo/python_rnaseq:3.8--7a7808c' } | ||
withLabel: rattle { container = 'huxleys/rattle:1.0.0--24021329c8b365f21959c56ee1cfb693c768c14e' } | ||
withLabel: hisat2 { container = "nanozoo/hisat2:2.1.0--66dae66" } | ||
withLabel: minimap2 { container = "nanozoo/minimap2:2.22--b178b67" } | ||
withLabel: python3 { container = "nanozoo/python_rnaseq:3--23823db" } | ||
withLabel: deseq2 { container = "nanozoo/deseq2:1.28.0--0df1612" } | ||
withLabel: fastp { container = "nanozoo/fastp:0.23.1--9f2e255" } | ||
withLabel: fastqc { container = "nanozoo/fastqc:0.11.8--fbfa1d7" } | ||
withLabel: subread { container = "nanozoo/subread:2.0.1--713a8e7" } | ||
withLabel: multiqc { container = "nanozoo/multiqc:1.11--9dfdee6" } | ||
withLabel: nanoplot { container = "nanozoo/nanoplot:1.38.1--e303519" } | ||
withLabel: sortmerna { container = "nanozoo/sortmerna:2.1b--ceea1a1" } | ||
withLabel: trinity { container = "trinityrnaseq/trinityrnaseq:2.13.2" } | ||
withLabel: stringtie { container = "nanozoo/stringtie:2.1.7--420b0db" } | ||
withLabel: busco { container = "ezlabgva/busco:v5.2.1_cv1" } | ||
withLabel: dammit { container = "nanozoo/dammit:1.2--b47259e" } | ||
withLabel: dammitDB { container = "nanozoo/dammit:1.2--b47259e" } | ||
withLabel: basic_tools { container = "nanozoo/python_rnaseq:3.8--7a7808c" } | ||
withLabel: rattle { container = "huxleys/rattle:1.0.0--24021329c8b365f21959c56ee1cfb693c768c14e" } | ||
} | ||
|
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains 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 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 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,49 @@ | ||
process containerGet { | ||
label 'smallTask' | ||
tag "$tool" | ||
|
||
errorStrategy 'retry' | ||
maxRetries 10 | ||
|
||
if ( workflow.profile.contains('singularity') ) { storeDir "${params.singularityCacheDir}" } | ||
else if ( workflow.profile.contains('conda') ) { storeDir "${params.condaCacheDir}" } | ||
|
||
input: | ||
tuple val(tool), val(path) | ||
|
||
output: | ||
path("${img_file_name}.img") | ||
|
||
script: | ||
img_file_name = path.replace("/", "-").replace(":","-") | ||
if ( workflow.profile.contains('singularity') ) | ||
""" | ||
if [ -e ${params.singularityCacheDir}/${img_file_name}.img ] | ||
then | ||
echo "${tool} singularity image file already exists, skipping." | ||
else | ||
singularity pull --name ${img_file_name}.img "docker://${path}" | ||
fi | ||
""" | ||
else if ( workflow.profile.contains('docker') ) | ||
""" | ||
if [[ "\$(docker images -q ${path} 2> /dev/null)" == "" ]]; | ||
then | ||
docker pull ${path} | ||
touch ${img_file_name}.img | ||
else | ||
echo "${tool} docker image file already exists, skipping." | ||
touch ${img_file_name}.img | ||
fi | ||
""" | ||
else if ( workflow.profile.contains('conda') ) | ||
""" | ||
echo "The setup mode currently doesn't support conda environments, skipping." | ||
touch ${img_file_name}.img | ||
""" | ||
else | ||
""" | ||
echo 'unknown container engine, exiting' | ||
exit 1 | ||
""" | ||
} |
This file contains 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,5 +1,5 @@ | ||
process dammitGetDB { | ||
label 'dammit' | ||
label 'basic_tools' | ||
label 'smallTask' | ||
|
||
errorStrategy 'retry' | ||
|
This file contains 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.
hm @fischer-hub , will this remove rattle now from the master branch? I think we don't want this :) Sorry if the re-base to
master
causes confusion now