From 17824d2d62a3a548c6bd9ed090ad5ed9b80694e0 Mon Sep 17 00:00:00 2001 From: Phil Ewels Date: Tue, 16 Jun 2020 15:20:39 +0200 Subject: [PATCH] Merge czbiohub_aws_highpriority profile into czbiohub_aws --- README.md | 1 - bin/cchecker.py | 12 ++++++------ conf/czbiohub_aws.config | 9 +++++++++ conf/czbiohub_aws_highpriority.config | 12 ------------ docs/czbiohub.md | 8 ++++++++ nfcore_custom.config | 3 --- 6 files changed, 23 insertions(+), 22 deletions(-) delete mode 100644 conf/czbiohub_aws_highpriority.config diff --git a/README.md b/README.md index e5b199c..7da6090 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,6 @@ Currently documentation is available for the following systems: * [CFC](docs/cfc.md) * [CRICK](docs/crick.md) * [CZBIOHUB_AWS](docs/czbiohub.md) -* [CZBIOHUB_AWS_HIGHPRIORITY](docs/czbiohub.md) * [DENBI_QBIC](docs/denbi_qbic.md) * [EBC](docs/ebc.md) * [GENOTOUL](docs/genotoul.md) diff --git a/bin/cchecker.py b/bin/cchecker.py index 4290170..9629cf8 100644 --- a/bin/cchecker.py +++ b/bin/cchecker.py @@ -45,11 +45,11 @@ def check_config(Config, Github): if re.search(regex, line): hit = line.split('/')[2].split('.')[0] config_profiles.add(hit.strip()) - - ###Check Github Config now + + ### Check Github Config now tests = set() - ###Ignore these profiles - ignore_me = ['czbiohub_aws_highpriority', 'czbiohub_aws'] + ### Ignore these profiles + ignore_me = ['czbiohub_aws'] tests.update(ignore_me) with open(Github, 'r') as ghfile: for line in ghfile: @@ -58,11 +58,11 @@ def check_config(Config, Github): profiles = line.split(':')[1].split(',') for p in profiles: tests.add(p.strip()) - + ###Check if sets are equal if tests == config_profiles: sys.exit(0) - else: + else: #Maybe report what is missing here too print("Tests don't seem to test these profiles properly. Please check whether you added the profile to the Github Actions testing YAML.\n") print(config_profiles.symmetric_difference(tests)) diff --git a/conf/czbiohub_aws.config b/conf/czbiohub_aws.config index b32fb6d..c4b0e7d 100644 --- a/conf/czbiohub_aws.config +++ b/conf/czbiohub_aws.config @@ -135,3 +135,12 @@ params { } } } + + +profiles { + highpriority { + process { + queue = 'highpriority-971039e0-830c-11e9-9e0b-02c5b84a8036' + } + } +} diff --git a/conf/czbiohub_aws_highpriority.config b/conf/czbiohub_aws_highpriority.config deleted file mode 100644 index 5ab796a..0000000 --- a/conf/czbiohub_aws_highpriority.config +++ /dev/null @@ -1,12 +0,0 @@ -/* - * ------------------------------------------------- - * Nextflow config file for Chan Zuckerberg Biohub - * ------------------------------------------------- - * Defines reference genomes, using iGenome paths - * Imported under the default 'standard' Nextflow - * profile in nextflow.config - */ - -process { - queue = 'highpriority-971039e0-830c-11e9-9e0b-02c5b84a8036' -} diff --git a/docs/czbiohub.md b/docs/czbiohub.md index 4826670..03f0edd 100644 --- a/docs/czbiohub.md +++ b/docs/czbiohub.md @@ -122,3 +122,11 @@ For Human and Mouse, we use [GENCODE](https://www.gencodegenes.org/) gene annota >NB: You will need an account to use the HPC cluster on PROFILE CLUSTER in order to run the pipeline. If in doubt contact IT. >NB: Nextflow will need to submit the jobs via the job scheduler to the HPC cluster and as such the commands above will have to be executed on one of the login nodes. If in doubt contact IT. + +## High Priority Queue + +If you would like to run with the _High Priority_ queue, specify the `highpriority` config profile after `czbiohub_aws`. When applied after the main `czbiohub_aws` config, it overwrites the process `queue` identifier. + +To use it, submit your run with with `-profile czbiohub_aws,highpriority`. + +**Note that the order of config profiles here is important.** For example, `-profile highpriority,czbiohub_aws` will not work. diff --git a/nfcore_custom.config b/nfcore_custom.config index 6349a15..aa084dc 100644 --- a/nfcore_custom.config +++ b/nfcore_custom.config @@ -21,9 +21,6 @@ profiles { cfc_dev { includeConfig "${params.custom_config_base}/conf/cfc_dev.config" } crick { includeConfig "${params.custom_config_base}/conf/crick.config" } czbiohub_aws { includeConfig "${params.custom_config_base}/conf/czbiohub_aws.config" } - czbiohub_aws_highpriority { - includeConfig "${params.custom_config_base}/conf/czbiohub_aws.config"; - includeConfig "${params.custom_config_base}/conf/czbiohub_aws_highpriority.config"} ebc { includeConfig "${params.custom_config_base}/conf/ebc.config" } icr_davros { includeConfig "${params.custom_config_base}/conf/icr_davros.config" } genotoul { includeConfig "${params.custom_config_base}/conf/genotoul.config" }