Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
f4dc6a4f6d33
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 3 2016, 20:07.

Description

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

May 3 2016, 20:07

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS33ce33ce360d: Reverting back to old kokkos view
rLAMMPSfc871eea781b: Merge branch 'chunk-atom-fix' of https://github.com/akohlmey/lammps into merge…

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSf4dc6a4f6d33: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 3 2016, 20:07

Merged Changes

Commit	Author	Details	Committed
33ce33ce360d	stamoor	Reverting back to old kokkos view	May 3 2016
c5c293d16f4d	stamoor	Adding signal handler to Kokkos package	May 3 2016
fda492ea48ec	stamoor	Updating kokkos lib	May 3 2016
0a1b76524844	stamoor	Updating kokkos lib	May 3 2016

Changes (186)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		lib/kokkos/CMakeLists.txt
M		lib/kokkos/Makefile.kokkos
M		lib/kokkos/Makefile.targets
M		lib/kokkos/README
M		lib/kokkos/algorithms/src/Kokkos_Sort.hpp
M		lib/kokkos/config/nvcc_wrapper
M		lib/kokkos/config/test_all_sandia
M		lib/kokkos/containers/src/Kokkos_DualView.hpp
A		lib/kokkos/containers/src/Kokkos_DynRankView.hpp
A		lib/kokkos/containers/src/Kokkos_DynamicView.hpp
M		lib/kokkos/containers/src/Kokkos_SegmentedView.hpp
M		lib/kokkos/containers/unit_tests/TestCuda.cpp
A		lib/kokkos/containers/unit_tests/TestDynViewAPI.hpp
A		lib/kokkos/containers/unit_tests/TestDynamicView.hpp
M		lib/kokkos/containers/unit_tests/TestOpenMP.cpp
M		lib/kokkos/containers/unit_tests/TestSegmentedView.hpp
M		lib/kokkos/containers/unit_tests/TestSerial.cpp
M		lib/kokkos/containers/unit_tests/TestThreads.cpp
M		lib/kokkos/core/cmake/Dependencies.cmake
M		lib/kokkos/core/cmake/KokkosCore_config.h.in
M		lib/kokkos/core/src/Cuda/Kokkos_CudaExec.hpp
M		lib/kokkos/core/src/Cuda/Kokkos_CudaSpace.cpp
M		lib/kokkos/core/src/Cuda/Kokkos_Cuda_BasicAllocators.cpp
M		lib/kokkos/core/src/Cuda/Kokkos_Cuda_BasicAllocators.hpp
M		lib/kokkos/core/src/Cuda/Kokkos_Cuda_Impl.cpp
M		lib/kokkos/core/src/Cuda/Kokkos_Cuda_Parallel.hpp
A		lib/kokkos/core/src/Cuda/Kokkos_Cuda_TaskPolicy.cpp
A		lib/kokkos/core/src/Cuda/Kokkos_Cuda_TaskPolicy.hpp
M		lib/kokkos/core/src/Cuda/Kokkos_Cuda_View.hpp
M		lib/kokkos/core/src/KokkosExp_View.hpp
M		lib/kokkos/core/src/Kokkos_Array.hpp
M		lib/kokkos/core/src/Kokkos_Atomic.hpp
M		lib/kokkos/core/src/Kokkos_Core.hpp
M		lib/kokkos/core/src/Kokkos_Core_fwd.hpp
M		lib/kokkos/core/src/Kokkos_Cuda.hpp
M		lib/kokkos/core/src/Kokkos_CudaSpace.hpp
M		lib/kokkos/core/src/Kokkos_ExecPolicy.hpp
M		lib/kokkos/core/src/Kokkos_HBWSpace.hpp
M		lib/kokkos/core/src/Kokkos_HostSpace.hpp
M		lib/kokkos/core/src/Kokkos_Layout.hpp
M		lib/kokkos/core/src/Kokkos_Macros.hpp
A		lib/kokkos/core/src/Kokkos_MemoryPool.hpp
M		lib/kokkos/core/src/Kokkos_OpenMP.hpp
M		lib/kokkos/core/src/Kokkos_Pair.hpp
M		lib/kokkos/core/src/Kokkos_Parallel.hpp
M		lib/kokkos/core/src/Kokkos_Qthread.hpp
M		lib/kokkos/core/src/Kokkos_ScratchSpace.hpp
M		lib/kokkos/core/src/Kokkos_Serial.hpp
M		lib/kokkos/core/src/Kokkos_TaskPolicy.hpp
M		lib/kokkos/core/src/Kokkos_Threads.hpp
M		lib/kokkos/core/src/Kokkos_View.hpp
M		lib/kokkos/core/src/Makefile
M		lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Parallel.hpp
M		lib/kokkos/core/src/OpenMP/Kokkos_OpenMPexec.cpp
M		lib/kokkos/core/src/OpenMP/Kokkos_OpenMPexec.hpp
M		lib/kokkos/core/src/Qthread/Kokkos_QthreadExec.cpp
M		lib/kokkos/core/src/Qthread/Kokkos_QthreadExec.hpp
M		lib/kokkos/core/src/Qthread/Kokkos_Qthread_Parallel.hpp
M		lib/kokkos/core/src/Qthread/Kokkos_Qthread_TaskPolicy.cpp
M		lib/kokkos/core/src/Qthread/Kokkos_Qthread_TaskPolicy.hpp
M		lib/kokkos/core/src/Threads/Kokkos_ThreadsExec.cpp
M		lib/kokkos/core/src/Threads/Kokkos_ThreadsExec.hpp
M		lib/kokkos/core/src/Threads/Kokkos_ThreadsTeam.hpp
M		lib/kokkos/core/src/Threads/Kokkos_Threads_Parallel.hpp
M		lib/kokkos/core/src/Threads/Kokkos_Threads_TaskPolicy.cpp
M		lib/kokkos/core/src/Threads/Kokkos_Threads_TaskPolicy.hpp
M		lib/kokkos/core/src/impl/KokkosExp_SharedAlloc.cpp
M		lib/kokkos/core/src/impl/KokkosExp_SharedAlloc.hpp
D		lib/kokkos/core/src/impl/KokkosExp_ViewAllocProp.hpp
M		lib/kokkos/core/src/impl/KokkosExp_ViewArray.hpp
A		lib/kokkos/core/src/impl/KokkosExp_ViewCtor.hpp
M		lib/kokkos/core/src/impl/KokkosExp_ViewMapping.hpp
M		lib/kokkos/core/src/impl/KokkosExp_ViewTile.hpp
M		lib/kokkos/core/src/impl/Kokkos_AllocationTracker.cpp
M		lib/kokkos/core/src/impl/Kokkos_AllocationTracker.hpp
V		lib/kokkos/core/src/impl/{Kokkos_Atomic_Assembly.hpp ← Kokkos_Atomic_Assembly_X86.hpp}
V		lib/kokkos/core/src/impl/{Kokkos_Atomic_Assembly_X86.hpp → Kokkos_Atomic_Assembly.hpp}
M		lib/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Strong.hpp
P		lib/kokkos/core/src/impl/Kokkos_Atomic_Decrement.hpp Copied from lib/kokkos/core/src/impl/Kokkos_Memory_Fence.hpp
M		lib/kokkos/core/src/impl/Kokkos_Atomic_Exchange.hpp
M		lib/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Add.hpp
M		lib/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Sub.hpp
M		lib/kokkos/core/src/impl/Kokkos_Atomic_Generic.hpp
P		lib/kokkos/core/src/impl/Kokkos_Atomic_Increment.hpp Copied from lib/kokkos/core/src/impl/Kokkos_Memory_Fence.hpp
M		lib/kokkos/core/src/impl/Kokkos_Atomic_View.hpp
M		lib/kokkos/core/src/impl/Kokkos_BasicAllocators.cpp
M		lib/kokkos/core/src/impl/Kokkos_BasicAllocators.hpp
P		lib/kokkos/core/src/impl/Kokkos_CPUDiscovery.cpp Copied from lib/kokkos/core/src/impl/Kokkos_Memory_Fence.hpp
P		lib/kokkos/core/src/impl/Kokkos_CPUDiscovery.hpp Copied from lib/kokkos/core/src/impl/Kokkos_Memory_Fence.hpp
M		lib/kokkos/core/src/impl/Kokkos_Core.cpp
A		lib/kokkos/core/src/impl/Kokkos_ExecPolicy.cpp
M		lib/kokkos/core/src/impl/Kokkos_FunctorAdapter.hpp
M		lib/kokkos/core/src/impl/Kokkos_HBWSpace.cpp
M		lib/kokkos/core/src/impl/Kokkos_HostSpace.cpp
P		lib/kokkos/core/src/impl/Kokkos_MemoryPool.cpp Copied from lib/kokkos/core/src/impl/Kokkos_Memory_Fence.hpp
A		lib/kokkos/core/src/impl/Kokkos_MemoryPool_Inline.hpp
P		lib/kokkos/core/src/impl/Kokkos_Memory_Fence.hpp Copied to multiple locations: lib/kokkos/core/src/impl/Kokkos_Atomic_Decrement.hpp lib/kokkos/core/src/impl/Kokkos_Atomic_Increment.hpp lib/kokkos/core/src/impl/Kokkos_CPUDiscovery.cpp lib/kokkos/core/src/impl/Kokkos_CPUDiscovery.hpp lib/kokkos/core/src/impl/Kokkos_MemoryPool.cpp
M		lib/kokkos/core/src/impl/Kokkos_Profiling_Interface.cpp
M		lib/kokkos/core/src/impl/Kokkos_Profiling_Interface.hpp
M		lib/kokkos/core/src/impl/Kokkos_Serial_TaskPolicy.hpp
M		lib/kokkos/core/src/impl/Kokkos_Tags.hpp
M		lib/kokkos/core/src/impl/Kokkos_Traits.hpp
M		lib/kokkos/core/src/impl/Kokkos_ViewOffset.hpp
M		lib/kokkos/core/src/impl/Kokkos_ViewSupport.hpp
M		lib/kokkos/core/src/impl/Kokkos_ViewTileLeft.hpp
M		lib/kokkos/core/unit_test/Makefile
M		lib/kokkos/core/unit_test/TestAggregate.hpp
M		lib/kokkos/core/unit_test/TestAggregateReduction.hpp
M		lib/kokkos/core/unit_test/TestAllocationTracker.cpp
M		lib/kokkos/core/unit_test/TestAtomic.hpp
M		lib/kokkos/core/unit_test/TestCXX11.hpp
P		lib/kokkos/core/unit_test/TestCuda.cpp Copied to multiple locations: lib/kokkos/core/unit_test/TestCuda_a.cpp lib/kokkos/core/unit_test/TestCuda_b.cpp lib/kokkos/core/unit_test/TestCuda_c.cpp
P		lib/kokkos/core/unit_test/TestCuda_a.cpp Copied from lib/kokkos/core/unit_test/TestCuda.cpp
P		lib/kokkos/core/unit_test/TestCuda_b.cpp Copied from lib/kokkos/core/unit_test/TestCuda.cpp
P		lib/kokkos/core/unit_test/TestCuda_c.cpp Copied from lib/kokkos/core/unit_test/TestCuda.cpp
M		lib/kokkos/core/unit_test/TestDefaultDeviceType.cpp
A		lib/kokkos/core/unit_test/TestMemoryPool.hpp
M		lib/kokkos/core/unit_test/TestMemorySpaceTracking.hpp
P		lib/kokkos/core/unit_test/TestOpenMP.cpp Copied to lib/kokkos/core/unit_test/TestOpenMP_c.cpp
A		lib/kokkos/core/unit_test/TestOpenMP_a.cpp
A		lib/kokkos/core/unit_test/TestOpenMP_b.cpp
P		lib/kokkos/core/unit_test/TestOpenMP_c.cpp Copied from lib/kokkos/core/unit_test/TestOpenMP.cpp
A		lib/kokkos/core/unit_test/TestPolicyConstruction.hpp
M		lib/kokkos/core/unit_test/TestQthread.cpp
M		lib/kokkos/core/unit_test/TestRange.hpp
M		lib/kokkos/core/unit_test/TestReduce.hpp
M		lib/kokkos/core/unit_test/TestScan.hpp
M		lib/kokkos/core/unit_test/TestSerial.cpp
M		lib/kokkos/core/unit_test/TestSharedAlloc.hpp
M		lib/kokkos/core/unit_test/TestTaskPolicy.hpp
M		lib/kokkos/core/unit_test/TestTeam.hpp
M		lib/kokkos/core/unit_test/TestThreads.cpp
M		lib/kokkos/core/unit_test/TestViewAPI.hpp
M		lib/kokkos/core/unit_test/TestViewImpl.hpp
M		lib/kokkos/core/unit_test/TestViewMapping.hpp
M		lib/kokkos/core/unit_test/TestViewOfClass.hpp
M		lib/kokkos/core/unit_test/TestViewSubview.hpp
M		lib/kokkos/example/feint/ElemFunctor.hpp
M		lib/kokkos/example/feint/Makefile
M		lib/kokkos/example/fenl/Makefile
M		lib/kokkos/example/fixture/Makefile
A	(dir)	lib/kokkos/example/ichol/
A		lib/kokkos/example/ichol/Makefile
A	(dir)	lib/kokkos/example/ichol/example/
A		lib/kokkos/example/ichol/example/example_chol_performance_device.hpp
A		lib/kokkos/example/ichol/example/example_chol_performance_device_cuda.cpp
A		lib/kokkos/example/ichol/example/example_chol_performance_device_pthread.cpp
A	(dir)	lib/kokkos/example/ichol/src/
A		lib/kokkos/example/ichol/src/chol.hpp
A		lib/kokkos/example/ichol/src/chol_u.hpp
A		lib/kokkos/example/ichol/src/chol_u_right_look_by_blocks.hpp
A		lib/kokkos/example/ichol/src/chol_u_unblocked_opt1.hpp
A		lib/kokkos/example/ichol/src/chol_u_unblocked_opt2.hpp
A		lib/kokkos/example/ichol/src/control.hpp
A		lib/kokkos/example/ichol/src/coo.hpp
A		lib/kokkos/example/ichol/src/crs_matrix_base.hpp
A		lib/kokkos/example/ichol/src/crs_matrix_base_import.hpp
A		lib/kokkos/example/ichol/src/crs_matrix_helper.hpp
A		lib/kokkos/example/ichol/src/crs_matrix_helper_impl.hpp
A		lib/kokkos/example/ichol/src/crs_matrix_view.hpp
A		lib/kokkos/example/ichol/src/crs_row_view.hpp
A		lib/kokkos/example/ichol/src/dot.hpp
A		lib/kokkos/example/ichol/src/gemm.hpp
A		lib/kokkos/example/ichol/src/gemm_ct_nt.hpp
A		lib/kokkos/example/ichol/src/gemm_ct_nt_for_factor_blocked.hpp
A		lib/kokkos/example/ichol/src/graph_helper_scotch.hpp
A		lib/kokkos/example/ichol/src/herk.hpp
A		lib/kokkos/example/ichol/src/herk_u_ct.hpp
A		lib/kokkos/example/ichol/src/herk_u_ct_for_factor_blocked.hpp
A		lib/kokkos/example/ichol/src/norm.hpp
A		lib/kokkos/example/ichol/src/partition.hpp
A		lib/kokkos/example/ichol/src/scale.hpp
A		lib/kokkos/example/ichol/src/symbolic_factor_helper.hpp
A		lib/kokkos/example/ichol/src/symbolic_task.hpp
A		lib/kokkos/example/ichol/src/task_factory.hpp
A		lib/kokkos/example/ichol/src/task_view.hpp
A		lib/kokkos/example/ichol/src/trsm.hpp
A		lib/kokkos/example/ichol/src/trsm_l_u_ct.hpp
A		lib/kokkos/example/ichol/src/trsm_l_u_ct_for_factor_blocked.hpp
A		lib/kokkos/example/ichol/src/util.cpp
A		lib/kokkos/example/ichol/src/util.hpp
M		lib/kokkos/generate_makefile.bash
M		src/KOKKOS/Install.sh
M		src/KOKKOS/kokkos.cpp
M		src/KOKKOS/kokkos.h
M		src/KOKKOS/kokkos_type.h