Skip to content

Commit

Permalink
Merge branch 'master' into remove_aws_tower
Browse files Browse the repository at this point in the history
  • Loading branch information
maxulysse committed Sep 15, 2023
2 parents 85ddb31 + 0428497 commit 7ac8fe0
Show file tree
Hide file tree
Showing 61 changed files with 1,597 additions and 189 deletions.
3 changes: 2 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Please follow these steps before submitting your PR:
- [ ] If your PR is a work in progress, include `[WIP]` in its title
- [ ] Your PR targets the `master` branch
- [ ] You've included links to relevant issues, if any
- [ ] Requested review from @nf-core/maintainers and/or #request-review on slack

Steps for adding a new config profile:

Expand All @@ -18,7 +19,7 @@ Steps for adding a new config profile:
- [ ] Add your profile name to the `profile:` scope in `.github/workflows/main.yml`

<!--
If you require/still waiting for a review, please feel free to request from @nf-core/configs-team
If you require/still waiting for a review, please feel free to request from @nf-core/maintainers
Please see uploading to`nf-core/configs` for more details:
https://github.com/nf-core/configs#uploading-to-nf-coreconfigs
Expand Down
14 changes: 13 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,14 @@ jobs:
- "abims"
- "adcra"
- "alice"
- "apollo"
- "awsbatch"
- "azurebatch"
- "bi"
- "bigpurple"
- "binac"
- "biohpc_gen"
- "biowulf"
- "cambridge"
- "cbe"
- "ccga_dx"
Expand All @@ -54,10 +56,14 @@ jobs:
- "denbi_qbic"
- "dkfz"
- "ebc"
- "ebi_codon"
- "ebi_codon_slurm"
- "eddie"
- "engaging"
- "ethz_euler"
- "eva"
- "fgcz"
- "fub_curta"
- "genotoul"
- "genouest"
- "gis"
Expand All @@ -66,9 +72,11 @@ jobs:
- "googlels"
- "hasta"
- "hki"
- "hypatia"
- "icr_davros"
- "ifb_core"
- "imperial"
- "incliva"
- "ipop_up"
- "janelia"
- "jax"
Expand All @@ -82,7 +90,7 @@ jobs:
- "mjolnir_globe"
- "mpcdf"
- "munin"
- "nihbiowulf"
- "nci_gadi"
- "nu_genomics"
- "oist"
- "pasteur"
Expand All @@ -103,16 +111,20 @@ jobs:
- "tubingen_apg"
- "ucl_myriad"
- "uct_hpc"
- "ucd_sonic"
- "uge"
- "unibe_ibu"
- "unc_lccc"
- "uppmax"
- "utd_ganymede"
- "utd_sysbio"
- "uw_hyak_pedslabs"
- "uzh"
- "vai"
- "vsc_kul_uhasselt"
- "vsc_ugent"
- "wehi"
- "wustl_htcf"
- "xanadu"

