Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
1f92ed1
normalized energy kernel by n_atoms, only changed envs_struc
YuuuXie Mar 11, 2021
e6d46a4
try n2 starting from 0
YuuuXie Mar 17, 2021
67f8ce3
reorganize the loop order
YuuuXie Mar 26, 2021
decdfb9
fix module import
YuuuXie Mar 26, 2021
c6aa5b7
debugged b2_desc
YuuuXie Mar 27, 2021
c1b4fdd
update compute_std with latest B2_desc function
YuuuXie Mar 27, 2021
6b4ee4d
rm time stamp
YuuuXie Mar 27, 2021
13c6c3b
merge master
YuuuXie Mar 27, 2021
f8e8990
reorganize write_varmap
YuuuXie May 10, 2021
557e9e6
fix kernel return
YuuuXie May 10, 2021
2fd3ba3
update trainining set in write_varmap
YuuuXie May 10, 2021
80e8d74
fix kernel return in update
YuuuXie May 10, 2021
b8c6b18
fix single_atom_en bug
YuuuXie May 16, 2021
d35fa1a
Merge branch 'master' of github.com:mir-group/flare_pp into norm_energy
YuuuXie May 16, 2021
3249271
Merge branch 'master' of github.com:mir-group/flare_pp into rewrite_b…
YuuuXie May 16, 2021
74557bd
Merge branch 'norm_energy' of github.com:mir-group/flare_pp into rewr…
YuuuXie May 16, 2021
92acc27
fix unit test of normalizing energy
YuuuXie May 17, 2021
d687704
print flags
YuuuXie May 17, 2021
5b3cb74
remove print flag
YuuuXie May 18, 2021
5b9dc23
Revert "normalized energy kernel by n_atoms, only changed envs_struc"
YuuuXie May 18, 2021
5363bbd
Revert "remove print flag"
YuuuXie May 18, 2021
560d7ad
Revert "print flags"
YuuuXie May 18, 2021
5bed2c3
Revert "fix unit test of normalizing energy"
YuuuXie May 18, 2021
2fd8478
fix bugs of sgp_wrapper
YuuuXie May 20, 2021
ab8231b
update version to 0.0.21
YuuuXie Sep 9, 2021
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
Prev Previous commit
Next Next commit
fix single_atom_en bug
  • Loading branch information
YuuuXie committed May 16, 2021
commit b8c6b18361dbd2583070e45b6b088ae946d71cf6
8 changes: 6 additions & 2 deletions flare_pp/sparse_gp.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import json
from time import time
import numpy as np
from flare_pp import _C_flare
from flare_pp._C_flare import SparseGP, Structure, NormalizedDotProduct
Expand Down Expand Up @@ -411,6 +412,7 @@ def write_varmap_coefficients(self, filename, contributor, kernel_idx):
if not is_same_data:
n_add = n_sgp - n_sgp_var
assert n_add > 0, "sgp_var has more training data than sgp"
print("Training data not match, adding", n_add, "structures")
for s in range(n_add):
custom_range = self.sparse_gp.sparse_indices[0][s + n_sgp_var]
struc_cpp = self.training_data[s + n_sgp_var]
Expand All @@ -432,15 +434,17 @@ def write_varmap_coefficients(self, filename, contributor, kernel_idx):
)

self.sgp_var.update_matrices_QR()

if not is_same_hyps:
print("Hyps not match, set hyperparameters")
self.sgp_var.set_hyperparameters(self.sparse_gp.hyperparameters)
self.sgp_var_kernels = self.sgp_var.kernels

new_kernels = self.sgp_var.kernels
print("Map with current sgp_var")

self.sgp_var.write_varmap_coefficients(filename, contributor, kernel_idx)

return new_kernels

def duplicate(self, new_hyps=None, new_kernels=None, new_powers=None):
Expand Down