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

New nf-core role to pull methylseq, rnaseq, atacseq etc and other changes #332

Merged
merged 23 commits into from
Feb 17, 2020

Conversation

aanil
Copy link
Member

@aanil aanil commented Jan 27, 2020

  • New nf-core role to pull
    • methylseq v1.4 (Updated version as well)
    • rnaseq v1.3 (Updated version as well)
    • atacseq
    • ampliseq
  • Deleted old roles for methylseq, rnaseq, atacseq and ampliseq
  • Update Sarek to pull from nf-core
  • Updated ngi reports
  • Updated taca
  • Updated neutronstar to 1.0.0
  • Updated multiqc to v1.8

Copy link
Contributor

@ewels ewels left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks super cool! Nice job! 🌟

roles/nf-core/defaults/main.yml Outdated Show resolved Hide resolved
roles/nf-core/tasks/main.yml Outdated Show resolved Hide resolved
roles/nf-core/tasks/main.yml Outdated Show resolved Hide resolved
roles/nf-core/tasks/main.yml Outdated Show resolved Hide resolved
roles/ngi_pipeline/templates/irma_ngi_config.yaml.j2 Outdated Show resolved Hide resolved
roles/nf-core/defaults/main.yml Outdated Show resolved Hide resolved
@aanil aanil requested a review from remiolsen January 30, 2020 10:14
Copy link
Collaborator

@slohse slohse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

Copy link
Member

@remiolsen remiolsen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not 100% that neutronstar is going to work currently. Suggested some parameters that should do it.

@@ -39,14 +52,19 @@
lineinfile:
dest: "{{ ngi_pipeline_conf }}/{{ bash_env_sthlm_script }}"
line: >
alias neutronstar='nextflow run {{ neutronstar_dest }}/main.nf -profile standard,uppmax
-c {{ ngi_pipeline_conf }}/neutronstar_{{ item.site }}.config'
alias neutronstar='nextflow run {{ neutronstar_dest }}/main.nf -profile standard,uppmax \
Copy link
Member

@remiolsen remiolsen Feb 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this use the nf-core/configs repo? You should drop-profile standard,uppmax for -profile singularity

There are still some more options that is more suited and/or needed for irma. As a config file load with -c:

params {
  busco_folder = '/sw/apps/bioinfo/BUSCO/v2_lineage_sets'
  busco_data = 'eukaryota_odb9'
  clusterOptions = '-A ngi2016003'
  max_memory = 250.GB
  max_cpus = 16
  max_time = 240.h
}
process {
  executor = 'slurm'
}

Or alternatively add them as parameters to that alias with -process.executor='slurm'

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a bit unsure if to keep busco_data = 'eukaryota_odb9' - I think it's a reasonable default and does make the pipeline more foolproof.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated the parameters in this config file. Also changed the profile to singularity.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@remiolsen - you should add this config as an uppmax + pipeline specific config in the nf-core/configs repo.

See https://github.com/nf-core/configs/tree/master/conf/pipeline and https://github.com/nf-core/configs/blob/master/pipeline/ and ask @maxulysse for help if you need it 👍

Copy link
Contributor

@ewels ewels Feb 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that it's only params.busco_folder and params.busco_data that looks unique to me. I think everything else is already set up in the uppmax profile.

roles/neutronstar/defaults/main.yml Outdated Show resolved Hide resolved
@aanil aanil requested a review from remiolsen February 4, 2020 10:25
Copy link
Member

@remiolsen remiolsen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @aanil 👍

@ewels
Copy link
Contributor

ewels commented Feb 11, 2020

I'm happy for this to be merged / deployed now 👍

If we go ahead now, could we please make issues to address the following in the future though, so that they're not forgotten:

@aanil aanil linked an issue Feb 13, 2020 that may be closed by this pull request
5 tasks
@aanil
Copy link
Member Author

aanil commented Feb 13, 2020

Created the issues #335 and #336 for it!

Copy link
Contributor

@ewels ewels left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, a few more questions and changes needed.

I'm slightly unsure whether the pipelines will know where to find the singularity images after we move them.. I think this needs testing a bit before full deployment.

roles/neutronstar/tasks/main.yml Outdated Show resolved Hide resolved
roles/neutronstar/templates/neutronstar_site.config Outdated Show resolved Hide resolved
roles/nf-core/defaults/main.yml Outdated Show resolved Hide resolved
dest: "{{ ngi_pipeline_conf }}/{{ item.1.script }}"
line: >
alias {{ item.0.name }}='nextflow run {{ sw_path }}{{ item.0.name }}/workflow/ \
--custom_config_base {{ sw_path }}{{ item.0.name }}/configs \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we are using nf-core download then I'm pretty sure that we don't need this line.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will nf-core download link the general site config that we create in the previous step?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ewels wont the pipeline start look online for configs if you skip this line?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No - nf-core download actually edits the pipeline config files to set params.custom_config_base to point to the parent directory (see code). So as long as you leave the directory structure in tact then it should just work..

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've removed the custom_config_base option.

Copy link
Member

@alneberg alneberg Feb 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍
gif

roles/nf-core/tasks/main.yml Show resolved Hide resolved
roles/nf-core/templates/site.config.j2 Outdated Show resolved Hide resolved
Copy link
Contributor

@ewels ewels left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking awesome!

-c {{ ngi_pipeline_conf }}/neutronstar_{{ item.site }}.config'
alias neutronstar='nextflow run {{ neutronstar_dest }}/main.nf -profile uppmax \
-c {{ ngi_pipeline_conf }}/nextflow_irma_{{ item.site }}.config \
-c {{ ngi_pipeline_conf }}/neutronstar_{{ item.site }}.config --supernova_container {{ supernova_container_path }}'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool 👍

We could move supernova_container in to the neutronstar config file, but seeing as we will hopefully get rid of this config file before long, I think it's better how you currently have it ✅

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@@ -0,0 +1,13 @@
nextflow_java: "/sw/comp/java/x86_64/sun_jdk1.8.0_151"
nextflow_version_tag: "v19.10.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A new version of nextflow came out a few days ago, so you can grab that now

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

Comment on lines +32 to +42
- name: Create directories for singularity images
file:
path: "{{ ngi_containers }}/{{ item.name }}"
state: directory
mode: g+s
with_items: "{{ pipelines }}"

- name: Move singularity images
shell: "mv {{ sw_path }}{{ item.name }}/singularity-images/nf-core-{{ item.name }}-{{ item.release }}.simg {{ ngi_containers }}/{{ item.name }}/"
with_items:
- "{{ pipelines }}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't we say we were going to remove this, and leave the nf-core download dir structure?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've created #336 for it as its dependent on some pending PRs in nf-core.

@aanil
Copy link
Member Author

aanil commented Feb 17, 2020

Merging with verbal approval from Phil!

@aanil aanil merged commit b0dd84f into NationalGenomicsInfrastructure:master Feb 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Use nf-core download
5 participants