Commit Graph

778 Commits

Author SHA1 Message Date
758a27c1e7 update MPI detection and handling of MPI to not automatically assume that a windows target means cross-compiling 2020-04-25 22:06:36 -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
dcbf9f7d17 cmake: improve exported target 2020-04-14 12:16:28 -06: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
d2c4ade697 Add HIP_USE_DEVICE_SORT CMake option 2020-04-10 18:22:43 -04:00
195e453d17 Add HIP configuration output 2020-04-10 14:24:26 -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
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
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
d568fea7c3 cmake: derive LAMMPS_API_DEFINES from lammps target properties 2020-04-05 18:58:16 -06:00
1b87ce04ee cmake: fix a typo 2020-04-05 15:40:15 -06:00
a77166379b cmake: remove old comment 2020-04-05 15:23:23 -06:00
9003553384 cmake: move OpenCL handling under Windows in GPU.cmake 2020-04-05 15:12:40 -06:00
e18439f387 cmake: make more include files consistent 2020-04-05 15:03:25 -06:00
1988a2a725 cmake: make USER-H5MD.cmake consistent 2020-04-05 14:58:54 -06:00
9aa6d04997 cmake: move if(PKG_) out of cmake file 2020-04-05 14:57:06 -06:00
e8317b2f6b cmake: don't use PythonInterp on new cmake 2020-04-05 11:53:43 -06:00
6f5fcd66ac cmake: check flags in CMAKE_TUNE_FLAGS 2020-04-05 08:58:34 -06:00
5c0e8a6b0d cmake: add options to summary 2020-04-03 15:24:11 -06:00
1daa4ce374 USER-INTEL.cmake: add_compile_options -> target_compile_options 2020-04-03 14:24:27 -06:00
9df26bca55 cmake: export lmp executable as well 2020-04-03 13:39:28 -06:00
cab260f3ab cmake: fix mpi default on Windows 2020-04-03 09:57:14 -06:00
bdc83020f0 cmake:LAMMPS::MPI -> MPI::MPI_CXX 2020-04-03 09:24:47 -06:00
b645800537 cmake: mark MPI::MPI_CXX global 2020-03-31 19:59:33 -06:00
099880e91b cmake: add missing size defines 2020-03-31 16:35:28 -06:00
53ce24fac1 cmake: remove LAMMPS_USE_MPI4WIN hacks 2020-03-31 16:12:16 -06:00
05ecda3748 cmake: try to fix MPI4WIN build 2020-03-31 15:06:40 -06:00
119ba61c09 cmake: fix MPI linkage 2020-03-31 08:23:59 -06:00
3806222e04 make configuations summary more consistent, recover defines 2020-03-30 10:25:04 -04:00
fa2df0df0f cmake: clean up header install 2020-03-28 15:42:51 -06:00
b331b2db10 cmake: make incl. dir work under windows as well 2020-03-28 09:30:02 -06:00
4aadb554a3 cmake: replace incl. dir hack by even better hack 2020-03-28 08:43:13 -06:00
fb9f31580c cmake: install mpi.h in mpi/ subdir 2020-03-28 08:08:26 -06:00
635cca1e8d cmake: add info.h to install 2020-03-28 07:39:30 -06:00
c4440be392 there are no more fortran sources in "simple" package libraries 2020-03-27 22:12:40 -04:00