steps:
Expand Down
18 changes: 15 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,14 @@ Currently documentation is available for the following systems:
- [ABIMS](docs/abims.md)
- [ADCRA](docs/adcra.md)
- [ALICE](docs/alice.md)
- [APOLLO](docs/apollo.md)
- [AWSBATCH](docs/awsbatch.md)
- [AZUREBATCH](docs/azurebatch.md)
- [BIGPURPLE](docs/bigpurple.md)
- [BI](docs/bi.md)
- [BINAC](docs/binac.md)
- [BIOHPC_GEN](docs/biohpc_gen.md)
- [BIOWULF](docs/biowulf.md)
- [CAMBRIDGE](docs/cambridge.md)
- [CBE](docs/cbe.md)
- [CCGA_DX](docs/ccga_dx.md)
Expand All @@ -112,9 +114,13 @@ Currently documentation is available for the following systems:
- [DENBI_QBIC](docs/denbi_qbic.md)
- [DKFZ](docs/dkfz.md)
- [EBC](docs/ebc.md)
- [EBI_CODON](docs/ebi_codon.md)
- [EBI_CODON_SLURM](docs/ebi_codon_slurm.md)
- [Engaging](docs/engaging.md)
- [ETH Zurich Euler](docs/ethz_euler.md)
- [EVA](docs/eva.md)
- [FGCZ](docs/fgcz.md)
- [FUB Curta](docs/fub_curta.md)
- [GENOTOUL](docs/genotoul.md)
- [GENOUEST](docs/genouest.md)
- [GIS](docs/gis.md)
Expand All @@ -123,9 +129,11 @@ Currently documentation is available for the following systems:
- [GOOGLELS](docs/googlels.md)
- [HASTA](docs/hasta.md)
- [HKI](docs/hki.md)
- [HYPATIA](docs/hypatia.md)
- [ICR_DAVROS](docs/icr_davros.md)
- [IFB](docs/ifb_core.md)
- [IMPERIAL](docs/imperial.md)
- [INCLIVA](docs/incliva.md)
- [iPOP-UP](docs/ipop_up.md)
- [Janelia Research Campus](docs/janelia.md)
- [JAX](docs/jax.md)
Expand All @@ -138,8 +146,8 @@ Currently documentation is available for the following systems:
- [MJOLNIR_GLOBE](docs/mjolnir_globe.md)
- [MPCDF](docs/mpcdf.md)
- [MUNIN](docs/munin.md)
- [NCI GADI](docs/nci_gadi.md)
- [NU_GENOMICS](docs/nu_genomics.md)
- [NIHBIOWULF](docs/nihbiowulf.md)
- [OIST](docs/oist.md)
- [PASTEUR](docs/pasteur.md)
- [PAWSEY NIMBUS](docs/pawsey_nimbus.md)
Expand All @@ -156,18 +164,22 @@ Currently documentation is available for the following systems:
- [Super Computing Wales](docs/scw.md)
- [TIGEM](docs/tigem.md)
- [TUBINGEN_APG](docs/tubingen_apg.md)
- [UCD_SONIC](docs/ucd_sonic.md)
- [UCL_MYRIAD](docs/ucl_myriad.md)
- [UCT_HPC](docs/uct_hpc.md)
- [UNC_LCCC](docs/unc_lccc.md)
- [UGE](docs/uge.md)
- [UNIBE_IBU](docs/unibe_ibu.md)
- [UPPMAX](docs/uppmax.md)
- [UTD_GANYMEDE](docs/utd_ganymede.md)
- [UTD_SYSBIO](docs/utd_sysbio.md)
- [UW_HYAK_PEDSLABS](docs/uw_hyak_pedslabs.md)
- [UZH](docs/uzh.md)
- [VAI](docs/vai.md)
- [VSC_KUL_UHASSELT](docs/vsc_kul_uhasselt.md)
- [VSC_UGENT](docs/vsc_ugent.md)
- [WEHI](docs/wehi.md)
- [WUSTL_HTCF](docs/wustl_htcf.md)
- [XANADU](docs/xanadu.md)

