Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mapping trajectory #239

Open
wants to merge 63 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 48 commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
c3774a7
last commit
mehradans92 Jul 9, 2020
ee6ffba
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Jul 17, 2020
de438fd
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Jul 20, 2020
ee89429
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Jul 20, 2020
f894af6
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Jul 21, 2020
fdea07d
removed redundant files
mehradans92 Jul 21, 2020
a5458bc
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Aug 11, 2020
4cb3fda
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Aug 13, 2020
e322e40
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Aug 13, 2020
0ab1019
need to add find_molecules_from_traj function from v1
mehradans92 Aug 11, 2020
1210e2a
defined mapping workflow
mehradans92 Sep 1, 2020
e30b6d0
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Sep 1, 2020
42ac417
Merge branch 'master' into mapping_traj_v2
mehradans92 Sep 1, 2020
b807355
included forcematching
mehradans92 Sep 1, 2020
541e3a2
added unittests for mapping_matrix and find_molecules_from_traj funct…
mehradans92 Sep 14, 2020
0b75895
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Sep 14, 2020
c6d3e6d
Merge branch 'master' into mapping_traj_v2
mehradans92 Sep 14, 2020
80ed6a9
fixed the path to loaded test_trajectory
mehradans92 Sep 14, 2020
f2549a6
fixed the path to loaded test_trajectory
mehradans92 Sep 14, 2020
97303c3
added mapped forces
mehradans92 Oct 31, 2020
930746d
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Oct 31, 2020
e23b1bf
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Feb 4, 2021
389599f
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Feb 4, 2021
50d7b2c
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Feb 4, 2021
39ae6d5
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Feb 10, 2021
0edf6fe
resolved merge conflicts
mehradans92 Feb 10, 2021
8e82640
defined compute_ohe_bead_type_interactions method in utils.py
mehradans92 Feb 11, 2021
738116b
resolved merge conflicts
mehradans92 Feb 11, 2021
d617793
revised method details
mehradans92 Feb 11, 2021
3fee7c3
fixed n_btypes description
mehradans92 Feb 11, 2021
8b67de1
revised compute_ohe_bead_type_interactions function in tensorflow
mehradans92 Feb 12, 2021
5d8e335
revised definition
mehradans92 Feb 12, 2021
34b1602
added new method to compute beadtype interactions as ohe
mehradans92 Feb 16, 2021
a3e4280
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Feb 17, 2021
7e4c5f8
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Feb 18, 2021
312fa53
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Feb 18, 2021
44467e2
resolved merge conflicts
mehradans92 Feb 18, 2021
748c867
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Feb 23, 2021
8915399
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Mar 3, 2021
c8484d4
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Mar 3, 2021
6df2eca
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Mar 3, 2021
28be600
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Mar 8, 2021
0381ad4
added name to WCA layer
mehradans92 Mar 10, 2021
4757ed7
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Mar 10, 2021
d7cc1b1
Merge branch 'master' into save_model
mehradans92 Mar 10, 2021
b50f29c
updated notebook
mehradans92 Mar 10, 2021
93c39da
Merge branch 'save_model' into mapping_traj_v2
mehradans92 Mar 10, 2021
99e64bc
added result files
mehradans92 Mar 10, 2021
0ab3ca9
resolved merge conflicts
mehradans92 Mar 10, 2021
50ec687
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Mar 10, 2021
c97b934
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Mar 11, 2021
5353ced
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Mar 11, 2021
9cb5687
Fixed conflicts
mehradans92 Mar 11, 2021
05428e3
updated branch, added higher l1 reg, added saved weights
mehradans92 Mar 16, 2021
dd148d2
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Mar 16, 2021
35fa4f6
Merge branch 'master' into mapping_traj_v2
mehradans92 Mar 16, 2021
ae65f75
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 May 18, 2021
ae8c314
Merge branch 'master' into mapping_traj_v2
mehradans92 May 18, 2021
abcfc46
prepared inference model, need to debug angle type
mehradans92 May 18, 2021
b13748a
updated notebook
mehradans92 Sep 3, 2021
28c23e6
Merge branch 'master' of https://github.com/ur-whitelab/hoomd-tf
mehradans92 Sep 3, 2021
fca2209
Merge branch 'master' into mapping_traj_v2
mehradans92 Sep 3, 2021
98cef84
added potential comparison, fit it poor
mehradans92 Sep 3, 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
451 changes: 441 additions & 10 deletions examples/07. Molecules CG Mapping.ipynb

Large diffs are not rendered by default.

Binary file added examples/Molecules_CG_Mapping/training.npy
Binary file not shown.
2 changes: 2 additions & 0 deletions examples/Molecules_CG_Mapping/weights/checkpoint
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
model_checkpoint_path: "weights_epoch_20"
all_model_checkpoint_paths: "weights_epoch_20"
Binary file not shown.
Binary file not shown.
3 changes: 2 additions & 1 deletion htf/layers.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ def __init__(self, sigma, regularization_strength=1e-3):
self.sigma = self.add_weight(
shape=(),
regularizer=lambda x: -1e-3 * x,
initializer=tf.keras.initializers.Constant(value=sigma)
initializer=tf.keras.initializers.Constant(value=sigma),
name='sigma'
)

def get_config(self):
Expand Down
3 changes: 3 additions & 0 deletions htf/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,10 @@ def compute_ohe_bead_type_interactions(pos_btype, nlist_btype, n_btypes):
total_interactions = n_btypes * (n_btypes - 1) // 2 + n_btypes
return tf.one_hot(one_hot_indices, depth=total_interactions)

<<<<<<< HEAD
=======

>>>>>>> master
mehradans92 marked this conversation as resolved.
Show resolved Hide resolved
def compute_nlist(
positions,
r_cut,
Expand Down