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.

Sign up for GitHub

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

Jump to bottom

enable use of CVs defined by PyTorch neural network models #570

Open
wants to merge 106 commits into
base: master
Choose a base branch
from
Open

enable use of CVs defined by PyTorch neural network models #570

wants to merge 106 commits into from
+53,374 −7,234

Commits on May 13, 2022

  1. In the process of implementing torchann colvar

    @zwpku
    zwpku committed May 13, 2022
    Configuration menu
    Copy the full SHA
    a6f8e84 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/zwpku/colvars

    @zwpku
    zwpku committed May 13, 2022
    Configuration menu
    Copy the full SHA
    12c4ac7 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2022

  1. Implementing torchann

    @zwpku
    zwpku committed May 14, 2022
    Configuration menu
    Copy the full SHA
    6336c4b View commit details
    Browse the repository at this point in the history

Commits on May 15, 2022

  1. Implemented calc_gradients and apply_forces

    @zwpku
    zwpku committed May 15, 2022
    Configuration menu
    Copy the full SHA
    0d6c2c6 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2022

  1. Start working

    @zwpku
    zwpku committed May 16, 2022
    Configuration menu
    Copy the full SHA
    80a293e View commit details
    Browse the repository at this point in the history

Commits on May 20, 2022

  1. Handling periodicity; test torchANN with phi angle

    @zwpku
    zwpku committed May 20, 2022
    Configuration menu
    Copy the full SHA
    6275dfb View commit details
    Browse the repository at this point in the history

