Skip to content

ENH: Add Model class for model training and validation #19

Merged
merged 3 commits into from
Sep 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ def load_datapoints(atoms, process_dict):
# ])
print(dataset[0][-1].x)
print(dataset.df_name_idx.head())
print(dataset[0][-1].name)

# Create datapoint
atoms = read(data_root_path / "Pt_3_Rh_9_-7-7-S.cif")
Expand Down
2 changes: 1 addition & 1 deletion src/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def init_conv_layers(self):
gnn.CGConv(
channels=self.conv_size[i],
dim=self.num_edge_features[i],
batch_norm=True,
batch_norm=False,
),
nn.LeakyReLU(inplace=True),
]
Expand Down
6 changes: 4 additions & 2 deletions src/samplers.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,11 @@ def create_samplers(self, sample_config):
randomizer.shuffle(idx_array)

# Get indices
train_size = int(np.ceil(sample_config["train"] * self.dataset_size))
if sample_config["train"] < 1.:
train_size = int(np.ceil(sample_config["train"] * self.dataset_size))
train_idx = idx_array[:train_size]
val_size = int(np.ceil(sample_config["val"] * self.dataset_size))
if sample_config["val"] < 1.:
val_size = int(np.floor(sample_config["val"] * self.dataset_size))
val_idx = idx_array[train_size : train_size + val_size]
test_idx = idx_array[train_size + val_size :]

Expand Down
Loading