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

User interface and better solvers for GAP fitting #305

Open
wants to merge 91 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
f9421c0
Add gaptools for easier non-interactive fitting of GAPs
max-veit May 6, 2020
2e10da3
Add fit_gap script and example parameter file
max-veit May 6, 2020
6787706
Fix energy baseline not serializing properly
max-veit May 15, 2020
3715777
Fix wrong datatype in atom baseline energy dict
max-veit May 29, 2020
1b9dfaa
Merge branch 'master' into feat/gaptools
max-veit May 29, 2020
3698c35
Merge remote-tracking branch 'origin/master' into feat/gaptools
max-veit Sep 30, 2020
ac8eb1f
Update gaptools sparsification function
max-veit Dec 2, 2020
d2514b9
Add select-subset option to gap fit script
max-veit Dec 2, 2020
12e1b3a
Merge remote-tracking branch 'origin/master' into feat/gaptools
max-veit Dec 2, 2020
994f2eb
Reformat Python files. It's... not terrible.
max-veit Dec 2, 2020
f5eccae
God damn it #294
max-veit Dec 2, 2020
73f98ac
Make fit_gap.py executable as script
max-veit Dec 4, 2020
093fdf1
Add option to specify output filename
max-veit Dec 4, 2020
154ee47
Add option for fit_gap.py to fit without gradients
max-veit Dec 4, 2020
3297de1
Nevermind, you do need gradients for the source points (eventually)
max-veit Dec 4, 2020
f68c5a1
Created an empty (and broken) i-PI calculator
ceriottm Dec 7, 2020
26e8eef
Merge branch 'feat/gaptools' of github.com:cosmo-epfl/librascal into …
ceriottm Dec 7, 2020
2923afe
Added instructions for making a ipi calculator
ceriottm Dec 7, 2020
574fac1
Revert "Added instructions for making a ipi calculator"
ceriottm Dec 7, 2020
d1cc4d4
Revert "Revert "Added instructions for making a ipi calculator""
ceriottm Dec 7, 2020
f59392f
Revert "Revert "Revert "Added instructions for making a ipi calculato…
ceriottm Dec 7, 2020
9ae7376
Revert "Created an empty (and broken) i-PI calculator"
ceriottm Dec 7, 2020
604535f
Add annotations (with basic units) to gap model output file
max-veit Dec 11, 2020
a9c1f3c
Remove another loop-inducing __init__ import
max-veit Dec 11, 2020
768527b
Fix broken srftime() call
max-veit Mar 24, 2021
14ed599
Merge branch 'master' into feat/gaptools
max-veit Mar 25, 2021
2fb933e
Make gap_fit respect working directory, now save final model outside it
max-veit Mar 25, 2021
9289052
Merge branch 'master' into feat/gaptools
max-veit Jun 14, 2021
95d4f64
Use argparse to accept (some) command-line arguments
max-veit Jun 14, 2021
3c69ee1
Move some of the more decoupled stuff into functions
max-veit Jun 14, 2021
b7b00ce
Split feature calculation and sparsification
max-veit Jun 23, 2021
6f7fe57
Add function to transform sparse selection into librascal format
max-veit Jun 24, 2021
e9c469b
Added (untested) RKHS solver
ceriottm May 25, 2021
b9f7375
Tried and tested RKHS solver (at least on zundel example)
ceriottm May 25, 2021
90992e6
Mini-cleaning
ceriottm May 25, 2021
3c8f23f
Better solver for the RKHS mode
ceriottm May 25, 2021
a1ec194
Better comments
ceriottm May 26, 2021
ab9670b
Black
ceriottm May 26, 2021
cb55cfc
Added a "QR" mode for the example
ceriottm May 27, 2021
8b23d39
Added missing link
ceriottm Jun 4, 2021
fabe4e7
black
ceriottm Jun 10, 2021
afc70fb
Added example file for water monomer
ceriottm Jun 11, 2021
312d759
A class for sparse GPR solvers that can be also called outside the tr…
ceriottm Jun 11, 2021
edbd665
Fix clang-format version parsing
Luthaf May 31, 2021
38051e9
Send an error message both at configure and build time if clang-forma…
Luthaf Jun 3, 2021
14767bd
Fix gradients with optimal_basis GTOs (#365)
ceriottm Jun 17, 2021
de709dd
Convert fit_gap_simple() to use SparseGPRSolver
max-veit Jun 24, 2021
2a69081
Fixed call to solver
ceriottm Jun 24, 2021
baa31a0
Minimal implementation of per-atom training and prediction
ceriottm Jun 26, 2021
0d926bc
Fixed atom-based learning when selecting a subset of the centers
ceriottm Jun 26, 2021
3d2dbfd
weirdly the RKHS-QR solver had an obvious bug, now solved
ceriottm Jun 29, 2021
c7bb5d0
add python representation object storage to be closer to cpp represen…
agoscinski Jul 6, 2021
0aae1fb
add python kernel object storage to be equal to the cpp kernel object
agoscinski Jul 6, 2021
1c9f076
revert last two commits to 3d2dbfd373b560b7a8211eec17a7f59ac61872c4
agoscinski Jul 6, 2021
099710e
Accept None as an argument for the atomic baseline
ceriottm Jul 11, 2021
1fb4eff
Start updating example notebook for gaptools
max-veit Jul 14, 2021
54ab1db
Finish updating zundel i-PI example to use gaptools
max-veit Jul 15, 2021
a2c5cf9
Switch compute_kernels() to computing gradients one at a time
max-veit Aug 17, 2021
2ebf98e
Fix off-by-one error in kernel index extraction
max-veit Aug 17, 2021
b9809c8
Notebook merging hell
ceriottm Aug 20, 2021
38d3a82
Merge branch 'master' into feat/gaptools
ceriottm Aug 20, 2021
d6e071f
gitattributes for nbstripout had got lost
ceriottm Aug 20, 2021
3829716
Restore zundel_i-PI.ipynb
max-veit Aug 20, 2021
7bc9ff2
int lakmé
max-veit Aug 20, 2021
3ceb5af
Fix nasty aliasing bug in fit_gap_simple()
max-veit Aug 24, 2021
e7aeed5
SparseSolver should have a predict() method, not transform()
ceriottm Sep 5, 2021
fa65a5d
Pretty...
ceriottm Sep 5, 2021
796a122
Steps towards sklearn-ifiying SparseGPRSolver
ceriottm Sep 10, 2021
776b7ca
Merge remote-tracking branch 'origin/master' into feat/gaptools
felixmusil Oct 15, 2021
ac2329e
Eliminate duplicate function and update fit_gap script
max-veit Jan 20, 2022
1feb82d
Merge remote-tracking branch 'origin/master' into feat/gaptools
max-veit Jan 20, 2022
3fd08e4
Fix zundel example notebook
max-veit Jan 21, 2022
3d4506a
Start a minimal KRR wrapper independent of librascal reps
max-veit Feb 3, 2022
abd1740
Start implementation of direct matrix kernel emulating the old interface
max-veit Feb 8, 2022
33a8e7b
Begin making Kernel emulator compatible with KRR class
max-veit Feb 10, 2022
5dd9ff7
Resolve variable name ambiguity in fit_gap_simple()
max-veit Jun 1, 2022
23aa30c
Add capability for structure-wise kernels to KernelDirect
max-veit Jun 1, 2022
e8bb6d2
Trial implementation of gradient kernel with explicit features
max-veit Jun 3, 2022
59974d3
Merge branch 'feat/gaptools' of https://github.com/cosmo-epfl/librasc…
felixmusil Jun 30, 2022
646177e
Enable using Filter utilities on (wrapped) ASE Atoms lists
max-veit Jul 6, 2022
e2377da
Temp-fix compilation on gcc 11
max-veit Jul 6, 2022
8d04e8e
Try to fix failing builds
max-veit Jul 8, 2022
ea9d108
...and fix the Python formatter, which also broke somehow?
max-veit Jul 8, 2022
93ec13d
Some reformatting due to newer Black version
max-veit Jul 8, 2022
0246b94
Remove -march=native from default flags
Luthaf Apr 4, 2022
95aedf9
Update Filter test with new minimum number of features
max-veit Jul 11, 2022
d6f384b
Another reformat due to Black version bump
max-veit Jul 11, 2022
aac9643
Update example notebook with parameter name change
max-veit Jul 11, 2022
767b57b
Enable gradient kernel with explicit features (and their gradients)
max-veit Jul 11, 2022
5a8a5a6
Complete feature-sparsification function for plain feature matrices
max-veit Aug 26, 2022
06679aa
Feature-matrix selection utility now working
max-veit Aug 26, 2022
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 .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
*.ipynb diff=ipynb

examples/optimized_radial_basis_functions.ipynb filter= diff=
examples/zundel_i-PI.ipynb filter= diff=
14 changes: 1 addition & 13 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ option(BUILD_SANDBOX "If on, builds the sandbox" OFF)

set(INSTALL_PATH "" CACHE STRING "Path to install the libraries")

SET(TYPE_ARCHITECTURE "native" CACHE STRING
"Choose the type of architecture to compile to in release mode."
)

########## COMPILATION FLAGS ##########
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Weffc++ -Wno-non-virtual-dtor")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra")
Expand All @@ -57,14 +53,6 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR

set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Og")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Og")

# Add -march=${TYPE_ARCHITECTURE} (-march=native by default) to the release
# build flags
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -march=${TYPE_ARCHITECTURE}")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -march=${TYPE_ARCHITECTURE}")

set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -march=${TYPE_ARCHITECTURE}")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -march=${TYPE_ARCHITECTURE}")
endif()

########## START CONFIGURATION ##########
Expand All @@ -80,7 +68,7 @@ else()
endif()

add_external_package(wigxjpf VERSION 1.9 CONFIG)
add_external_package(Eigen3 VERSION 3.3.4 CONFIG)
add_external_package(Eigen3 IGNORE_SYSTEM VERSION 3.3.4 CONFIG)

if(BUILD_BENCHMARKS)
find_package(Threads REQUIRED)
Expand Down
Loading