Commit Graph

938 Commits

Author SHA1 Message Date
6369ab230e make inclusion guard defines consistent with LAMMPS and avoid redefinition of MAX() 2020-01-30 16:56:02 -05:00
9fade740fb Fix issue with Kokkos FFT_CUFFT 2020-01-30 13:27:36 -07:00
a50563d582 Fix issue with Kokkos FFTW3 2020-01-30 13:03:15 -07:00
4ea9dea19c More Kokkos FFT refactor 2020-01-30 12:04:57 -07:00
ef30d0ed7b Add missing endif 2020-01-29 17:32:25 -07:00
f8e2543c44 Move FFT data types out of kokkos_type.h 2020-01-29 17:15:47 -07:00
1851a9f7d4 Refactor Kokkos FFT_DATA 2020-01-29 16:21:33 -07:00
0d0c5e2961 make KOKKOS and KSPACE FFT3d code more consistent and remove redundant code 2020-01-29 16:37:29 -05:00
795f2fd894 properly support threaded FFTs with MKL and document it. remove commented out FFTW2 code 2020-01-27 11:00:57 -05:00
669980388a Merge branch 'fft' of ssh://github.com/stanmoore1/lammps into fft 2020-01-24 14:33:31 -07:00
76aaf16c66 Add check for FFT_FFTW_THREADS and turn off MKL threads for now 2020-01-24 14:30:11 -07:00
df23460e18 Merge branch 'master' into fft
# Conflicts:
#	src/MAKE/OPTIONS/Makefile.kokkos_cuda_mpi
2020-01-23 00:22:38 -05:00
949d7608ba Merge pull request #1811 from brycelelbach/bug/missing_execution_space_qualifiers
Fix mismatches in CUDA execution space qualifiers between declarations and definitions.
2020-01-22 17:10:11 -05:00
5488efbc03 fix typo, update maintainer. 2020-01-22 17:00:10 -05:00
70731468df include "pppm.h" last so that necessary KOKKOS config define is available 2020-01-22 16:32:32 -05:00
70b9a060dc add missing #endif 2020-01-22 15:26:34 -05:00
9a27aa4e9e Merge branch 'master' into fft
# Conflicts:
#	src/MAKE/OPTIONS/Makefile.kokkos_cuda_mpi
2020-01-22 15:21:08 -05:00
dfda8b5ce6 fix up LMP_FFT_LIB for reporting FFT lib in use for KOKKOS with CUDA logic 2020-01-22 15:18:59 -05:00
b29ffabe56 move two_charge_force calc to occur at init, not constructor 2020-01-21 14:24:55 -07:00
2d28e9fa2e check for FFT_FFTW_THREADS may only run when CUDA is not enabled 2020-01-13 12:08:46 -05:00
206aa77532 fix one more whitespace issue 2020-01-13 11:22:42 -05:00
5198058691 fix whitespace issues in fft3d_kokkos files 2020-01-13 11:21:44 -05:00
a7720124db check and adjust FFT selection for KOKKOS depending on whether CUDA is enabled or not 2020-01-13 11:09:37 -05:00
b90c372a63 Fix mismatches in CUDA execution space qualifiers between declarations and
definitions.

Add missing `KOKKOS_INLINE_FUNCTION` to the definition of:
- `FixEnforce2DKokkos::post_force_item`
- `FixNeighHistoryKokkos::zero_partner_count_item`
- `FixNeighHistoryKokkos::pre_exchange_item`

Add missing `KOKKOS_FUNCTION` to the definition of:
- `NeighborKokkosExecute::build_Item`
- `NeighborKokkosExecute::build_Item_Ghost`
- `NeighborKokkosExecute::build_ItemSize`
2019-12-17 17:27:51 -08:00
4c9d355fc7 Fix compile error in fft3d_kokkos.cpp 2019-12-16 13:30:52 -07:00
c169e88268 Update from master 2019-12-13 16:42:05 -07:00
fba97b94cb Don't change comm flags when there is only 1 MPI rank 2019-12-10 10:10:12 -07:00
1b9214c3e9 Fix issues with CUDA-aware MPI 2019-12-09 15:21:47 -07:00
60d5244526 Remove the const of costh12, costh13 costh23 in KOKKOS class dihedral 2019-11-26 18:05:06 -05:00
54f998bde5 Patch of Dihedral class2 KOKKOS
Since the costh12, costh13, costh23 and c0 are declared as const,
a hack using const_cast is used to work around this.
2019-11-21 18:07:17 -05:00
c14ac53306 Patch of class2 dihedral in OMP and Kokkos 2019-11-21 12:28:18 -05:00
9a43229c83 disable single function for KOKKOS eam styles, since the required data is not available 2019-11-15 19:48:58 -05:00
b6b022b610 whitespace cleanup: remove trailing blanks 2019-11-03 11:03:39 -05:00
9e7ca428aa whitespace cleanup: remove (evil) tabs 2019-11-03 11:01:42 -05:00
d53b882a5a Fixed vfull tally bug in KOKKOS 2019-10-14 19:28:20 -07:00
766b8c58d8 Merge branch 'master' into fft 2019-10-08 16:51:11 +02:00
22df08f01b Merge branch 'master' of github.com:lammps/lammps into kk_snap_opt 2019-10-07 08:58:09 -06:00
ed5678d646 Merge pull request #1673 from charlessievers/lammps_gjf
Lammps fix langevin updates for gjf option
2019-10-04 10:02:46 +02:00
67a284c28a Collapse loop in compute_zi 2019-09-26 11:44:12 -06:00
36897c96bc Port more of Rahul's changes 2019-09-26 11:23:06 -06:00
e53a9aceda WIP 2019-09-25 16:15:25 -06:00
2be848e5df Remove team from compute_yi 2019-09-25 15:41:45 -06:00
c37a64fd4f Merge branch 'master' into fft 2019-09-25 15:56:49 -04:00
cf13284bf4 change fsflag in fix_langevin_kokkos 2019-09-23 13:31:50 -07:00
eba10b10e8 Merge remote-tracking branch 'origin/master' into lammps_gjf 2019-09-17 12:08:12 -07:00
7f037b6c30 some more whitespace cleanup 2019-09-17 12:05:04 -04:00
c1eff7d576 fix misplaced fix_langevin_kokkos 2019-09-14 11:02:42 -07:00
c1e7294b42 Merge branch 'master' into kk_ports 2019-09-13 12:30:53 -04:00
a948a34f8a added false positive, removed graphs from examples, updated langevin kokkos, improved diff readability in langevin 2019-09-12 16:34:15 -07:00
cd57708e85 Merge branch 'master' into fft 2019-09-12 15:51:02 -04:00