Commit Graph

829 Commits

Author SHA1 Message Date
bc3fe80b28 Merge pull request #1997 from giacomofiorin/lepton-windows-defines
Defines to build and link the Lepton library with MSVC
2020-04-15 15:56:48 -04:00
f5733ccd75 Merge pull request #1978 from evoyiatzis/class2_cs
core-shell version of pair_style lj/class2/coul/long
2020-04-14 22:59:46 -04:00
567147cf78 rename DEFAULT_PACKAGES to STANDARD_PACKAGES and ACCEL_PACKAGES to SUFFIX_PACKAGES for clarity 2020-04-14 22:37:39 -04:00
e5842e9236 must handle CORESHELL as ACCEL_PACKAGE because of the dependency tracking 2020-04-14 22:34:07 -04:00
8daf0c56d2 Merge pull request #1996 from lammps/junghans_more_cmake_cleanup
cmake: improve exported target
2020-04-14 21:25:12 -04:00
0afa9e60f9 Fix installation of lammps.py with CMake
In CMake 3.10 the PythonInterp module defined PYTHON_EXECUTABLE.  Since CMake
3.12 the Python module defines Python_EXECUTABLE.

Since the rest of the code was using PYTHON_EXECUTABLE and expecting it to be
defined, no matter which version, in newer versions of CMake this would lead to
lammps.py not being installed at all.

This commit changes the LAMMPS CMake files to use the newer variable name and
sets Python_EXECUTABLE in older versions if needed.
2020-04-14 17:45:49 -04:00
250e3892f8 Add defines to build Lepton with MSVC and CMake 2020-04-14 17:40:50 -04:00
f5eb1c5b9d cmake: OpenMP dep is not public 2020-04-14 15:15:16 -06:00
dcbf9f7d17 cmake: improve exported target 2020-04-14 12:16:28 -06:00
7d71d5bfb3 Merge pull request #1981 from akohlmey/simplify_build_choices
Simplify choices for building LAMMPS and add some howtos for CMake and getting stack traces
2020-04-14 10:57:54 -04:00
4ded155cf2 simplify directory creation and copying of static content 2020-04-14 00:31:45 -04:00
872f15f2be remove no longer needed include 2020-04-14 00:30:53 -04:00
a3c5751faf BUILD_LIB variable has been removed from CMake 2020-04-13 23:40:36 -04:00
e09349bc91 update CMake documentation build for recent changes to the html doc build procedure 2020-04-13 22:41:49 -04:00
c6fe20d93b remove obsoleted file 2020-04-13 20:35:06 -04:00
74143a3d89 Merge branch 'master' into simplify_build_choices 2020-04-13 11:02:35 -04:00
4abff7b4d3 Merge pull request #1986 from akohlmey/correct-kokkos-docs
Update docs and CMake scripts for Kokkos 3.0+
2020-04-13 11:01:26 -04:00
8b1c6cb279 Merge branch 'omp4-compat' into correct-kokkos-docs 2020-04-12 01:44:47 -04:00
5542ad31dc Merge branch 'master' into simplify_build_choices
# Conflicts:
#	cmake/Modules/Packages/GPU.cmake
2020-04-11 21:31:07 -04:00
3fa7265ff8 modernize CMake script code and add version tests for Clang and Intel to switch to OpenMP4 semantics 2020-04-11 18:35:37 -04:00
b83840c2f8 Merge remote-tracking branch 'github/junghans-CMake-typo' into correct-kokkos-docs 2020-04-10 22:29:19 -04:00
9bf31a66fd select compute capability 5.0 as default for Kokkos+CUDA preset. 2020-04-10 22:28:21 -04:00
340a2e719d be verbose about automatically enabling Kokkos_ENABLE_CUDA_LAMBDA 2020-04-10 22:27:42 -04:00
d2c4ade697 Add HIP_USE_DEVICE_SORT CMake option 2020-04-10 18:22:43 -04:00
4f8a1583b9 Restore --arch line removed during debugging 2020-04-10 14:25:46 -04:00
195e453d17 Add HIP configuration output 2020-04-10 14:24:26 -04:00
b7a2b375c6 Add includes and linked libs for HIP_PLATFORM=nvcc
Do not set CMAKE_CXX_COMPILER=hipcc in the NVCC case since it causes
all sorts of problems. Instead we use the regular host compiler and
set the necessary include and link paths.
2020-04-10 12:45:39 -04:00
df2ddcc98a provide 3 presets for KOKKOS compilation: serial, openmp, cuda 2020-04-10 12:16:56 -04:00
28379e145f set using C++11 w/o extensions globally. move KOKKOS only checks to KOKKOS.cmake 2020-04-10 12:16:24 -04:00
469a4f15b7 some tweaks to simplify building the KOKKOS package and to enforce consistent behavior 2020-04-09 22:51:52 -04:00
e39faf4f48 handle change in capitalization of Kokkos variables after upgrade to v3.0 2020-04-09 22:30:48 -04:00
2becc27aa4 remove a few more BUILD_LIB uses 2020-04-09 21:24:00 -04:00
16fa45fef3 Merge remote-tracking branch 'github/junghans-CMake-typo' into simplify_build_choices 2020-04-09 17:59:53 -04:00
3c0dae3bc5 cmake: fix install error for shared libs 2020-04-09 14:05:48 -06:00
bd7a906838 Merge remote-tracking branch 'github/junghans-CMake-typo' into simplify_build_choices 2020-04-09 15:27:30 -04:00
874ef6afc1 cmake: add error when trying to install downloaded libs 2020-04-09 12:36:57 -06:00
6381940b9a Attempt to get ROCm CUDA working with CMake 2020-04-09 13:53:41 -04:00
07d31f4643 remove LAMMPS_LIB_SUFFIX variable and use LAMMPS_MACHINE instead.
we are now always building the executable and the library and thus they should have a consistent suffix or none.
2020-04-09 10:42:11 -04:00
69a38115ce Merge remote-tracking branch 'github/junghans-CMake-typo' into simplify_build_choices 2020-04-09 09:44:12 -04:00
8dfc6cdef4 Testing.cmake: some clean up 2020-04-09 07:40:17 -06:00
d6aede2549 LAMMPSConfig.cmake: fixed for disabled PKG_SPACE 2020-04-09 07:27:27 -06:00
32eeffe84d Merge remote-tracking branch 'github/junghans-CMake-typo' into simplify_build_choices 2020-04-09 08:57:42 -04:00
ed0971d663 cmake: fix a typo 2020-04-09 05:44:57 -06:00
0fa6472c51 Merge branch 'master' into omp4-compat 2020-04-08 23:13:05 -04:00
f3a280a9f4 fix typo 2020-04-08 18:49:16 -04:00
e5b521e011 remove BUILD_EXE and BUILD_LIB options from CMake files. we always build both. 2020-04-08 18:31:46 -04:00
1c94415d1f Remove whitespace 2020-04-08 13:57:12 -04:00
438ee4d75b Merge remote-tracking branch 'origin/master' into gpu_hip 2020-04-08 13:49:41 -04:00
459c1bbf63 Merge branch 'master' into cmake_clean_up 2020-04-07 16:17:33 -04:00
4b6dcb3452 LAMMPSConfig.cmake.in: add support for some more packages 2020-04-06 14:51:44 -06:00