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

Commit

Permalink
Pull request #1: Development
Browse files Browse the repository at this point in the history
Merge in COM/icolos from development to master

* commit 'db781044d8efbba5e3f5a3f7d20fa136abc184ad': (36 commits)
  udpate changelog for 1.7 release
  fix some asserts in unit tests
  fix but in citation generator when no tty connected to process
  add serial partition for slurm execution
  bug fix in slurm executor when handling binary locations
  bug fix in slurm executor when handling binary locations
  bug fix in slurm executor
  small fix in pdb2gmx when parametrising multiple ligand components
  improvement for debug logging in pdb2gmx
  minor citation formatting changes
  additional papers for citation generator
  add initial citation generator + header art for stdout
  parametrise threads for gmx mmgbsa calculation under MPI
  fix syntax in water posre block for gromacs topol
  small formatting improvements for gromacs topol
  fixed some iterator-related issues with circular imports, small improvements to logging and gromacs topology handling
  small method name change for gromacs
  update example gromacs MD workflows
  final updates to gromacs classes
  Finalized "CCDC"/"Gold" initial implementation.
  ...
  • Loading branch information
jharrymoore authored and CMargreitter committed Feb 16, 2022
2 parents 1b3140b + db78104 commit f738d80
Show file tree
Hide file tree
Showing 82 changed files with 2,296 additions and 1,399 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
__pycache__
pip-wheel-metadata
*.pyc
package.json
.vscode
Expand Down
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Update log

### Version 1.7.0 | 2022-02-16
#### Features
- Added Gold docking backend
- Added OpenFF parametrisation for GROMACS simulations
#### Internal
- Refactor MD system parametrisation and GROMACS topology handling
- Refactor step dispatching to allow for cleaner parallelization
- Various bug fixes and stability improvements

