Skip to content
This repository has been archived by the owner on Mar 16, 2023. It is now read-only.

Commit

Permalink
merge v1.10 code from development
Browse files Browse the repository at this point in the history
  • Loading branch information
jharrymoore committed Sep 5, 2022
2 parents 090c99c + 9efd71d commit 40e6722
Show file tree
Hide file tree
Showing 105 changed files with 5,645 additions and 710 deletions.
6 changes: 5 additions & 1 deletion environment_min.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ channels:
- conda-forge
- defaults
- rdkit
- pytorch
dependencies:
- biopython>=1.79
- ipython
Expand All @@ -23,10 +24,13 @@ dependencies:
- acpype>=2022
- openff-toolkit>=0.10.2
- dill>=0.3.4
- dscribe>=1.2.1
- lomap2>=2.0.0
- pygraphviz
- pytorch
- pip:
- black
- regex
- peptidebuilder>=1.1
- pytest
- pytest-xdist
- skorch>=0.11
3 changes: 2 additions & 1 deletion examples/workflow/docking/glide_docking.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"step_id": "Ligprep",
"type": "ligprep",
"execution": {
"prefix_execution": "module load schrodinger/2020-4",
"prefix_execution": "module load schrodinger/2021-4-js-aws",
"parallelization": {
"jobs": 2,
"max_length_sublists": 1
Expand All @@ -29,6 +29,7 @@
"arguments": {
"flags": ["-epik"],
"parameters": {
"-HOST": "cpu-only",
"-ph": 7.0,
"-pht": 2.0,
"-s": 10,
Expand Down
2 changes: 1 addition & 1 deletion examples/workflow/fep_plus/fep_plus_aws.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
"step_id": "FEP_plus_exec",
"type": "fep_plus_exec",
"execution": {
"prefix_execution": "module load schrodinger/2021-2-js-aws && $SCHRODINGER/jsc download-start"
"prefix_execution": "module load schrodinger/2021-2-js-aws "
},
"token_guard": {
"prefix_execution": "module load schrodinger/2021-2-js-aws",
Expand Down
327 changes: 327 additions & 0 deletions examples/workflow/pmx/pmx_protein_rbfe.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,327 @@
{
"workflow": {
"header": {
"version": "1.9.0",
"workflow_id": "Full PMX workflow - rbfe",
"description": "PMX full map calculation with parallel GPU sims.",
"environment": {
"export": [
{
"key": "GMX_GPU_DD_COMMS",
"value": "true"
},
{
"key": "GMX_GPU_PME_PP_COMMS",
"value": "true"
},
{
"key": "GMX_FORCE_UPDATE_DEFAULT_GPU",
"value": "true"
},
{
"key": "PMX_PYTHON",
"value": "${CONDA}/envs/pmx/bin/python"
},
{
"key": "PMX",
"value": "/home/kmzp800/miniconda3/envs/pmx/bin/pmx"
},
{
"key": "GMXLIB",
"value": "/projects/cc/mai/pmx/src/pmx/data/mutff/"
}
]
},
"global_variables": {
"file_path": "{package_dir}/../IcolosData/pmx",
"output_dir": "{work_dir}/tests/junk/pmx/protein_pmx"
},
"global_settings": {
"single_directory": true,
"remove_temporary_files": false
}
},
"steps": [

{
"step_id": "01_pmx_mutate",
"type": "pmx_mutate",
"execution": {
"prefix_execution": "module load GROMACS/2021-fosscuda-2019a-PLUMED-2.7.1-Python-3.7.2",

"parallelization": {
"jobs": 24
}
},
"settings": {
"arguments": {
"flags": [],
"parameters": {}
},
"additional": {
"water": "tip3p",
"forcefield": "amber14sbmut"
}
},
"input": {
"generic": [
{
"source": "{file_path}/mutate/2flu.pdb",
"extension": "pdb"
},
{
"source": "{file_path}/mutate/mutations.mut",
"extension": "mut"
},
{
"source": "{file_path}/run_simulations/input/mdp/",
"extension": "mdp"
}
],
"work_dir": "{output_dir}"
}
},
{
"step_id": "02_pmx_gentop",
"type": "pmx_gentop",
"execution": {
"parallelization": {
"jobs": 24
}
},
"settings": {
"arguments": {
"flags": [],
"parameters": {}
},
"additional": {

}
}
},
{
"step_id": "05_box_water_ions",
"type": "pmx_box_water_ions",
"execution": {
"prefix_execution": "module load GROMACS/2021-fosscuda-2019a-PLUMED-2.7.1-Python-3.7.2",
"parallelization": {
"jobs": 24
}
},
"settings": {
"arguments": {
"flags": [],
"parameters": {}
},
"additional": {}
}
},
{
"step_id": "06_prepare_simulations",
"type": "pmx_prepare_simulations",
"execution": {
"prefix_execution": "module load GROMACS/2021-fosscuda-2019a-PLUMED-2.7.1-Python-3.7.2",
"parallelization": {
"jobs": 8
}
},
"settings": {
"arguments": {
"flags": [],
"parameters": {}
},
"additional": {
"sim_type": "em"
}
}
},
{
"step_id": "06b_run_simulations",
"type": "pmx_run_simulations",
"execution": {
"platform": "slurm",
"resources": {
"cores": "8",
"partition": "gpu",
"gres": "gpu:1",
"modules": [
"GROMACS/2021-fosscuda-2019a-PLUMED-2.7.1-Python-3.7.2"
]
},
"parallelization": {
"jobs": 1
}
},
"settings": {
"arguments": {
"flags": [],
"parameters": {}
},
"additional": {
"sim_type": "em"
}
}
},
{
"step_id": "06c_prepare_simulations_nvt",
"type": "pmx_prepare_simulations",
"execution": {
"prefix_execution": "module load GROMACS/2021-fosscuda-2019a-PLUMED-2.7.1-Python-3.7.2",
"parallelization": {
"jobs": 24
}
},
"settings": {
"arguments": {
"flags": [],
"parameters": {}
},
"additional": {
"sim_type": "nvt"
}
}
},
{
"step_id": "06d_run_simulations",
"type": "pmx_run_simulations",
"execution": {
"platform": "slurm",
"resources": {
"partition": "core",
"cores": 16,
"mem": "8g",
"modules": [
"GROMACS/2021-fosscuda-2019a-PLUMED-2.7.1-Python-3.7.2"
]
},
"parallelization": {
"jobs": 1
}
},
"settings": {
"arguments": {
"flags": [],
"parameters": {
"-ntomp": 16,
"-ntmpi": 1
}
},
"additional": {
"sim_type": "nvt"
}
}
},
{
"step_id": "07_prepare_simulations",
"type": "pmx_prepare_simulations",
"execution": {
"prefix_execution": "module load GROMACS/2021-fosscuda-2019a-PLUMED-2.7.1-Python-3.7.2",
"parallelization": {
"jobs": 24
}
},
"settings": {
"arguments": {
"flags": [],
"parameters": {}
},
"additional": {
"sim_type": "eq"
}
}
},
{
"step_id": "07b_run_simulations",
"type": "pmx_run_simulations",
"execution": {
"platform": "slurm",
"resources": {
"partition": "gpu",
"gres": "gpu:1",
"modules": [
"GROMACS/2021-fosscuda-2019a-PLUMED-2.7.1-Python-3.7.2"
]
},
"parallelization": {
"jobs": 1
}
},
"settings": {
"arguments": {
"flags": [],
"parameters": {}
},
"additional": {
"sim_type": "eq"
}
}
},
{
"step_id": "08_prep_transitions",
"type": "pmx_prepare_transitions",
"execution": {
"prefix_execution": "module load GROMACS/2021-fosscuda-2019a-PLUMED-2.7.1-Python-3.7.2",
"parallelization": {
"jobs": 24
}
},
"settings": {
"arguments": {
"flags": [],
"parameters": {}
},
"additional": {
"sim_type": "transitions"
}
}
},
{
"step_id": "09_run_transitions",
"type": "pmx_run_simulations",
"execution": {
"platform": "slurm",
"resources": {
"partition": "core",
"cores": 16,
"mem": "8g",
"time": "48:00:00",
"modules": [
"GROMACS/2021-fosscuda-2019a-PLUMED-2.7.1-Python-3.7.2"
]
},
"parallelization": {
"jobs": 1
}
},
"settings": {
"arguments": {
"flags": [],
"parameters": {}
},
"additional": {
"sim_type": "transitions"
}
},
"input": {
"generic": []
}
},
{
"step_id": "pmx_analyse",
"type": "pmx_run_analysis",
"execution": {
"parallelization": {
"jobs": 24
}
},
"settings": {
"arguments": {
"flags": [],
"parameters": {}
},
"additional": {}
}
}
]
}
}
2 changes: 1 addition & 1 deletion examples/workflow/pmx/pmx_rbfe.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"settings": {
"arguments": {
"parameters": {
"-num-procs": 24
"-num-procs": 1
}
}
},
Expand Down
Loading

0 comments on commit 40e6722

Please sign in to comment.