Skip to content

Commit 753a79f

Browse files
committed
Add remaining code for optimization experiments
1 parent 789abc8 commit 753a79f

19 files changed

+441
-329
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,10 @@ scripts/nautilus/persistent_storage.yaml
168168

169169
bio-diffusion/
170170
logs/
171+
*optim_mols/
171172
outputs/
173+
epoch_*/
174+
.cache/
172175

173176
data/EDM/GEOM
174177
data/EDM/QM9

configs/experiment/geom_mol_gen_ddpm.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ callbacks:
2222
save_top_k: 3
2323
early_stopping:
2424
monitor: "val/loss"
25-
patience: 10
25+
patience: 20
2626

2727
trainer:
28-
min_epochs: 30
28+
min_epochs: 50
2929
max_epochs: 3000
3030
strategy: ddp_find_unused_parameters_false
3131
accelerator: gpu
@@ -122,6 +122,6 @@ datamodule:
122122

123123
logger:
124124
wandb:
125-
name: 02092023_GEOMMoleculeGenerationDDPM
125+
name: 04302023_GEOMMoleculeGenerationDDPM
126126
group: "GEOM"
127127
tags: ${tags}

configs/experiment/geom_mol_gen_ddpm_grid_search.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ callbacks:
2222
save_top_k: 3
2323
early_stopping:
2424
monitor: "val/loss"
25-
patience: 10
25+
patience: 20
2626

2727
trainer:
28-
min_epochs: 30
28+
min_epochs: 50
2929
max_epochs: 3000
3030
strategy: ddp_find_unused_parameters_false
3131
accelerator: gpu
@@ -125,7 +125,7 @@ datamodule:
125125

126126
logger:
127127
wandb:
128-
name: 02092023_GEOMMoleculeGenerationDDPM
128+
name: 04302023_GEOMMoleculeGenerationDDPM
129129
group: "GEOM"
130130
tags: ${tags}
131131

configs/model/geom_mol_gen_ddpm.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,5 @@ defaults:
1919
- module_cfg: geom_mol_gen_ddpm_gcp_module.yaml
2020
- layer_cfg: geom_mol_gen_ddpm_gcp_interaction_layer.yaml
2121
- diffusion_cfg: geom_mol_gen_ddpm.yaml
22+
23+
seed: ${..seed}

configs/mol_gen_eval.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ tags: ["dev"]
1919
ckpt_path: ???
2020

2121
# inference (i.e., sampling) and evaluation arguments
22+
seed: 42
2223
num_samples: 10000
2324
sampling_batch_size: 100
2425
num_test_passes: 5

configs/mol_gen_eval_conditional_qm9.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ task_name: "mol_gen_eval_conditional_qm9"
1616
tags: ["dev"]
1717

1818
# inference (i.e., sampling) and evaluation arguments
19+
seed: 42
1920
generator_model_filepath: ???
2021
classifier_model_dir: ""
2122
property: "alpha"

configs/mol_gen_sample.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ tags: ["dev"]
1818
ckpt_path: ???
1919

2020
# inference (i.e., sampling) arguments
21+
seed: ???
2122
output_dir: ""
2223
num_samples: ???
2324
num_nodes: 19

configs/trainer/default.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ _target_: pytorch_lightning.Trainer
22

33
default_root_dir: ${paths.output_dir}
44

5-
min_epochs: 5 # prevents early stopping
5+
min_epochs: 50 # prevents early stopping
66
max_epochs: 3000
77

88
strategy: ddp_find_unused_parameters_false

scripts/nautilus/README.md

-171
This file was deleted.

src/models/components/egnn.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,16 @@
1818

1919
from omegaconf import DictConfig
2020

21-
from torchtyping import TensorType, patch_typeguard
22-
from typeguard import typechecked
2321
from src.datamodules.components.edm_dataset import _edge_features, _node_features
2422

2523
from src.models.components import ScalarVector, centralize
2624
from src.models.components.gcpnet import GCPNetDynamics
2725
from src.models.components.variational_diffusion import NODE_FEATURE_DIFFUSION_TARGETS
2826
from src.utils.pylogger import get_pylogger
2927

28+
from torchtyping import TensorType, patch_typeguard
29+
from typeguard import typechecked
30+
3031
patch_typeguard() # use before @typechecked
3132

3233

src/models/components/gcpnet.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@
1616

1717
from omegaconf import OmegaConf, DictConfig
1818

19-
from torchtyping import TensorType, patch_typeguard
20-
from typeguard import typechecked
2119
from src.datamodules.components.edm_dataset import _edge_features, _node_features
2220

2321
from src.models import get_nonlinearity
2422
from src.models.components import GCPDropout, GCPLayerNorm, ScalarVector, centralize, is_identity, localize, safe_norm, scalarize, vectorize
2523
from src.models.components.variational_diffusion import NODE_FEATURE_DIFFUSION_TARGETS
2624
from src.utils.pylogger import get_pylogger
2725

26+
from torchtyping import TensorType, patch_typeguard
27+
from typeguard import typechecked
28+
2829
patch_typeguard() # use before @typechecked
2930

3031

0 commit comments

Comments
 (0)