Commit Graph

608 Commits

Author SHA1 Message Date
0f9d8efe69 state in external Kokkos error message the version 3.1 or later is required 2020-04-21 12:50:27 -04:00
8c54507371 forward Kokkos library variables from CMake configuration for LAMMPS to the downloaded Kokkos library build 2020-04-16 16:46:27 -04:00
850bee2331 update KOKKOS.cmake for Kokkos 3.1. no more patch needed. 2020-04-16 15:39:53 -04:00
250e3892f8 Add defines to build Lepton with MSVC and CMake 2020-04-14 17:40:50 -04: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
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
5542ad31dc Merge branch 'master' into simplify_build_choices
# Conflicts:
#	cmake/Modules/Packages/GPU.cmake
2020-04-11 21:31:07 -04:00
b83840c2f8 Merge remote-tracking branch 'github/junghans-CMake-typo' into correct-kokkos-docs 2020-04-10 22:29:19 -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
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
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
8dfc6cdef4 Testing.cmake: some clean up 2020-04-09 07:40:17 -06: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
6c8161b2a3 cmake: remove wrongly added warning about downloading 2020-04-06 12:10:00 -06:00
f0817321f9 LAMMPSConfig.cmake.in: improve static lib case 2020-04-05 19:52:28 -06:00
d8402b6249 KIM.cmake: doesn't require MPI 2020-04-05 19:24:12 -06:00
b9c747b680 KIM.cmake: indentation 2020-04-05 19:01:17 -06:00
ac393ca38d GPU.cmake: use OpenCL imported target 2020-04-05 15:37:17 -06:00
6b199f502c cmake: add error for downloading with <=cmake-3.11 2020-04-05 15:14:30 -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
5411ae698f KSPACE.cmake: use MKL imported target 2020-04-05 14:39:13 -06:00
909b2dcff8 PYTHON.cmake: don't use PythonLibs on new cmake 2020-04-05 11:43:54 -06:00
6f5fcd66ac cmake: check flags in CMAKE_TUNE_FLAGS 2020-04-05 08:58:34 -06:00
c54bb316b8 USER-INTEL.cmake: remove duplicated injection of GNU flags 2020-04-03 14:25:43 -06:00
1daa4ce374 USER-INTEL.cmake: add_compile_options -> target_compile_options 2020-04-03 14:24:27 -06:00
b83c98db14 USER-INTEL.cmake: clean up, create imported targets 2020-04-03 09:50:28 -06:00
a2353dfc50 cmake: removed unused FindTBB.cmake 2020-04-03 09:25:09 -06:00
bdc83020f0 cmake:LAMMPS::MPI -> MPI::MPI_CXX 2020-04-03 09:24:47 -06:00
2df524d782 USER-INTEL.cmake: fix TBB_MALLOC warning 2020-04-03 07:23:03 -06:00