### Uploading to `nf-core/configs`
Expand All @@ -191,7 +203,7 @@ set(['<profile_name>'])
Commit and push these changes to your local clone on GitHub, and then [create a pull request](https://help.github.com/articles/creating-a-pull-request-from-a-fork/) on the `nf-core/configs` GitHub repo with the appropriate information.
We will be notified automatically when you have created your pull request, and providing that everything adheres to nf-core guidelines we will endeavour to approve your pull request as soon as possible.
Please request review from @nf-core/maintainers and/or on #request-review on the nf-core slack, and providing that everything adheres to nf-core guidelines we will endeavour to approve your pull request as soon as possible.
## Adding a new pipeline-specific config
Expand Down Expand Up @@ -240,7 +252,6 @@ Currently documentation is available for the following pipelines within specific
- rnavar
- [MUNIN](docs/pipeline/rnavar/munin.md)
- sarek
- [Cancer Research UK Manchester Institute](docs/pipeline/sarek/crukmi.md)
- [EVA](docs/pipeline/sarek/eva.md)
- [MUNIN](docs/pipeline/sarek/munin.md)
- [SBC_SHARC](docs/pipeline/sarek/sbc_sharc.md)
Expand Down Expand Up @@ -312,6 +323,7 @@ Edit this file, and add the new pipeline-specific institutional profile to the l
Commit and push these changes to your local clone on GitHub, and then [create a pull request](https://help.github.com/articles/creating-a-pull-request-from-a-fork/) on the `nf-core/configs` GitHub repo with the appropriate information.
In the pull-request description, add a link to the repository specific pull-request(s) that use this new code.
Please request review from @nf-core/maintainers and/or on #request-review on the nf-core slack, and providing that everything adheres to nf-core guidelines we will endeavour to approve your pull request as soon as possible.
Both PRs will need to be merged at the approximately the same time.
## Help
Expand Down
35 changes: 35 additions & 0 deletions conf/apollo.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@

params {
config_profile_name = 'apollo'
config_profile_description = 'COH Apollo cluster profile provided by nf-core/configs.'
config_profile_contact = 'Denis O\'Meally (@drejom) or HPRCC Helpdesk ([email protected])'
config_profile_url = 'https://www.cityofhope.org/ Intranet http://hprcc.coh.org/'
max_memory = 1500.GB
max_cpus = 72
max_time = 500.h
igenomes_base = '/ref_genome/igenomes'
}

process {
executor = 'slurm'
queue = 'all'
beforeScript = 'module load singularity'
}

singularity {
enabled = true
libraryDir = '/opt/singularity-images/nextflow'
}

executor {
name = 'slurm'
queueSize = 1000
}

cleanup = true

profiles {
debug {
cleanup = false
}
}
54 changes: 54 additions & 0 deletions conf/biowulf.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@

params {
config_profile_description = 'Biowulf nf-core config'
config_profile_contact = '[email protected]'
config_profile_url = 'https://hpc.nih.gov/apps/nextflow.html'
max_memory = '224 GB'
max_cpus = 32
max_time = '72 h'

igenomes_base = '/fdb/igenomes/'
}

executor {

$slurm {
queue = 'norm'
queueSize = 200
pollInterval = '2 min'
queueStatInterval = '5 min'
submitRateLimit = '6/1min'
retry.maxAttempts = 1
}
}

singularity {
enabled = true
autoMounts = true
cacheDir = "/data/$USER/singularity"
envWhitelist='https_proxy,http_proxy,ftp_proxy,DISPLAY,SLURM_JOBID,SINGULARITY_BINDPATH'
}

env {
SINGULARITY_CACHEDIR="/data/$USER/singularity"
PYTHONNOUSERSITE = 1
}


process {
executor = 'slurm'
maxRetries = 1

clusterOptions = ' --gres=lscratch:200 '

scratch = '/lscratch/$SLURM_JOBID'

stageInMode = 'symlink'
stageOutMode = 'rsync'

// for running pipeline on group sharing data directory, this can avoid inconsistent files timestamps
cache = 'lenient'
}



1 change: 1 addition & 0 deletions conf/computerome.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ params {
project = null
cache_dir = "/home/projects/$params.project/scratch"
schema_ignore_params = "project,cache_dir,genomes,modules"
validationSchemaIgnoreParams = "project,cache_dir,genomes,modules,schema_ignore_params"

//Thin nodes with 192GB and Fat nodes with ~1500GB. Torque should be allowed to handle this
max_memory = 1500.GB
Expand Down
2 changes: 1 addition & 1 deletion conf/crick.config
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ params {
max_cpus = 32
max_time = '72.h'

igenomes_base = '/camp/svc/reference/Genomics/aws-igenomes'
igenomes_base = '/flask/reference/Genomics/aws-igenomes'
}
37 changes: 19 additions & 18 deletions conf/crukmi.config
Original file line number Diff line number Diff line change
@@ -1,54 +1,55 @@
//Profile config names for nf-core/configs
params {
config_profile_description = 'Cancer Research UK Manchester Institute HPC cluster profile provided by nf-core/configs'
config_profile_contact = 'Stephen Kitcatt, Simon Pearce (@skitcattCRUKMI, @sppearce)'
config_profile_url = 'http://scicom.picr.man.ac.uk/projects/user-support/wiki'
config_profile_contact = 'Stephen Kitcatt, Simon Pearce (@skitcattCRUKMI, @sppearce)'
config_profile_url = 'http://scicom.picr.man.ac.uk/projects/user-support/wiki'
}

singularity {
cacheDir = '/lmod/nextflow_software'
enabled = true
cacheDir = '/lmod/nextflow_software'
enabled = true
autoMounts = true
}

process {
beforeScript = 'module load apps/singularity/3.8.0'
executor = 'pbs'
beforeScript = 'module load apps/apptainer/1.2.0'
executor = 'slurm'
queue = { task.memory <= 240.GB ? 'compute' : 'hmem' }

errorStrategy = {task.exitStatus in [143,137,104,134,139,140] ? 'retry' : 'finish'}
maxErrors = '-1'
maxRetries = 3
maxErrors = '-1'
maxRetries = 3

withLabel:process_single {
cpus = { check_max( 1 * task.attempt, 'cpus' ) }
cpus = { check_max( 1 * task.attempt, 'cpus' ) }
memory = { check_max( 5.GB * task.attempt, 'memory' ) }
}

withLabel:process_low {
cpus = { check_max( 1 * task.attempt, 'cpus' ) }
cpus = { check_max( 1 * task.attempt, 'cpus' ) }
memory = { check_max( 5.GB * task.attempt, 'memory' ) }
}

withLabel:process_medium {
cpus = { check_max( 4 * task.attempt, 'cpus' ) }
cpus = { check_max( 4 * task.attempt, 'cpus' ) }
memory = { check_max( 20.GB * task.attempt, 'memory' ) }
}

withLabel:process_high {
cpus = { check_max( 16 * task.attempt, 'cpus' ) }
memory = { check_max( 80.GB * task.attempt, 'memory' ) }
cpus = { check_max( 48 * task.attempt, 'cpus' ) }
memory = { check_max( 240.GB * task.attempt, 'memory' ) }
}

}

executor {
name = 'pbs'
queueSize = 1000
name = 'slurm'
queueSize = 1000
pollInterval = '10 sec'
}

params {
max_memory = 2000.GB
max_cpus = 32
max_time = 72.h
max_memory = 4000.GB
max_cpus = 96
max_time = 72.h
}
Loading

0 comments on commit 7ac8fe0

Please sign in to comment.