Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
8f8f64a
add minimal pair_mace (only the required pure virtual functions).
wcwitt Aug 6, 2022
5875569
enable cmake build with -DPKG_ML-MACE=ON.
wcwitt Aug 6, 2022
4607e22
add basic compute functionality to pair_mace.
wcwitt Aug 20, 2022
e7955a9
Merge branch 'develop' into mace
wcwitt Aug 20, 2022
9d8991e
various things.
wcwitt Oct 4, 2022
be70511
save global energy.
wcwitt Oct 4, 2022
b9207fa
more progress, including reading site energies.
wcwitt Oct 11, 2022
637f176
tidy.
wcwitt Oct 11, 2022
51329f4
get cell info from lammps.
wcwitt Oct 11, 2022
19625a3
add num_interactions and more.
wcwitt Nov 2, 2022
d97f7c9
several improvements.
wcwitt Nov 3, 2022
f611691
virials now working in serial.
wcwitt Nov 18, 2022
1714857
update virials for MPI.
wcwitt Nov 20, 2022
f5d7251
grow periodic table.
wcwitt Nov 20, 2022
67e96ba
update periodic_table.
wcwitt Nov 25, 2022
e7fc9d8
Merge branch 'develop' into mace
wcwitt Dec 9, 2022
3bd488c
add ghostneigh=1 to pair_mace construction.
wcwitt Dec 9, 2022
d212e47
remove todo comments.
wcwitt Dec 11, 2022
577b043
Revert "add ghostneigh=1 to pair_mace construction." We don't set cut…
wcwitt Dec 11, 2022
42c459f
add no_domain_decomposition option and other tweaks.
wcwitt Dec 20, 2022
d60bd8a
restore approach for determining effective interaction.
wcwitt Jan 12, 2023
de04285
Merge branch 'develop' into mace
wcwitt Jan 12, 2023
588af66
Merge branch 'lammps:develop' into mace
wcwitt Jan 15, 2023
6fe7bd8
gpu work.
wcwitt Feb 23, 2023
0246fad
first steps.
wcwitt Feb 23, 2023
cc3c37d
Merge remote-tracking branch 'upstream/develop' into mace-kokkos
wcwitt Feb 23, 2023
4ee0874
fix virial ordering as diagnosed by @imagdau.
wcwitt Feb 27, 2023
5290e11
wip.
wcwitt Feb 28, 2023
3d74fc0
Merge branch 'mace' into mace-gpu
wcwitt Feb 28, 2023
58a06e7
Merge branch 'mace' into mace-kokkos
wcwitt Feb 28, 2023
4239331
wip.
wcwitt Mar 10, 2023
1fafa1f
wip.
wcwitt Mar 10, 2023
d0f1c8a
wip.
wcwitt Mar 13, 2023
a5d28f5
Merge branch 'mace-gpu' into mace-kokkos
wcwitt Mar 13, 2023
1c59b0a
wip.
wcwitt Mar 13, 2023
b44cfb0
Merge remote-tracking branch 'upstream/develop' into mace-kokkos
wcwitt Mar 13, 2023
cbcc05c
wip.
wcwitt Mar 14, 2023
e7ef916
kokkos.
wcwitt Mar 30, 2023
ae8d33b
move some things out of compute.
wcwitt Apr 21, 2023
11150d5
add labels to kokkos kernels.
wcwitt Apr 26, 2023
4195b18
improvements.
wcwitt May 30, 2023
2156943
Merge branch 'develop' into mace
wcwitt May 30, 2023
a02e221
Merge branch 'develop' into mace-kokkos
wcwitt May 30, 2023
eb867b1
mergefix.
wcwitt May 30, 2023
22eb836
delete debug code.
wcwitt May 30, 2023
7d0543f
tidy.
wcwitt May 30, 2023
6b4f393
Merge branch 'mace-kokkos' into mace
wcwitt May 30, 2023
f96283e
mergefix.
wcwitt May 31, 2023
1350adb
detect gpu automatically.
wcwitt May 31, 2023
38500ff
bugfix.
wcwitt Jun 2, 2023
5dbc52d
add cuda message.
wcwitt Jun 7, 2023
4995a40
update for domain decomposition with new lammps wrapper.
wcwitt Jul 10, 2023
8b32438
same update for non-kokkos style.
wcwitt Jul 10, 2023
dd85099
enable multi-node.
wcwitt Jul 10, 2023
11ef3c4
check pair_style input.
wcwitt Nov 20, 2023
344780a
bugfix affecting cases when lammps has fewer atom types than mace.
wcwitt Nov 20, 2023
f41a99e
delete outdated.
wcwitt Nov 20, 2023
2de384d
print more info about type mapping.
wcwitt Nov 20, 2023
9988368
bugfix.
wcwitt Dec 10, 2023
184b6fd
remove hardcoded c++14. better to set at command line.
wcwitt Feb 1, 2024
7b5107b
Merge branch 'mace' into mace-develop
wcwitt Oct 28, 2024
2a22b69
Add domain header.
wcwitt Oct 28, 2024
f51963a
Change item to template item.
wcwitt Oct 28, 2024
e55b321
Rely on GPU pinning externally
WardLT Apr 24, 2025
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
3 changes: 2 additions & 1 deletion cmake/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ set(STANDARD_PACKAGES
MISC
ML-HDNNP
ML-IAP
ML-MACE
ML-PACE
ML-POD
ML-QUIP
Expand Down Expand Up @@ -580,7 +581,7 @@ else()
endif()

foreach(PKG_WITH_INCL KSPACE PYTHON ML-IAP VORONOI COLVARS ML-HDNNP MDI MOLFILE NETCDF
PLUMED QMMM ML-QUIP SCAFACOS MACHDYN VTK KIM COMPRESS ML-PACE LEPTON RHEO)
PLUMED QMMM ML-QUIP SCAFACOS MACHDYN VTK KIM COMPRESS ML-PACE ML-MACE LEPTON RHEO)
if(PKG_${PKG_WITH_INCL})
include(Packages/${PKG_WITH_INCL})
endif()
Expand Down
6 changes: 6 additions & 0 deletions cmake/Modules/Packages/ML-MACE.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
cmake_minimum_required(VERSION 3.0 FATAL_ERROR)

find_package(Torch REQUIRED)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORCH_CXX_FLAGS}")

target_link_libraries(lammps PRIVATE "${TORCH_LIBRARIES}")
Loading