Skip to content

Commit e302b58

Browse files
authored
Merge pull request #1391 from haddocking/1385-implement-adaptative-efficiency-submission-algorithm-for-modegrid
add adaptative job concatenation to `mode=grid`
2 parents 009b865 + 29eae8b commit e302b58

File tree

7 files changed

+748
-280
lines changed

7 files changed

+748
-280
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,3 +159,5 @@ docs/haddock.modules.base_cns_module.rst
159159
docs/setup.rst
160160
docs/clients/*rst
161161
log
162+
end-to-end_tests/ab-grid
163+
end-to-end_tests/prot-grid

end-to-end_tests/ab-grid.toml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
run_dir = "ab-grid"
2+
mode = "grid"
3+
ncores = 24
4+
molecules = [
5+
"../examples/docking-antibody-antigen/data/4G6K_fv.pdb",
6+
"../examples/docking-antibody-antigen/data/4I1B-matched.pdb",
7+
]
8+
[topoaa]
9+
[rigidbody]
10+
tolerance = 5
11+
ambig_fname = "../examples/docking-antibody-antigen/data/ambig.tbl"
12+
unambig_fname = "../examples/docking-antibody-antigen/data/unambig.tbl"
13+
sampling = 10000
14+
["caprieval.0"]
15+
reference_fname = "../examples/docking-antibody-antigen/data/4G6M-matched.pdb"
16+
[seletop]
17+
select = 500
18+
["caprieval.1"]
19+
reference_fname = "../examples/docking-antibody-antigen/data/4G6M-matched.pdb"
20+
[flexref]
21+
tolerance = 5
22+
ambig_fname = "../examples/docking-antibody-antigen/data/ambig.tbl"
23+
unambig_fname = "../examples/docking-antibody-antigen/data/unambig.tbl"
24+
["caprieval.2"]
25+
reference_fname = "../examples/docking-antibody-antigen/data/4G6M-matched.pdb"
26+
[emref]
27+
tolerance = 5
28+
ambig_fname = "../examples/docking-antibody-antigen/data/ambig.tbl"
29+
unambig_fname = "../examples/docking-antibody-antigen/data/unambig.tbl"
30+
["caprieval.3"]
31+
reference_fname = "../examples/docking-antibody-antigen/data/4G6M-matched.pdb"
32+
[clustfcc]
33+
[seletopclusts]
34+
top_models = 4
35+
["caprieval.4"]
36+
reference_fname = "../examples/docking-antibody-antigen/data/4G6M-matched.pdb"

end-to-end_tests/prot-grid.toml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
run_dir = "prot-grid"
2+
mode = "grid"
3+
molecules = [
4+
"../examples/docking-protein-protein/data/e2aP_1F3G.pdb",
5+
"../examples/docking-protein-protein/data/hpr_ensemble.pdb",
6+
]
7+
[topoaa]
8+
autohis = false
9+
[topoaa.mol1]
10+
nhisd = 0
11+
nhise = 1
12+
hise_1 = 75
13+
[topoaa.mol2]
14+
nhisd = 1
15+
hisd_1 = 76
16+
nhise = 1
17+
hise_1 = 15
18+
[rigidbody]
19+
tolerance = 5
20+
ambig_fname = "../examples/docking-protein-protein/data/e2a-hpr_air.tbl"
21+
sampling = 1000
22+
["caprieval.1"]
23+
reference_fname = "../examples/docking-protein-protein/data/e2a-hpr_1GGR.pdb"
24+
[seletop]
25+
select = 200
26+
["caprieval.2"]
27+
reference_fname = "../examples/docking-protein-protein/data/e2a-hpr_1GGR.pdb"
28+
[flexref]
29+
tolerance = 5
30+
ambig_fname = "../examples/docking-protein-protein/data/e2a-hpr_air.tbl"
31+
["caprieval.3"]
32+
reference_fname = "../examples/docking-protein-protein/data/e2a-hpr_1GGR.pdb"
33+
[emref]
34+
tolerance = 5
35+
ambig_fname = "../examples/docking-protein-protein/data/e2a-hpr_air.tbl"
36+
["caprieval.4"]
37+
reference_fname = "../examples/docking-protein-protein/data/e2a-hpr_1GGR.pdb"
38+
[clustfcc]
39+
[seletopclusts]
40+
top_models = 4
41+
["caprieval.5"]
42+
reference_fname = "../examples/docking-protein-protein/data/e2a-hpr_1GGR.pdb"

examples/docking-protein-protein/docking-protein-protein-test-grid.toml

Lines changed: 0 additions & 53 deletions
This file was deleted.

integration_tests/test_grid.py

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)