Commit Graph

727 Commits

Author SHA1 Message Date
2f60db4aba Merge remote-tracking branch 'upstream/develop' into upd/refactor-includes
# Conflicts:
#	cmake/Modules/Packages/ML-PACE.cmake
2022-10-15 18:07:07 +02:00
33681b5d84 WIP: update ML-PACE.cmake 2022-10-15 18:06:07 +02:00
c113253e2d Merge branch 'develop' of https://github.com/lammps/lammps into kk_update_3.7 2022-10-10 13:44:02 -07:00
1fb07387b9 Merge pull request #3479 from yury-lysogorskiy/feature/pace-al
BUGFIX: address issue with  compilation KOKKOS + pace/extrapolation
2022-10-10 14:57:13 -04:00
c7560a63e3 BUGFIX: address issue with compilation KOKKOS + pace/extrapolation (in wigner_3j.hpp) by moving #include "wigner_3j.hpp" from ace_clebsch_gordan.h to .cpp 2022-10-10 14:14:09 +02:00
7157643fdd Merge pull request #3315 from yury-lysogorskiy/feature/pace-al
ML_PACE with extrapolation grade / active learning
2022-10-05 20:16:13 -04:00
6ebd520b4f Merge branch 'develop' of github.com:lammps/lammps into kk_update_3.7 2022-10-04 14:59:48 -06:00
923caf6281 Update CMake 2022-10-04 14:14:45 -06:00
82d6c1de99 recover MDI library build with windows cross-compilation 2022-10-04 15:48:01 -04:00
2d3e4fdd9a make MDI package cmake config compatible with multi-config builders 2022-10-03 16:07:00 -04:00
5da63b1e1d Merge branch 'develop' into feature/pace-al 2022-09-27 14:01:58 -04:00
502fd0eff8 ML-PACE.cmake: update tag and MD5 hashsum
pair_pace_extrapolation.cpp: add log message about type of active set (LINEAR or FULL)
2022-09-27 17:04:16 +02:00
d34d5139cb use CMakeLists.txt file that ships with PACE library
this sets the necessary define so that the compilation hack is no longer needed
2022-09-25 17:55:11 -04:00
fc830d1397 restore original ML-PACE CMake code and update for new dependencies 2022-09-25 17:10:49 -04:00
2e3fc4c054 Merge branch 'develop' into feature/pace-al 2022-09-25 16:01:48 -04:00
c581fca39a Merge branch 'develop' into mliappy_unified 2022-09-24 03:07:31 -04:00
8d6629cb80 update MDI library to version 1.4.12 which plugs memory leaks on initialization 2022-09-18 11:04:57 -04:00
797a45232c Merge branch 'fix-pair-dump-skip' into feature/pace-al
# Conflicts:
#	src/fix_pair.cpp
2022-09-15 11:07:24 +02:00
e89899955b Merge branch 'lammps:develop' into mliappy_unified 2022-09-15 03:01:03 -06:00
1abfec066c update MDI library version to 1.4.11 2022-09-12 12:30:34 -04:00
3d7a31a59f Merge branch 'lammps:develop' into mliappy_unified 2022-09-09 14:03:43 -06:00
ffb8b8ba97 Merge branch 'develop' into mdi-tweak 2022-09-09 00:03:39 -04:00
1cd47b762b Update MDI plugin code 2022-09-09 02:28:06 +00:00
5c73befc66 upgrade to MDI 1.4.9 2022-09-07 13:57:20 -06:00
d65a6b9404 make procedure to replace downloaded potential file atomic 2022-09-02 13:00:29 -04:00
48b086b717 protect potential file download against paths with blanks 2022-09-02 08:04:11 -04:00
8a06ba415b update MDI version for CMake 2022-08-30 15:33:53 -06:00
4e5604daef Merge remote-tracking branch 'official/fix-pair-dump-skip' into feature/pace-al 2022-08-30 16:07:10 +02:00
f7b19a3d47 Merge branch 'lammps:develop' into mliappy_unified 2022-08-01 01:12:14 -06:00
2ce33c14b7 Merge pull request #3365 from pvelesko/chip_spv
Add CMake and GNU make support for HIP via CHIP-SPV
2022-07-29 06:33:55 -04:00
6a5d56994a PR comments 2022-07-27 06:25:36 +00:00
b2cdc40919 Enable CHIP-SPV support 2022-07-26 16:00:43 +00:00
48aa9cf7ba Merge pull request #3359 from akohlmey/correct-misc-mc-depend
Add package dependency handling for pair style srp/react
2022-07-21 14:39:23 -04:00
16e85a9f89 Merge pull request #3360 from akohlmey/update-linalg
Add missing functions for LATTE to linalg library
2022-07-21 13:09:56 -04:00
1f4447d1cd add USE_INTERNAL_LINALG to workaround passing BLAS/LAPACK settings to external projects 2022-07-21 05:42:23 -04:00
3c99a6b5c4 Correctly handle the dependency of pair style (and fix) srp/react on the MC package 2022-07-20 17:01:44 -04:00
5eec9da8fe make search for python libraries consistent with search for python interpreter
- apply same semantics of selecting the interpreter than the main cmake script
- make certain that we search for the interpreter first
- when searching for the library find the version matching the interpreter
- error out when library version and interpreter version does not match
2022-07-19 13:28:43 -04:00
f966b53bd2 Merge branch 'lammps:develop' into mliappy_unified 2022-07-14 02:11:45 -06:00
6e34856c77 Merge branch 'develop' into feature_pace-al 2022-07-09 15:14:20 -04:00
b8acd2e31d Merge pull request #3329 from stanmoore1/kk_update_3.6.1
Update Kokkos library in LAMMPS to v3.6.1
2022-07-04 10:43:55 -04:00
146b00c395 Merge pull request #3307 from lammps/fix-mdi-aimd-enhance
MDI package enhancements
2022-07-01 20:48:40 -04:00
cf49042fe6 Update Kokkos version in CMake 2022-07-01 14:13:08 -06:00
0157a7d0d3 make certain to switch to the expected source folder when building n2p2 lib 2022-07-01 05:49:24 -04:00
4ff683a3ca MPI may need to include multiple folders (e.g. on Ubuntu with OpenMPI) 2022-07-01 00:05:04 -04:00
e34e9aca48 improve consistency between CMake and GNU make build. Must explicitly link python when building a static mdi lib 2022-06-30 15:45:52 -04:00
56cb2f3077 update external library version and md5sum 2022-06-28 13:44:41 -04:00
80e1020648 update ML-PACE.cmake and lib/pace for v.2022.06.27 2022-06-27 18:47:09 +02:00
afd8e1d060 ML-PACE.cmake: move library pace build configuration (CMakeLists.txt) to lammps-user-pace repo
compute_pace.cpp: comment out logmessage
2022-06-27 12:37:33 +02:00
ad3387143a add crosscompiling with MPI support to plugins package 2022-06-24 06:51:29 -04:00
6273e593a3 add "package" target to support building a windows installer with NSIS 2022-06-24 01:20:33 -04:00