8000 Update Boltz-1 boilerplate and formatting by jscgh · Pull Request #307 · nf-core/proteinfold · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Update Boltz-1 boilerplate and formatting #307

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,17 @@ repos:
hooks:
- id: prettier
additional_dependencies:
- prettier@3.2.5
- prettier@3.5.3

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v5.0.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-added-large-files

- repo: https://github.com/editorconfig-checker/editorconfig-checker.python
rev: "3.1.2"
rev: "3.2.1"
hooks:
- id: editorconfig-checker
alias: ec
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [[#235](https://github.com/nf-core/proteinfold/issues/235)] - Update samplesheet to new version (switch from `sequence` column to `id`).
- [[#239](https://github.com/nf-core/proteinfold/issues/239)] - Update alphafold2 standard mode Dockerfile.
- [[#240](https://github.com/nf-core/proteinfold/issues/240)] - Separate download and input of pdb `mmcif` files and `obsolete` database.
- [[#229](https://github.com/nf-core/proteinfold/issues/229)] - Add Boltz pipeline [PR #227](https://github.com/nf-core/proteinfold/pull/227).
- [[PR #249](https://github.com/nf-core/proteinfold/pull/249)] - Update pipeline template to [nf-core/tools 3.2.0](https://github.com/nf-core/tools/releases/tag/3.2.0).
- [[PR #271](https://github.com/nf-core/proteinfold/pull/271)] - Update RFAA and HF3 dockerfiles for quicker building and reduction in image size.
- [[PR #274](https://github.com/nf-core/proteinfold/pull/274)] - Simplify run_helixfold3 module and move arguments to `modules.config`.
Expand All @@ -35,8 +36,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [[#273](https://github.com/nf-core/proteinfold/issues/273)] - Fixes comparison report to correctly label msa coverage plots with corresponding method label.
- [[#290](https://github.com/nf-core/proteinfold/issues/290)] - Update Alphafold2 split images to make them compatible Hopper gpus.
- [[PR #302](https://github.com/nf-core/proteinfold/pull/302)] - Fix HF3 dbs and max_template_date.
- [[#305](https://github.com/nf-core/proteinfold/pull/305)] - Stop RFAA and HF3 symlinking scripts into workdir.
- [[PR #305](https://github.com/nf-core/proteinfold/pull/305)] - Stop RFAA and HF3 symlinking scripts into workdir.
- [[PR #306](https://github.com/nf-core/proteinfold/pull/306)] - extract_output.py -> extract_metrics.py so pLDDT, MSA, PAE emitted as raw data .tsv files
- [[PR #307](https://github.com/nf-core/proteinfold/pull/307)] - Update Boltz-1 boilerplate and formatting.

### Parameters

Expand Down
15 changes: 8 additions & 7 deletions conf/dbs.config
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,14 @@ params {
pdb_seqres_path = "${params.alphafold2_db}/pdb_seqres/*"
uniprot_path = "${params.alphafold2_db}/uniprot/*"

// Boltz links
boltz_ccd_link = 'https://huggingface.co/boltz-community/boltz-1/resolve/main/ccd.pkl'
boltz_model_link = 'https://huggingface.co/boltz-community/boltz-1/resolve/main/boltz1_conf.ckpt'

// Boltz paths
boltz_ccd_path = "${params.boltz_db}/ccd.pkl"
boltz_model_path = "${params.boltz_db}/boltz1_conf.ckpt"

// Colabfold links
colabfold_db_link = 'http://wwwuser.gwdg.de/~compbiol/colabfold/colabfold_envdb_202108.tar.gz'
uniref30_colabfold_link = 'https://wwwuser.gwdg.de/~compbiol/colabfold/uniref30_2302.tar.gz'
Expand Down Expand Up @@ -99,13 +107,6 @@ params {
// Esmfold paths
esmfold_params_path = "${params.esmfold_db}/*"

// boltz paths
boltz_ccd_path = "${params.boltz_db}/ccd.pkl"
boltz_model_path = "${params.boltz_db}/boltz1.ckpt"
// boltz links
boltz_ccd_link = 'https://huggingface.co/boltz-community/boltz-1/resolve/main/ccd.pkl'
boltz_model_link = 'https://huggingface.co/boltz-community/boltz-1/resolve/main/boltz1.ckpt'

// Foldseek databases paths
foldseek_db = null
foldseek_db_path = null
Expand Down
1 change: 0 additions & 1 deletion conf/test_colabfold_local.config
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,3 @@ process {
container = 'biocontainers/gawk:5.1.0'
}
}

1 change: 0 additions & 1 deletion conf/test_esmfold.config
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,3 @@ process {
container = 'quay.io/biocontainers/gawk:5.1.0'
}
}

1 change: 1 addition & 0 deletions conf/test_full_boltz.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

----------------------------------------------------------------------------------------
*/

params {
config_profile_name = 'Full test profile for boltz'
config_profile_description = 'Minimal test dataset to check pipeline function'
Expand Down
1 change: 0 additions & 1 deletion conf/test_helixfold3.config
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,3 @@ process {
container = 'biocontainers/gawk:5.1.0'
}
}

2 changes: 0 additions & 2 deletions dockerfiles/Dockerfile_nfcore-proteinfold_boltz
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,3 @@ RUN apt-get update && \
RUN pip install boltz

CMD ["boltz"]


1 change: 1 addition & 0 deletions modules/local/data_convertor/boltz_fasta/main.nf
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ process BOLTZ_FASTA {

with open ("versions.yml", "w") as version_file:
version_file.write("\\"${task.process}\\":\\n python: {}\\n".format(sys.version.split()[0].strip()))
${args}
"""

stub:
Expand Down
11 changes: 7 additions & 4 deletions modules/local/run_boltz/main.nf
10000
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
process RUN_BOLTZ {
tag "$meta.id"
label 'process_medium'
if (workflow.profile.tokenize(',').intersect(['conda', 'mamba']).size() >= 1) {
error("Local RUN_BOLTZ module does not support Conda. Please use Docker / Singularity / Podman instead.")
}
container "quay.io/nf-core/proteinfold_boltz:dev"
label 'process_gpu'

container "nf-core/proteinfold_boltz:dev"

input:
tuple val(meta), path(fasta)
Expand All @@ -30,6 +29,10 @@ process RUN_BOLTZ {
task.ext.when == null || task.ext.when

script:
// Exit if running this module with -profile conda / -profile mamba
if (workflow.profile.tokenize(',').intersect(['conda', 'mamba']).size() >= 1) {
error("Local RUN_BOLTZ module does not support Conda. Please use Docker / Singularity / Podman instead.")
}
def version = "0.4.1"
def args = task.ext.args ?: ''

Expand Down
2 changes: 1 addition & 1 deletion modules/nf-core/aria2/aria2.diff

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion modules/nf-core/aria2/tests/main.nf.test.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions modules/nf-core/foldseek/easysearch/foldseek-easysearch.diff

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion modules/nf-core/mmseqs/createindex/tests/main.nf.test.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions modules/nf-core/multiqc/multiqc.diff

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion modules/nf-core/multiqc/tests/main.nf.test.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions modules/nf-core/untar/tests/main.nf.test.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions modules/nf-core/untar/untar.diff 3D11

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 12 additions & 1 deletion nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ params {

// Input options
input = null
mode = 'alphafold2' // {alphafold2, colabfold, esmfold, rosettafold_all_atom, helixfold3}
mode = 'alphafold2' // {alphafold2, colabfold, esmfold, rosettafold_all_atom, helixfold3, boltz}
use_gpu = false
split_fasta = false

Expand Down Expand Up @@ -50,6 +50,16 @@ params {
pdb_seqres_path = null
uniprot_path = null

// Boltz links
boltz_ccd_link = null
boltz_model_link = null

// Boltz paths
boltz_db = null
boltz_ccd_path = null
boltz_model_path = null
boltz_use_msa_server = true

// Colabfold parameters
colabfold_server = "webserver"
colabfold_model_preset = "alphafold2_ptm" // {'auto', 'alphafold2', 'alphafold2_ptm', 'alphafold2_multimer_v1', 'alphafold2_multimer_v2', 'alphafold2_multimer_v3'}
Expand Down Expand Up @@ -321,6 +331,7 @@ profiles {
test_full_colabfold_multimer { includeConfig 'conf/test_full_colabfold_webserver_multimer.config' }
test_full_esmfold { includeConfig 'conf/test_full_esmfold.config' }
test_full_esmfold_multimer { includeConfig 'conf/test_full_esmfold_multimer.config' }
test_full_boltz { includeConfig 'conf/test_full_boltz.config' }
test_rosettafold_all_atom { includeConfig 'conf/test_rosettafold_all_atom.config' }
test_helixfold3 { includeConfig 'conf/test_helixfold3.config' }
test_full_boltz { includeConfig 'conf/test_full_boltz.config' }
Expand Down
Loading
0