lammps into merge-pull…
526e5b74647e
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Dec 11 2015, 13:24.

Description

Merge branch 'pull-requests' of git://github.com/crtrott/lammps into merge-pull-22

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Dec 11 2015, 13:24

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS441eeca80b9b: Kokkos: put the LAMMPS specific settings into Makefile.kokkos
rLAMMPS3b6a3f4e55c5: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14357 f3b2605a-c512-4ea7…

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS526e5b74647e: Merge branch 'pull-requests' of git://github.com/crtrott/lammps into merge-pull… (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Dec 11 2015, 13:24

Merged Changes

Commit	Author	Details	Committed
441eeca80b9b	crtrott	Kokkos: put the LAMMPS specific settings into Makefile.kokkos	Dec 10 2015
91a791bbb3d8	crtrott	Snapshot of kokkos.git from commit 0a776f65e7429b875839719c4fe528c15e871e46	Dec 10 2015
4099f540dd26	crtrott	Fix an issue with usage of isfinite	Dec 10 2015
c57fc903cf99	crtrott	Kokkos: fix an issue with usage of DualView	Dec 10 2015

Changes (209)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
A		lib/kokkos/.gitignore
A		lib/kokkos/CMakeLists.txt
A		lib/kokkos/HOW_TO_SNAPSHOT
M		lib/kokkos/Makefile.kokkos
M		lib/kokkos/Makefile.targets
M		lib/kokkos/README
A		lib/kokkos/algorithms/CMakeLists.txt
A	(dir)	lib/kokkos/algorithms/cmake/
A		lib/kokkos/algorithms/cmake/Dependencies.cmake
A		lib/kokkos/algorithms/cmake/KokkosAlgorithms_config.h.in
A		lib/kokkos/algorithms/src/CMakeLists.txt
M		lib/kokkos/algorithms/src/Kokkos_Random.hpp
A		lib/kokkos/algorithms/unit_tests/CMakeLists.txt
M		lib/kokkos/algorithms/unit_tests/Makefile
A	(dir)	lib/kokkos/cmake/
A		lib/kokkos/cmake/Dependencies.cmake
A	(dir)	lib/kokkos/cmake/tpls/
A		lib/kokkos/cmake/tpls/FindTPLCUSPARSE.cmake
A		lib/kokkos/cmake/tpls/FindTPLHWLOC.cmake
A		lib/kokkos/cmake/tpls/FindTPLPthread.cmake
A		lib/kokkos/cmake/tpls/FindTPLQTHREAD.cmake
M		lib/kokkos/config/nvcc_wrapper
M		lib/kokkos/config/test_all_sandia
A		lib/kokkos/config/testing_scripts/obj_size_opt_check
A		lib/kokkos/containers/CMakeLists.txt
A	(dir)	lib/kokkos/containers/cmake/
A		lib/kokkos/containers/cmake/Dependencies.cmake
A		lib/kokkos/containers/cmake/KokkosContainers_config.h.in
A		lib/kokkos/containers/performance_tests/CMakeLists.txt
M		lib/kokkos/containers/performance_tests/Makefile
A		lib/kokkos/containers/src/CMakeLists.txt
M		lib/kokkos/containers/src/Kokkos_Bitset.hpp
M		lib/kokkos/containers/src/Kokkos_DualView.hpp
M		lib/kokkos/containers/src/Kokkos_Vector.hpp
A		lib/kokkos/containers/unit_tests/CMakeLists.txt
M		lib/kokkos/containers/unit_tests/Makefile
M		lib/kokkos/containers/unit_tests/TestComplex.hpp
A		lib/kokkos/core/CMakeLists.txt
A	(dir)	lib/kokkos/core/cmake/
A		lib/kokkos/core/cmake/Dependencies.cmake
A		lib/kokkos/core/cmake/KokkosCore_config.h.in
A		lib/kokkos/core/perf_test/CMakeLists.txt
M		lib/kokkos/core/perf_test/Makefile
M		lib/kokkos/core/perf_test/PerfTestCuda.cpp
M		lib/kokkos/core/perf_test/test_atomic.cpp
A		lib/kokkos/core/src/CMakeLists.txt
M		lib/kokkos/core/src/Cuda/KokkosExp_Cuda_View.hpp
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_Alloc.hpp
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_Internal.hpp
M		lib/kokkos/core/src/Cuda/Kokkos_Cuda_Parallel.hpp
M		lib/kokkos/core/src/Cuda/Kokkos_Cuda_ReduceScan.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
A		lib/kokkos/core/src/Kokkos_Complex.hpp
M		lib/kokkos/core/src/Kokkos_Core.hpp
M		lib/kokkos/core/src/Kokkos_Core_fwd.hpp
M		lib/kokkos/core/src/Kokkos_CudaSpace.hpp
M		lib/kokkos/core/src/Kokkos_ExecPolicy.hpp
P		lib/kokkos/core/src/Kokkos_HBWSpace.hpp Copied from lib/kokkos/core/src/Kokkos_HostSpace.hpp
P		lib/kokkos/core/src/Kokkos_HostSpace.hpp Copied to lib/kokkos/core/src/Kokkos_HBWSpace.hpp
M		lib/kokkos/core/src/Kokkos_Layout.hpp
M		lib/kokkos/core/src/Kokkos_Macros.hpp
M		lib/kokkos/core/src/Kokkos_MemoryTraits.hpp
M		lib/kokkos/core/src/Kokkos_OpenMP.hpp
M		lib/kokkos/core/src/Kokkos_Parallel.hpp
M		lib/kokkos/core/src/Kokkos_Serial.hpp
M		lib/kokkos/core/src/Kokkos_View.hpp
M		lib/kokkos/core/src/Kokkos_hwloc.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.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_ThreadsExec_base.cpp
M		lib/kokkos/core/src/Threads/Kokkos_ThreadsTeam.hpp
M		lib/kokkos/core/src/Threads/Kokkos_Threads_Parallel.hpp
A		lib/kokkos/core/src/impl/CMakeLists.txt
M		lib/kokkos/core/src/impl/KokkosExp_SharedAlloc.cpp
M		lib/kokkos/core/src/impl/KokkosExp_SharedAlloc.hpp
M		lib/kokkos/core/src/impl/KokkosExp_ViewAllocProp.hpp
M		lib/kokkos/core/src/impl/KokkosExp_ViewArray.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
M		lib/kokkos/core/src/impl/Kokkos_Atomic_View.hpp
M		lib/kokkos/core/src/impl/Kokkos_Atomic_Windows.hpp
M		lib/kokkos/core/src/impl/Kokkos_BasicAllocators.cpp
M		lib/kokkos/core/src/impl/Kokkos_BasicAllocators.hpp
M		lib/kokkos/core/src/impl/Kokkos_Core.cpp
M		lib/kokkos/core/src/impl/Kokkos_Error.cpp
P		lib/kokkos/core/src/impl/Kokkos_Error.hpp Copied to lib/kokkos/core/src/impl/Kokkos_HBWAllocators.hpp
P		lib/kokkos/core/src/impl/Kokkos_HBWAllocators.cpp Copied from lib/kokkos/core/unit_test/TestViewOfClass.hpp
P		lib/kokkos/core/src/impl/Kokkos_HBWAllocators.hpp Copied from lib/kokkos/core/src/impl/Kokkos_Error.hpp
P		lib/kokkos/core/src/impl/Kokkos_HBWSpace.cpp Copied from lib/kokkos/core/src/impl/Kokkos_HostSpace.cpp
P		lib/kokkos/core/src/impl/Kokkos_HostSpace.cpp Copied to lib/kokkos/core/src/impl/Kokkos_HBWSpace.cpp
M		lib/kokkos/core/src/impl/Kokkos_Profiling_Interface.cpp
M		lib/kokkos/core/src/impl/Kokkos_Serial_TaskPolicy.cpp
M		lib/kokkos/core/src/impl/Kokkos_Shape.hpp
A		lib/kokkos/core/src/impl/Kokkos_Synchronic.hpp
A		lib/kokkos/core/src/impl/Kokkos_Synchronic_Config.hpp
A		lib/kokkos/core/src/impl/Kokkos_Synchronic_n3998.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_ViewDefault.hpp
M		lib/kokkos/core/src/impl/Kokkos_ViewSupport.hpp
M		lib/kokkos/core/src/impl/Kokkos_ViewTileLeft.hpp
M		lib/kokkos/core/src/impl/Kokkos_hwloc.cpp
M		lib/kokkos/core/src/impl/Kokkos_spinwait.cpp
A		lib/kokkos/core/unit_test/CMakeLists.txt
M		lib/kokkos/core/unit_test/Makefile
M		lib/kokkos/core/unit_test/TestAggregate.hpp
M		lib/kokkos/core/unit_test/TestAllocationTracker.cpp
M		lib/kokkos/core/unit_test/TestAtomic.hpp
M		lib/kokkos/core/unit_test/TestCuda.cpp
M		lib/kokkos/core/unit_test/TestDefaultDeviceType.cpp
M		lib/kokkos/core/unit_test/TestOpenMP.cpp
M		lib/kokkos/core/unit_test/TestQthread.cpp
M		lib/kokkos/core/unit_test/TestSerial.cpp
M		lib/kokkos/core/unit_test/TestSharedAlloc.hpp
A		lib/kokkos/core/unit_test/TestSynchronic.cpp
A		lib/kokkos/core/unit_test/TestSynchronic.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/TestViewMapping.hpp
P		lib/kokkos/core/unit_test/TestViewOfClass.hpp Copied to lib/kokkos/core/src/impl/Kokkos_HBWAllocators.cpp
M		lib/kokkos/core/unit_test/TestViewSubview.hpp
A	(dir)	lib/kokkos/doc/
A		lib/kokkos/doc/Doxyfile
A		lib/kokkos/doc/Kokkos_PG.pdf
A		lib/kokkos/doc/README
A		lib/kokkos/doc/build_docs
A		lib/kokkos/doc/index.doc
A		lib/kokkos/example/CMakeLists.txt
A	(dir)	lib/kokkos/example/cmake/
A		lib/kokkos/example/cmake/Dependencies.cmake
A		lib/kokkos/example/feint/CMakeLists.txt
A		lib/kokkos/example/fenl/CMakeLists.txt
M		lib/kokkos/example/fenl/Makefile
A		lib/kokkos/example/fixture/CMakeLists.txt
A		lib/kokkos/example/global_2_local_ids/CMakeLists.txt
A		lib/kokkos/example/global_2_local_ids/Makefile
A		lib/kokkos/example/grow_array/CMakeLists.txt
A		lib/kokkos/example/grow_array/Makefile
A		lib/kokkos/example/md_skeleton/CMakeLists.txt
A		lib/kokkos/example/md_skeleton/Makefile
A		lib/kokkos/example/multi_fem/CMakeLists.txt
A		lib/kokkos/example/multi_fem/Makefile
A		lib/kokkos/example/query_device/CMakeLists.txt
A		lib/kokkos/example/query_device/Makefile
A		lib/kokkos/example/sort_array/CMakeLists.txt
A		lib/kokkos/example/sort_array/Makefile
A		lib/kokkos/example/tutorial/01_hello_world/CMakeLists.txt
A		lib/kokkos/example/tutorial/01_hello_world_lambda/CMakeLists.txt
A		lib/kokkos/example/tutorial/02_simple_reduce/CMakeLists.txt
A		lib/kokkos/example/tutorial/02_simple_reduce_lambda/CMakeLists.txt
A		lib/kokkos/example/tutorial/03_simple_view/CMakeLists.txt
A		lib/kokkos/example/tutorial/03_simple_view_lambda/CMakeLists.txt
A		lib/kokkos/example/tutorial/04_simple_memoryspaces/CMakeLists.txt
A		lib/kokkos/example/tutorial/05_simple_atomics/CMakeLists.txt
A		lib/kokkos/example/tutorial/Advanced_Views/01_data_layouts/CMakeLists.txt
A		lib/kokkos/example/tutorial/Advanced_Views/02_memory_traits/CMakeLists.txt
A		lib/kokkos/example/tutorial/Advanced_Views/03_subviews/CMakeLists.txt
A		lib/kokkos/example/tutorial/Advanced_Views/04_dualviews/CMakeLists.txt
A		lib/kokkos/example/tutorial/Advanced_Views/05_NVIDIA_UVM/CMakeLists.txt
A		lib/kokkos/example/tutorial/Advanced_Views/CMakeLists.txt
A		lib/kokkos/example/tutorial/CMakeLists.txt
A		lib/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams/CMakeLists.txt
A		lib/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams_lambda/CMakeLists.txt
A		lib/kokkos/example/tutorial/Hierarchical_Parallelism/02_nested_parallel_for/CMakeLists.txt
A		lib/kokkos/example/tutorial/Hierarchical_Parallelism/03_vectorization/CMakeLists.txt
A		lib/kokkos/example/tutorial/Hierarchical_Parallelism/04_team_scan/CMakeLists.txt
A		lib/kokkos/example/tutorial/Hierarchical_Parallelism/CMakeLists.txt
M		lib/kokkos/generate_makefile.bash
A	(dir)	lib/kokkos/tpls/
A	(dir)	lib/kokkos/tpls/gtest/
A	(dir)	lib/kokkos/tpls/gtest/gtest/
A		lib/kokkos/tpls/gtest/gtest/LICENSE
A		lib/kokkos/tpls/gtest/gtest/README
A		lib/kokkos/tpls/gtest/gtest/gtest-all.cc
A	(sym)	lib/kokkos/tpls/gtest/gtest/gtest-test-part.h
A		lib/kokkos/tpls/gtest/gtest/gtest.h
M		src/KOKKOS/kokkos_type.h
M		src/KOKKOS/verlet_kokkos.cpp
M		src/KSPACE/msm.cpp
M		src/KSPACE/msm_cg.cpp
M		src/KSPACE/pppm.cpp
M		src/KSPACE/pppm_cg.cpp
M		src/KSPACE/pppm_disp.cpp
M		src/KSPACE/pppm_disp_tip4p.cpp
M		src/KSPACE/pppm_stagger.cpp
M		src/KSPACE/pppm_tip4p.cpp
M		src/USER-OMP/msm_cg_omp.cpp
M		src/USER-OMP/pppm_disp_omp.cpp
M		src/USER-OMP/pppm_disp_tip4p_omp.cpp
M		src/USER-OMP/pppm_tip4p_omp.cpp
M		src/lmptype.h