Commits on May 24, 2022

  1. Add output_index to specify the component of output layer that is used

    @zwpku
    zwpku committed May 24, 2022
    Configuration menu
    Copy the full SHA
    2d06095 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2023

  1. update with upstream

    Zhang committed Feb 8, 2023
    Configuration menu
    Copy the full SHA
    eb5cfe5 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2023

  1. up

    @zwpku
    zwpku committed Feb 9, 2023
    Configuration menu
    Copy the full SHA
    70ef673 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2023

  1. Update gromacs-2021.6 patch

    @zwpku
    zwpku committed Feb 10, 2023
    Configuration menu
    Copy the full SHA
    c4aa08b View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2023

  1. modify patch files for namd to support LibTorch

    @zwpku
    zwpku committed Feb 11, 2023
    Configuration menu
    Copy the full SHA
    3363f39 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2023

  1. Merge branch 'Colvars:master' into torchann

    @zwpku
    zwpku authored Mar 13, 2023
    Configuration menu
    Copy the full SHA
    56ee5d1 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. updated with upstream:master

    Zhang committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    3711f0d View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2023

  1. Add test for torchann

    Zhang committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    3f5eb82 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from zwpku/torchann1 

    Torchann1
    @zwpku
    zwpku authored Jul 21, 2023
    Configuration menu
    Copy the full SHA
    45064d6 View commit details
    Browse the repository at this point in the history

  3. minor changes

    @zwpku
    zwpku committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    2edb0ff View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2023

  1. Modified test for torchann component

    @zwpku
    zwpku committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    5a781d8 View commit details
    Browse the repository at this point in the history

  2. Add figures for AutoEncoder CV

    Zhang committed Aug 2, 2023
    Configuration menu
    Copy the full SHA
    4776e5e View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2023

  1. Convert unit of atom coordinates to angstrom before feeding to torch … 

    …model
    @zwpku
    zwpku committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    41f5618 View commit details
    Browse the repository at this point in the history

  2. Bug fixed in gradient of torchann

    @zwpku
    zwpku committed Aug 3, 2023
    Configuration menu
    Copy the full SHA
    66b69b4 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2023

  1. Add Torch in lammps' cmake

    Zhang committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    53bbf6a View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2023

  1. Added test files for torchann in NAMD

    Zhang committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    c049f84 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'Colvars:master' into torchann

    @zwpku
    zwpku authored Aug 14, 2023
    Configuration menu
    Copy the full SHA
    c68df86 View commit details
    Browse the repository at this point in the history

  3. Minor changes in torchann component

    @zwpku
    zwpku committed Aug 14, 2023
    Configuration menu
    Copy the full SHA
    2c5ae86 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2023

  1. Updated patches for Gromacs 2020.x and 2022.x

    Zhang committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    1286028 View commit details
    Browse the repository at this point in the history

  2. Updated torchann in header file; Removed test for torchann component

    Zhang committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    78789ed View commit details
    Browse the repository at this point in the history

  3. Add tests for Gromacs and NAMD

    @zwpku
    zwpku committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    13753ff View commit details
    Browse the repository at this point in the history

  4. Add tests for Gromacs and NAMD

    @zwpku
    zwpku committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    0ae580c View commit details
    Browse the repository at this point in the history

  5. Updated torchann-namd test and references

    @zwpku
    zwpku committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    47f4a87 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2023

  1. Reimplement torchann as a derived class of LinearCombination

    @zwpku
    zwpku committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    b59830c View commit details
    Browse the repository at this point in the history

  2. declare torchann cvc as scalar

    @zwpku
    zwpku committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    ce24547 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2023

  1. allocate memory of cv_force before use

    @zwpku
    zwpku committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    57c8502 View commit details
    Browse the repository at this point in the history

  2. c++17 instead of c++14

    Zhang committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    388c6be View commit details
    Browse the repository at this point in the history

  3. removed file to correct place

    Zhang committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    7d3b23e View commit details
    Browse the repository at this point in the history

  4. removed file to correct place

    Zhang committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    a08ed74 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2023

  1. Minor correction in apply_force of torchann

    @zwpku
    zwpku committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    c3de09c View commit details
    Browse the repository at this point in the history

  2. Add tests for gromacs and NAMD

    @zwpku
    zwpku committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    2230af1 View commit details
    Browse the repository at this point in the history

  3. merged with master

    @zwpku
    zwpku committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    bbe0360 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. Modified the definition of cv_force such that it contains the informa… 

    …tion on the size
    @zwpku
    zwpku committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    21ee264 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2023

  1. Add option to set data type in torchann

    @zwpku
    zwpku committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    94034f8 View commit details
    Browse the repository at this point in the history

  2. Add option to set data type in torchann

    @zwpku
    zwpku committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    d2e34ea View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2023

  1. Enable GPU support; Further tests are needed.

    Zhang committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    3acc188 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2023

  1. updated patch for gromacs-2021.x

    Zhang committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    ce7329e View commit details
    Browse the repository at this point in the history

  2. updated patch for gromacs-2022

    Zhang committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    257a58d View commit details
    Browse the repository at this point in the history

  3. Updated patch for gromacs-2020.x

    Zhang committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    1c29409 View commit details
    Browse the repository at this point in the history

  4. Update namd config to support GPU

    Zhang committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    8d4dcb1 View commit details
    Browse the repository at this point in the history

  5. Do not require libtorch in lammps by default

    @zwpku
    zwpku committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    14ace25 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2023

  1. Minor changes (spaces/indent) in code; Removed tests for namd and gro… 

    …macs backend
    @zwpku
    zwpku committed Sep 2, 2023
    Configuration menu
    Copy the full SHA
    39c1a4f View commit details
    Browse the repository at this point in the history

  2. update namd config patch to make namd3 work

    @zwpku
    zwpku committed Sep 2, 2023
    Configuration menu
    Copy the full SHA
    7987232 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2023

  1. Merge branch 'master' into torchann

    @zwpku
    zwpku committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    8aec443 View commit details
    Browse the repository at this point in the history

  2. merge with master

    @zwpku
    zwpku committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    cbd7c3d View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2023

  1. Merge branch 'upmaster' into torchann

    Zhang committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    566621e View commit details
    Browse the repository at this point in the history

  2. updated patch for gromacs 2023 to support torchann

    Zhang committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    2118759 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2023

  1. Merge branch 'master' into torchann

    @zwpku
    zwpku committed Sep 14, 2023
    Configuration menu
    Copy the full SHA
    4b6ba2f View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2023

  1. merge torchann squash

    Zhang committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    b3d7247 View commit details
    Browse the repository at this point in the history

  2. conflicts resolved

    Zhang committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    f060d9e View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2023

  1. Do not use GPU

    Zhang committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    5f4e6f7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'upmaster' (early part) into torchann

    Zhang committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    ee5254f View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2023

  1. Merge branch 'master' into torchann

    @zwpku
    zwpku committed Nov 3, 2023
    Configuration menu
    Copy the full SHA
    87f730f View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. Merge branch 'upmaster' into torchann

    Zhang committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    d87ef94 View commit details
    Browse the repository at this point in the history

  2. merged with master and changed torchann class based on HanatoK's sugg… 

    …estions
    Zhang committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    55e4128 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'github' into torchann

    Zhang committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    2c9fba1 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2023

  1. Added torchann tests for gromacs and namd (only when libtorch is linked)

    @zwpku
    zwpku committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    035eaff View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

  1. Add torch option to library CMake file

    @jhenin
    jhenin committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    891b37e View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. Merge branch 'master' into torchann

    @zwpku
    zwpku committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    7357ee7 View commit details
    Browse the repository at this point in the history

  2. Use the same code from distanceZ to handle nearest-image convection

    @zwpku
    zwpku committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    ba18c36 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2023

  1. Squash-merge of master branch

    @giacomofiorin
    giacomofiorin committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    bca42a3 View commit details
    Browse the repository at this point in the history

  2. Integrate libTorch CMake recipe into GROMACS main

    @giacomofiorin
    giacomofiorin committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    9a72e53 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. Fixed conflicts

    @zwpku
    zwpku committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    a244537 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2023

  1. Fixed Conflicts

    Zhang committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    eeee166 View commit details
    Browse the repository at this point in the history

  2. Fixed Conflicts

    Zhang committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    158f335 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2023

  1. Fix NAMD build dependencies

    @giacomofiorin
    giacomofiorin committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    82ce569 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2024

  1. Merge branch 'master' into torchann

    @zwpku
    zwpku committed Feb 22, 2024
    Configuration menu
    Copy the full SHA
    7e07b4a View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2024

  1. Merge branch 'master' into torchann

    @giacomofiorin
    giacomofiorin authored Jul 5, 2024
    Configuration menu
    Copy the full SHA
    e163328 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2024

  1. Restore componentDisabled and make it more generally usable

    @giacomofiorin
    giacomofiorin committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    2ea5b57 View commit details
    Browse the repository at this point in the history

  2. Integrate cvc base class improvements with torchANN

    @giacomofiorin
    giacomofiorin committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    86fefbf View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into torchann

    @giacomofiorin
    giacomofiorin committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    7ec36da View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Fix CMakeFile for Gromacs 2024 

    Also allow torchANN components to be declared as periodic to fix the regtest
    @jhenin
    jhenin committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    bb3b4c2 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. Set PRNG seed in Gromacs regtests

    @jhenin
    jhenin committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    bb8a774 View commit details
    Browse the repository at this point in the history

  2. Update patches for GMX CMake files 

    Had to make separate patch for the mdmodules version
    @jhenin
    jhenin committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    a607a7e View commit details
    Browse the repository at this point in the history

  3. Add patch for gmxManageColvars.cmake

    @jhenin
    jhenin committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    9840ebe View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2024

  1. Merge branch 'master' into torchann

    @jhenin
    jhenin committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    5e41ea0 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2024

  1. Use Clang and ccache more often when available

    @giacomofiorin
    giacomofiorin committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    2ab80ae View commit details
    Browse the repository at this point in the history

  2. Find PyTorch through CMake and switch to -DCOLVARS_TORCH as macro

    @giacomofiorin
    giacomofiorin committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    b768be2 View commit details
    Browse the repository at this point in the history

  3. Update CentOS9-devel container recipe

    @giacomofiorin
    giacomofiorin committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    b2ffb3e View commit details
    Browse the repository at this point in the history

  4. Use libTorch from container when available

    @giacomofiorin
    giacomofiorin committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    41f7060 View commit details
    Browse the repository at this point in the history

  5. Remove pre-C++11 stuff

    @giacomofiorin
    giacomofiorin committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    be0a02f View commit details
    Browse the repository at this point in the history

  6. Add torchann test for standalone library

    @giacomofiorin
    giacomofiorin committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    a0bdfb9 View commit details
    Browse the repository at this point in the history

  7. Disable torchann test when not building with libTorch

    @giacomofiorin
    giacomofiorin committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    c8a0531 View commit details
    Browse the repository at this point in the history

  8. Enable Torch interface only when the requested C++ standard supports it

    @giacomofiorin
    giacomofiorin committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    70b1858 View commit details
    Browse the repository at this point in the history

  9. Raise the CMAKE_CXX_STANDARD to 17 if libtorch is used and 

    CMAKE_CXX_STANDARD is less than 17
    @HanatoK @giacomofiorin
    HanatoK authored and giacomofiorin committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    4f4b7bb View commit details
    Browse the repository at this point in the history

  10. Squash-merge of master branch

    @giacomofiorin
    giacomofiorin committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    4640193 View commit details
    Browse the repository at this point in the history

  11. Remove patch files for old and unsupported GROMACS versions

    @giacomofiorin
    giacomofiorin committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    c4d8c9d View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. Merge branch 'master'

    @giacomofiorin
    giacomofiorin committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    48657cb View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2024

  1. - Isolated torch-related code 

    - Removed componentDisabled
    Zhang committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    2a7cbcb View commit details
    Browse the repository at this point in the history

  2. minor fix

    Zhang committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    9f7cd27 View commit details
    Browse the repository at this point in the history

  3. Add torch header file to dependence file of backends

    Zhang committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    c471ae8 View commit details
    Browse the repository at this point in the history

  4. fixed bug when torch is not available

    Zhang committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    d500a88 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master'

    @giacomofiorin
    giacomofiorin committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    28d80b4 View commit details
    Browse the repository at this point in the history

  6. Enable Torch in GROMACS builds when available from CI container

    @giacomofiorin
    giacomofiorin committed Oct 11, 2024
    Configuration menu
    Copy the full SHA
    871cfa0 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2024

  1. Do not duplicate libTorch C++ flags

    @giacomofiorin
    giacomofiorin committed Oct 19, 2024
    Configuration menu
    Copy the full SHA
    3c08493 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2024

  1. Document apptainer push

    @giacomofiorin
    giacomofiorin committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    7830857 View commit details
    Browse the repository at this point in the history

  2. Let GROMACS use the newer CMake when available

    @giacomofiorin
    giacomofiorin committed Oct 22, 2024
    Configuration menu
    Copy the full SHA
    fbcbd0d View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2024

  1. Squash-merge of master branch

    @giacomofiorin
    giacomofiorin committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    1b6f9ad View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2024

  1. Squash-merge of master branch

    @giacomofiorin
    giacomofiorin committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    b76d60e View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2024

  1. Set damping=0 in gromacs regtest for torchann class. 

    Updated reference files accordingly.
    Zhang committed Nov 13, 2024
    Configuration menu
    Copy the full SHA
    1ade0dc View commit details
    Browse the repository at this point in the history