### Version 1.6.0 | 2022-02-04
#### Internal
- Unit tests fixed.
Expand Down
1 change: 1 addition & 0 deletions environment_min.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ dependencies:
- openbabel>=3
- rdkit>=2021.09.2
- acpype>=2022
- openff-toolkit>= 0.10.2
- pip:
- black
- regex
Expand Down
1 change: 0 additions & 1 deletion examples/workflow/docking/active_learning_docking.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"running_mode": "active_learning",
"virtual_lib": "<path>/lib.sdf",
"validation_lib": "<path>/val.sdf",
"activity_threshold": -7,
"n_rounds": 10,
"init_samples": 256,
"batch_size" : 128,
Expand Down
108 changes: 108 additions & 0 deletions examples/workflow/docking/gold_docking.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
{
"workflow": {
"header": {
"workflow_id": "Gold docking",
"description": "Runs docking using CCDC's GOLD and a pre-defined receptor file.",
"environment": {
"export": [
]
},
"global_variables": {
"smiles": "another_mol:Nc1ccc(cc1N)C(F)(F)F;failure:CXXC;aspirin:O=C(C)Oc1ccccc1C(=O)O",
"cavity_mol2_path": "{package_dir}/../IcolosData/molecules/1UYD/PU8_reference_ligand.mol2",
"receptor_path": "{package_dir}/../IcolosData/Gold/1UYD_protein.mol2"
}
},
"steps": [{
"step_id": "rdkit_embedding",
"type": "embedding",
"settings": {
"arguments": {
"flags": ["-epik"],
"parameters": {
"protonate": true,
"method": "rdkit"
}
},
"additional": {
}
},
"input": {
"compounds": [{
"source": "{smiles}",
"source_type": "string"
}
]
}
}, {
"step_id": "Gold",
"type": "gold_docking",
"execution": {
"prefix_execution": "module load ccdc",
"parallelization": {
"cores": 4
},
"failure_policy": {
"n_tries": 3
}
},
"settings": {
"arguments": {
"flags": [],
"parameters": {
}
},
"additional": {
"configuration": {
"AUTOMATIC SETTINGS": {
"autoscale": 0.5
},
"FLOOD FILL": {
"cavity_file": "{cavity_mol2_path}"
},
"PROTEIN DATA": {
"protein_datafile": "{receptor_path}"
}
},
"grid_ids": ["1UYD"]
}
},
"input": {
"compounds": [{
"source": "rdkit_embedding",
"source_type": "step"
}
]
},
"writeout": [
{
"compounds": {
"category": "conformers"
},
"destination": {
"resource": "{package_dir}/tests/junk/gold_docked_conformers.sdf",
"type": "file",
"format": "SDF"
}
},
{
"compounds": {
"category": "conformers",
"selected_tags": ["docking_score", "grid_id"],
"aggregation": {
"mode": "best_per_compound",
"key": "docking_score",
"highest_is_best": true
}
},
"destination": {
"resource": "{package_dir}/tests/junk/gold_docked_conformers.csv",
"type": "file",
"format": "CSV"
}
}
]
}
]
}
}
112 changes: 8 additions & 104 deletions examples/workflow/gromacs/gromacs_ensemble_mmgbsa.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,8 @@
}
},
"additional": {}
},
"input": {
"generic": [
{
"source": "01_pdb2gmx",
"extension": "gro"
}
]
}

},
{
"step_id": "03_solvate",
Expand All @@ -93,19 +86,8 @@
}
},
"additional": {}
},
"input": {
"generic": [
{
"source": "02_editconf",
"extension": "gro"
},
{
"source": "01_pdb2gmx",
"extension": "top"
}
]
}

},
{
"step_id": "04_grompp",
Expand All @@ -124,21 +106,9 @@
},
"input": {
"generic": [
{
"source": "03_solvate",
"extension": "gro"
},
{
"source": "{file_base}/ions.mdp",
"extension": "mdp"
},
{
"source": "03_solvate",
"extension": "top"
},
{
"source": "01_pdb2gmx",
"extension": "itp"
}
]
}
Expand Down Expand Up @@ -168,14 +138,6 @@
{
"source": "04_grompp",
"extension": "tpr"
},
{
"source": "04_grompp",
"extension": "top"
},
{
"source": "04_grompp",
"extension": "itp"
}
]
}
Expand All @@ -201,21 +163,10 @@
},
"input": {
"generic": [
{
"source": "05_genion",
"extension": "gro"
},

{
"source": "{file_base}/minim.mdp",
"extension": "mdp"
},
{
"source": "05_genion",
"extension": "top"
},
{
"source": "05_genion",
"extension": "itp"
}
]
}
Expand Down Expand Up @@ -269,21 +220,10 @@
},
"input": {
"generic": [
{
"source": "07_eminim_mdrun",
"extension": "gro"
},
{
"source": "05_genion",
"extension": "top"
},

{
"source": "{file_base}/nvt_equil.mdp",
"extension": "mdp"
},
{
"source": "01_pdb2gmx",
"extension": "itp"
}
]
}
Expand Down Expand Up @@ -337,26 +277,12 @@
},
"input": {
"generic": [
{
"source": "09_nvt_mdrun",
"extension": "gro"
},
{
"source": "05_genion",
"extension": "top"
},

{
"source": "{file_base}/npt_equil.mdp",
"extension": "mdp"
},
{
"source": "01_pdb2gmx",
"extension": "itp"
},
{
"source": "08_nvt_grompp",
"extension": "ndx"
}

]
}
},
Expand Down Expand Up @@ -412,21 +338,10 @@
},
"input": {
"generic": [
{
"source": "11_npt_mdrun",
"extension": "gro"
},
{
"source": "05_genion",
"extension": "top"
},

{
"source": "{file_base}/md.mdp",
"extension": "mdp"
},
{
"source": "01_pdb2gmx",
"extension": "itp"
}
]
}
Expand Down Expand Up @@ -571,19 +486,8 @@
{
"source": "13_prod_mdrun",
"extension": "tpr"
},
{
"source": "13_prod_mdrun",
"extension": "gro"
},
{
"source": "12_prod_md_grompp",
"extension": "top"
},
{
"source": "12_prod_md_grompp",
"extension": "itp"
}

]
},
"writeout": [
Expand Down
Loading

0 comments on commit f738d80

Please sign in to comment.