Skip to content

Commit 8221fe2

Browse files
committed
Bump to v0.2.0, to include bugfixes and additions
1 parent c67f41a commit 8221fe2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+450
-100
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ configs/local/default.yaml
173173
/forks/FABind/FABind/
174174
/forks/NeuralPLexer/NeuralPLexer/
175175
/forks/NeuralPLexer/**/neuralplexermodels*
176+
/forks/P2Rank/
176177
/forks/*/inference*/
177178
/forks/RoseTTAFold-All-Atom/blast-2.2.26
178179
/forks/RoseTTAFold-All-Atom/rf2aa/config/inference/*_rfaa_inference.yaml

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
### 0.2.0 - 07/04/2024
2+
3+
- Added P2Rank as a new binding site prediction method available to use with AutoDock-Vina
4+
- Added OpenJDK to the `PoseBench` Conda environment to enable P2Rank inference
5+
- Added a script to benchmark the required compute resources for each baseline method
6+
- Updated citation
7+
- Corrected directory navigation instructions (i.e., `cd` references) in `README.md` to reflect the directory structure of each Zenodo archive file
8+
- Corrected Biopython, NumPy, and ProDy versions in the DiffDock Conda environment to avoid GCC compilation errors
9+
110
### 0.1.0 - 06/08/2024
211

312
- First public release

README.md

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ cd forks/RoseTTAFold-All-Atom/rf2aa/SE3Transformer/ && pip3 install --no-cache-d
8585
# - AutoDock Vina Tools environment (~1 GB)
8686
mamba env create -f environments/adfr_environment.yaml --prefix forks/Vina/ADFR/
8787
conda activate forks/Vina/ADFR/ # NOTE: one still needs to use `conda` to (de)activate environments
88+
# - P2Rank (~0.5 GB)
89+
wget -P forks/P2Rank/ https://github.com/rdk/p2rank/releases/download/2.4.2/p2rank_2.4.2.tar.gz
90+
tar -xzf forks/P2Rank/p2rank_2.4.2.tar.gz -C forks/P2Rank/
91+
rm forks/P2Rank/p2rank_2.4.2.tar.gz
8892
```
8993

9094
Download checkpoints (~8.25 GB total)
@@ -132,7 +136,6 @@ of how to extend `PoseBench`, as outlined below.
132136

133137
```bash
134138
# fetch, extract, and clean-up preprocessed Astex Diverse, PoseBusters Benchmark, DockGen, and CASP15 data (~3 GB) #
135-
cd data/
136139
wget https://zenodo.org/records/11477766/files/astex_diverse_set.tar.gz
137140
wget https://zenodo.org/records/11477766/files/posebusters_benchmark_set.tar.gz
138141
wget https://zenodo.org/records/11477766/files/dockgen_set.tar.gz
@@ -145,50 +148,41 @@ rm astex_diverse_set.tar.gz
145148
rm posebusters_benchmark_set.tar.gz
146149
rm dockgen_set.tar.gz
147150
rm casp15_set.tar.gz
148-
cd ../
149151
```
150152

151153
### Downloading benchmark method predictions
152154

153155
```bash
154156
# fetch, extract, and clean-up benchmark method predictions to reproduce paper results (~19 GB) #
155157
# DiffDock predictions and results
156-
cd forks/DiffDock/
157158
wget https://zenodo.org/records/11477766/files/diffdock_benchmark_method_predictions.tar.gz
158159
tar -xzf diffdock_benchmark_method_predictions.tar.gz
159160
rm diffdock_benchmark_method_predictions.tar.gz
160161
# FABind predictions and results
161-
cd forks/FABind/
162162
wget https://zenodo.org/records/11477766/files/fabind_benchmark_method_predictions.tar.gz
163163
tar -xzf fabind_benchmark_method_predictions.tar.gz
164164
rm fabind_benchmark_method_predictions.tar.gz
165165
# DynamicBind predictions and results
166-
cd forks/DynamicBind/
167166
wget https://zenodo.org/records/11477766/files/dynamicbind_benchmark_method_predictions.tar.gz
168167
tar -xzf dynamicbind_benchmark_method_predictions.tar.gz
169168
rm dynamicbind_benchmark_method_predictions.tar.gz
170169
# NeuralPLexer predictions and results
171-
cd forks/NeuralPLexer/
172170
wget https://zenodo.org/records/11477766/files/neuralplexer_benchmark_method_predictions.tar.gz
173171
tar -xzf neuralplexer_benchmark_method_predictions.tar.gz
174172
rm neuralplexer_benchmark_method_predictions.tar.gz
175173
# RoseTTAFold-All-Atom predictions and results
176-
cd forks/RoseTTAFold-All-Atom/
177174
wget https://zenodo.org/records/11477766/files/rfaa_benchmark_method_predictions.tar.gz
178175
tar -xzf rfaa_benchmark_method_predictions.tar.gz
179176
rm rfaa_benchmark_method_predictions.tar.gz
180177
# TULIP predictions and results
181-
cd forks/TULIP/
182178
wget https://zenodo.org/records/11477766/files/tulip_benchmark_method_predictions.tar.gz
183179
tar -xzf tulip_benchmark_method_predictions.tar.gz
184180
rm tulip_benchmark_method_predictions.tar.gz
185181
# AutoDock Vina predictions and results
186-
cd forks/Vina/
187182
wget https://zenodo.org/records/11477766/files/vina_benchmark_method_predictions.tar.gz
188183
tar -xzf vina_benchmark_method_predictions.tar.gz
189184
rm vina_benchmark_method_predictions.tar.gz
190185
# Astex Diverse, PoseBusters Benchmark (w/ pocket-only results), DockGen, and CASP15 consensus ensemble predictions and results
191-
cd data/test_cases/
192186
wget https://zenodo.org/records/11477766/files/astex_diverse_ensemble_benchmark_method_predictions.tar.gz
193187
wget https://zenodo.org/records/11477766/files/posebusters_benchmark_ensemble_benchmark_method_predictions.tar.gz
194188
wget https://zenodo.org/records/11477766/files/dockgen_ensemble_benchmark_method_predictions.tar.gz
@@ -892,7 +886,8 @@ If you use the code or benchmark method predictions associated with this reposit
892886
title={Deep Learning for Protein-Ligand Docking: Are We There Yet?},
893887
author={Morehead, Alex and Giri, Nabin and Liu, Jian and Cheng, Jianlin},
894888
booktitle={ICML AI4Science Workshop},
895-
year={2024}
889+
year={2024},
890+
note={selected as a spotlight presentation},
896891
}
897892
```
898893

citation.bib

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@ @inproceedings{morehead2024posebench
22
title={Deep Learning for Protein-Ligand Docking: Are We There Yet?},
33
author={Morehead, Alex and Giri, Nabin and Liu, Jian and Cheng, Jianlin},
44
booktitle={ICML AI4Science Workshop},
5-
year={2024}
5+
year={2024},
6+
note={selected as a spotlight presentation},
67
}

configs/analysis/inference_analysis.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
full_report: true # whether to generate a full PoseBusters report (i.e. with all metrics) or a summary report (i.e. with only the most important metrics)
22
method: diffdock # the method for which to score predictions - NOTE: must be one of (`diffdock`, `fabind`, `dynamicbind`, `neuralplexer`, `rfaa`, `vina`, `ensemble`)
3-
vina_binding_site_method: diffdock # the method to use for Vina binding site prediction - NOTE: must be one of (`diffdock`, `fabind`, `dynamicbind`, `neuralplexer`, `rfaa`)
3+
vina_binding_site_method: diffdock # the method to use for Vina binding site prediction - NOTE: must be one of (`diffdock`, `fabind`, `dynamicbind`, `neuralplexer`, `rfaa`, `p2rank`)
44
dataset: posebusters_benchmark # the dataset to use - NOTE: must be one of (`posebusters_benchmark`, `astex_diverse`, `dockgen`, `casp15`)
55
ensemble_ranking_method: consensus # the method with which to rank-order and select the top ensemble prediction for each target - NOTE: must be one of (`consensus`, `ff`)
66
input_csv_path: ${resolve_method_input_csv_path:${method},${dataset}} # the input CSV filepath with which to run inference

configs/model/diffdock_inference.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ actual_steps: 19 # the actual number of inference steps to run (i.e., after how
1414
no_final_step_noise: true # whether to disable the final inference step's noise from being added
1515
repeat_index: 1 # the repeat index to use for inference
1616
skip_existing: true # whether to skip inference for existing output directories
17+
max_num_inputs: null # if provided, the number of (dataset subset) inputs over which to run inference

configs/model/dynamicbind_inference.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ num_workers: 1 # the number of workers to use for native relaxation during infer
1313
skip_existing: true # whether to skip existing predictions
1414
repeat_index: 1 # the repeat index to use for inference
1515
pocket_only_baseline: false # whether to run the pocket-only baseline
16+
max_num_inputs: null # if provided, the number of (dataset subset) inputs over which to run inference

configs/model/fabind_inference.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ ckpt_path: ${oc.env:PROJECT_ROOT}/forks/FABind/ckpt/best_model.bin # the checkpo
1111
output_dir: ${oc.env:PROJECT_ROOT}/forks/FABind/inference/fabind_${dataset}_output_${repeat_index} # the output directory to which to save the inference results
1212
repeat_index: 1 # the repeat index to use for inference
1313
pocket_only_baseline: false # whether to run the pocket-only baseline
14+
max_num_inputs: null # if provided, the number of (dataset subset) inputs over which to run inference

configs/model/inference_relaxation.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
method: diffdock # the method for which to relax predictions - NOTE: must be one of (`diffdock`, `fabind`, `dynamicbind`, `neuralplexer`, `rfaa`, `vina`, `tulip`)
2-
vina_binding_site_method: diffdock # the method to use for Vina binding site prediction - NOTE: must be one of (`diffdock`, `fabind`, `dynamicbind`, `neuralplexer`, `rfaa`)
2+
vina_binding_site_method: diffdock # the method to use for Vina binding site prediction - NOTE: must be one of (`diffdock`, `fabind`, `dynamicbind`, `neuralplexer`, `rfaa`, `p2rank`)
33
dataset: posebusters_benchmark # the dataset for which to relax predictions - NOTE: must be one of (`posebusters_benchmark`, `astex_diverse`, `dockgen`, `casp15`)
44
ensemble_ranking_method: consensus # the method with which to rank-order and select the top ensemble prediction for each target - NOTE: must be one of (`consensus`, `ff`)
55
num_processes: 1 # the number of parallel processes to use for relaxation

configs/model/neuralplexer_inference.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ rank_outputs_by_confidence: true # whether to rank the output conformations, by
2626
plddt_ranking_type: ligand # the type of plDDT ranking to apply to generated samples - NOTE: must be one of (`protein`, `ligand`, `protein_ligand`)
2727
csv_path: null # the CSV filepath from which to parse benchmarking input data
2828
repeat_index: 1 # the repeat index to use for inference
29+
max_num_inputs: null # if provided, the number of (dataset subset) inputs over which to run inference

0 commit comments

Comments
 (0)