Merge remote branch 'lammps-ro/master' into lammps-kokkos
895ca766eeec
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 2 2014, 10:45.

Description

Merge remote branch 'lammps-ro/master' into lammps-kokkos

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/package.txt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 2 2014, 10:45

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS4e3bc9d059a9: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12053 f3b2605a-c512-4ea7…
rLAMMPS41bb9c5ad509: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS895ca766eeec: Merge remote branch 'lammps-ro/master' into lammps-kokkos (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 2 2014, 10:45

Merged Changes

Commit	Author	Details	Committed
4e3bc9d059a9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12053 f3b2605a-c512-4ea7…	May 30 2014
2e521b2a6756	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12050 f3b2605a-c512-4ea7…	May 30 2014
e7150656c4e6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12049 f3b2605a-c512-4ea7…	May 30 2014
85d9a319d729	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12048 f3b2605a-c512-4ea7…	May 30 2014
0fc38af7a33f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12047 f3b2605a-c512-4ea7…	May 30 2014
64762996c133	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12043 f3b2605a-c512-4ea7…	May 30 2014
30361f0dfaea	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12042 f3b2605a-c512-4ea7…	May 30 2014
3cfef7320853	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12041 f3b2605a-c512-4ea7…	May 30 2014
3545d44d0d16	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12040 f3b2605a-c512-4ea7…	May 30 2014

Changes (236)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		bench/GPU/README
M		doc/Manual.html
M		doc/Manual.txt
M		doc/Section_accelerate.html
M		doc/Section_accelerate.txt
M		doc/Section_commands.html
M		doc/Section_commands.txt
M		doc/Section_packages.html
M		doc/Section_packages.txt
M		doc/Section_start.html
M		doc/Section_start.txt
M		doc/atom_style.html
M		doc/atom_style.txt
M		doc/fix_nve.html
M		doc/fix_nve.txt
M		doc/fix_rigid.html
M		doc/fix_rigid.txt
M		doc/package.html
M		doc/package.txt
M		doc/pair_lj.html
M		doc/pair_lj.txt
M		doc/pair_table.html
M		doc/pair_table.txt
M		doc/suffix.html
M		doc/suffix.txt
M		doc/velocity.html
M		doc/velocity.txt
M		examples/README
A		examples/gpu/README
A	(dir)	examples/kokkos/
A		examples/kokkos/README
A		examples/kokkos/in.kokkos
A		examples/kokkos/in.kokkos.half
A		examples/kokkos/log.kokkos.1Feb14.cpu.1
A		examples/kokkos/log.kokkos.1Feb14.cpu.4
A		examples/kokkos/log.kokkos.1Feb14.gpu.1
A		examples/kokkos/log.kokkos.1Feb14.gpu.2
A		examples/kokkos/log.kokkos.1Feb14.mpionly.1
A		examples/kokkos/log.kokkos.1Feb14.mpionly.4
M		lib/README
A	(dir)	lib/kokkos/
A		lib/kokkos/Makefile.lammps
A		lib/kokkos/README
A	(dir)	lib/kokkos/TPL/
A	(dir)	lib/kokkos/TPL/cub/
A	(dir)	lib/kokkos/TPL/cub/block/
A		lib/kokkos/TPL/cub/block/block_discontinuity.cuh
A		lib/kokkos/TPL/cub/block/block_exchange.cuh
A		lib/kokkos/TPL/cub/block/block_histogram.cuh
A		lib/kokkos/TPL/cub/block/block_load.cuh
A		lib/kokkos/TPL/cub/block/block_radix_rank.cuh
A		lib/kokkos/TPL/cub/block/block_radix_sort.cuh
A		lib/kokkos/TPL/cub/block/block_raking_layout.cuh
A		lib/kokkos/TPL/cub/block/block_reduce.cuh
A		lib/kokkos/TPL/cub/block/block_scan.cuh
A		lib/kokkos/TPL/cub/block/block_store.cuh
A	(dir)	lib/kokkos/TPL/cub/block/specializations/
A		lib/kokkos/TPL/cub/block/specializations/block_histogram_atomic.cuh
A		lib/kokkos/TPL/cub/block/specializations/block_histogram_sort.cuh
A		lib/kokkos/TPL/cub/block/specializations/block_reduce_raking.cuh
A		lib/kokkos/TPL/cub/block/specializations/block_reduce_warp_reductions.cuh
A		lib/kokkos/TPL/cub/block/specializations/block_scan_raking.cuh
A		lib/kokkos/TPL/cub/block/specializations/block_scan_warp_scans.cuh
A		lib/kokkos/TPL/cub/cub.cuh
A	(dir)	lib/kokkos/TPL/cub/device/
A	(dir)	lib/kokkos/TPL/cub/device/block/
A		lib/kokkos/TPL/cub/device/block/block_histo_tiles.cuh
A		lib/kokkos/TPL/cub/device/block/block_partition_tiles.cuh
A		lib/kokkos/TPL/cub/device/block/block_radix_sort_downsweep_tiles.cuh
A		lib/kokkos/TPL/cub/device/block/block_radix_sort_upsweep_tiles.cuh
A		lib/kokkos/TPL/cub/device/block/block_reduce_by_key_tiles.cuh
A		lib/kokkos/TPL/cub/device/block/block_reduce_tiles.cuh
A		lib/kokkos/TPL/cub/device/block/block_scan_tiles.cuh
A		lib/kokkos/TPL/cub/device/block/scan_tiles_types.cuh
A	(dir)	lib/kokkos/TPL/cub/device/block/specializations/
A		lib/kokkos/TPL/cub/device/block/specializations/block_histo_tiles_gatomic.cuh
A		lib/kokkos/TPL/cub/device/block/specializations/block_histo_tiles_satomic.cuh
A		lib/kokkos/TPL/cub/device/block/specializations/block_histo_tiles_sort.cuh
A		lib/kokkos/TPL/cub/device/device_histogram.cuh
A		lib/kokkos/TPL/cub/device/device_radix_sort.cuh
A		lib/kokkos/TPL/cub/device/device_reduce.cuh
A		lib/kokkos/TPL/cub/device/device_reduce_by_key.cuh
A		lib/kokkos/TPL/cub/device/device_reorder.cuh
A		lib/kokkos/TPL/cub/device/device_scan.cuh
A	(dir)	lib/kokkos/TPL/cub/grid/
A		lib/kokkos/TPL/cub/grid/grid_barrier.cuh
A		lib/kokkos/TPL/cub/grid/grid_even_share.cuh
A		lib/kokkos/TPL/cub/grid/grid_mapping.cuh
A		lib/kokkos/TPL/cub/grid/grid_queue.cuh
A	(dir)	lib/kokkos/TPL/cub/host/
A		lib/kokkos/TPL/cub/host/spinlock.cuh
A	(dir)	lib/kokkos/TPL/cub/thread/
A		lib/kokkos/TPL/cub/thread/thread_load.cuh
A		lib/kokkos/TPL/cub/thread/thread_operators.cuh
A		lib/kokkos/TPL/cub/thread/thread_reduce.cuh
A		lib/kokkos/TPL/cub/thread/thread_scan.cuh
A		lib/kokkos/TPL/cub/thread/thread_store.cuh
A		lib/kokkos/TPL/cub/util_allocator.cuh
A		lib/kokkos/TPL/cub/util_arch.cuh
A		lib/kokkos/TPL/cub/util_debug.cuh
A		lib/kokkos/TPL/cub/util_device.cuh
A		lib/kokkos/TPL/cub/util_iterator.cuh
A		lib/kokkos/TPL/cub/util_macro.cuh
A		lib/kokkos/TPL/cub/util_namespace.cuh
A		lib/kokkos/TPL/cub/util_ptx.cuh
A		lib/kokkos/TPL/cub/util_type.cuh
A		lib/kokkos/TPL/cub/util_vector.cuh
A	(dir)	lib/kokkos/TPL/cub/warp/
A	(dir)	lib/kokkos/TPL/cub/warp/specializations/
A		lib/kokkos/TPL/cub/warp/specializations/warp_reduce_shfl.cuh
A		lib/kokkos/TPL/cub/warp/specializations/warp_reduce_smem.cuh
A		lib/kokkos/TPL/cub/warp/specializations/warp_scan_shfl.cuh
A		lib/kokkos/TPL/cub/warp/specializations/warp_scan_smem.cuh
A		lib/kokkos/TPL/cub/warp/warp_reduce.cuh
A		lib/kokkos/TPL/cub/warp/warp_scan.cuh
A	(dir)	lib/kokkos/containers/
A	(dir)	lib/kokkos/containers/src/
A		lib/kokkos/containers/src/Kokkos_Bitset.hpp
A		lib/kokkos/containers/src/Kokkos_DualView.hpp
A		lib/kokkos/containers/src/Kokkos_Functional.hpp
A		lib/kokkos/containers/src/Kokkos_StaticCrsGraph.hpp
A		lib/kokkos/containers/src/Kokkos_UnorderedMap.hpp
A		lib/kokkos/containers/src/Kokkos_Vector.hpp
A	(dir)	lib/kokkos/containers/src/impl/
A		lib/kokkos/containers/src/impl/Kokkos_Bitset_impl.hpp
A		lib/kokkos/containers/src/impl/Kokkos_Functional_impl.hpp
A		lib/kokkos/containers/src/impl/Kokkos_StaticCrsGraph_factory.hpp
A		lib/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.cpp
A		lib/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.hpp
A	(dir)	lib/kokkos/core/
A	(dir)	lib/kokkos/core/src/
A	(dir)	lib/kokkos/core/src/Cuda/
A		lib/kokkos/core/src/Cuda/Kokkos_CudaExec.hpp
A		lib/kokkos/core/src/Cuda/Kokkos_CudaSpace.cu
A		lib/kokkos/core/src/Cuda/Kokkos_Cuda_Impl.cu
A		lib/kokkos/core/src/Cuda/Kokkos_Cuda_Internal.hpp
A		lib/kokkos/core/src/Cuda/Kokkos_Cuda_Parallel.hpp
A		lib/kokkos/core/src/Cuda/Kokkos_Cuda_ReduceScan.hpp
A		lib/kokkos/core/src/Cuda/Kokkos_Cuda_Vectorization.hpp
A		lib/kokkos/core/src/Cuda/Kokkos_Cuda_View.hpp
A		lib/kokkos/core/src/Cuda/Kokkos_Cuda_abort.hpp
A		lib/kokkos/core/src/KokkosCore_config.h
A		lib/kokkos/core/src/Kokkos_Atomic.hpp
A		lib/kokkos/core/src/Kokkos_CrsArray.hpp
A		lib/kokkos/core/src/Kokkos_Cuda.hpp
A		lib/kokkos/core/src/Kokkos_CudaSpace.hpp
A		lib/kokkos/core/src/Kokkos_CudaTypes.hpp
A		lib/kokkos/core/src/Kokkos_HostSpace.hpp
A		lib/kokkos/core/src/Kokkos_Layout.hpp
A		lib/kokkos/core/src/Kokkos_Macros.hpp
A		lib/kokkos/core/src/Kokkos_MemoryTraits.hpp
A		lib/kokkos/core/src/Kokkos_OpenMP.hpp
A		lib/kokkos/core/src/Kokkos_Pair.hpp
A		lib/kokkos/core/src/Kokkos_Parallel.hpp
A		lib/kokkos/core/src/Kokkos_ParallelReduce.hpp
A		lib/kokkos/core/src/Kokkos_Serial.hpp
A		lib/kokkos/core/src/Kokkos_Threads.hpp
A		lib/kokkos/core/src/Kokkos_Vectorization.hpp
A		lib/kokkos/core/src/Kokkos_View.hpp
A		lib/kokkos/core/src/Kokkos_hwloc.hpp
A	(dir)	lib/kokkos/core/src/OpenMP/
A		lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Parallel.hpp
A		lib/kokkos/core/src/OpenMP/Kokkos_OpenMPexec.cpp
A		lib/kokkos/core/src/OpenMP/Kokkos_OpenMPexec.hpp
A	(dir)	lib/kokkos/core/src/Threads/
A		lib/kokkos/core/src/Threads/Kokkos_ThreadsExec.cpp
A		lib/kokkos/core/src/Threads/Kokkos_ThreadsExec.hpp
A		lib/kokkos/core/src/Threads/Kokkos_ThreadsExec_base.cpp
A		lib/kokkos/core/src/Threads/Kokkos_Threads_Parallel.hpp
A	(dir)	lib/kokkos/core/src/impl/
A		lib/kokkos/core/src/impl/Kokkos_AnalyzeShape.hpp
A		lib/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Strong.hpp
A		lib/kokkos/core/src/impl/Kokkos_Atomic_Exchange.hpp
A		lib/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Add.hpp
A		lib/kokkos/core/src/impl/Kokkos_Atomic_Fetch_And.hpp
A		lib/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Or.hpp
A		lib/kokkos/core/src/impl/Kokkos_Compiler_Macros.hpp
A		lib/kokkos/core/src/impl/Kokkos_CrsArray_factory.hpp
A		lib/kokkos/core/src/impl/Kokkos_Error.cpp
A		lib/kokkos/core/src/impl/Kokkos_Error.hpp
A		lib/kokkos/core/src/impl/Kokkos_HostSpace.cpp
A		lib/kokkos/core/src/impl/Kokkos_MemoryTracking.cpp
A		lib/kokkos/core/src/impl/Kokkos_MemoryTracking.hpp
A		lib/kokkos/core/src/impl/Kokkos_Memory_Fence.hpp
A		lib/kokkos/core/src/impl/Kokkos_PhysicalLayout.hpp
A		lib/kokkos/core/src/impl/Kokkos_Serial.cpp
A		lib/kokkos/core/src/impl/Kokkos_Shape.cpp
A		lib/kokkos/core/src/impl/Kokkos_Shape.hpp
A		lib/kokkos/core/src/impl/Kokkos_StaticAssert.hpp
A		lib/kokkos/core/src/impl/Kokkos_Timer.hpp
A		lib/kokkos/core/src/impl/Kokkos_Traits.hpp
A		lib/kokkos/core/src/impl/Kokkos_ViewDefault.hpp
A		lib/kokkos/core/src/impl/Kokkos_ViewOffset.hpp
A		lib/kokkos/core/src/impl/Kokkos_ViewSupport.hpp
A		lib/kokkos/core/src/impl/Kokkos_ViewTileLeft.hpp
A		lib/kokkos/core/src/impl/Kokkos_Volatile_Load.hpp
A		lib/kokkos/core/src/impl/Kokkos_hwloc.cpp
A		lib/kokkos/core/src/impl/Kokkos_spinwait.cpp
A		lib/kokkos/core/src/impl/Kokkos_spinwait.hpp
A	(dir)	src/KOKKOS/
A		src/KOKKOS/Install.sh
A		src/KOKKOS/atom_kokkos.cpp
A		src/KOKKOS/atom_kokkos.h
A		src/KOKKOS/atom_vec_atomic_kokkos.cpp
A		src/KOKKOS/atom_vec_atomic_kokkos.h
A		src/KOKKOS/atom_vec_kokkos.cpp
A		src/KOKKOS/atom_vec_kokkos.h
A		src/KOKKOS/comm_kokkos.cpp
A		src/KOKKOS/comm_kokkos.h
A		src/KOKKOS/domain_kokkos.cpp
A		src/KOKKOS/domain_kokkos.h
A		src/KOKKOS/fix_nve_kokkos.cpp
A		src/KOKKOS/fix_nve_kokkos.h
A		src/KOKKOS/kokkos.cpp
A		src/KOKKOS/kokkos.h
A		src/KOKKOS/kokkos_type.h
A		src/KOKKOS/memory_kokkos.h
A		src/KOKKOS/modify_kokkos.cpp
A		src/KOKKOS/modify_kokkos.h
A		src/KOKKOS/neigh_full_kokkos.h
A		src/KOKKOS/neigh_list_kokkos.cpp
A		src/KOKKOS/neigh_list_kokkos.h
A		src/KOKKOS/neighbor_kokkos.cpp
A		src/KOKKOS/neighbor_kokkos.h
A		src/KOKKOS/pair_kokkos.h
A		src/KOKKOS/pair_lj_cut_kokkos.cpp
A		src/KOKKOS/pair_lj_cut_kokkos.h
A		src/KOKKOS/pair_table_kokkos.cpp
A		src/KOKKOS/pair_table_kokkos.h
A		src/KOKKOS/verlet_kokkos.cpp
A		src/KOKKOS/verlet_kokkos.h
A		src/MAKE/Makefile.cuda
M		src/Makefile
M		src/atom_vec.cpp
M		src/compute_property_local.cpp
M		src/version.h