Merge pull request #377 from stanmoore1/kokkos_update
7185ec92b3f0
Actions

Authored by sjplimp <sjplimp@sandia.gov> on Feb 21 2017, 23:49.

Description

Merge pull request #377 from stanmoore1/kokkos_update

Kokkos library update

Details

Committed

GitHub <noreply@github.com>

Feb 21 2017, 23:49

Pushed

junge

Oct 19 2017, 09:53

Parents

rLAMMPS90e5ae965d7f: Add missing flags to Kokkos Makefile
rLAMMPS1cd4c48cccdb: new SNAP potential for W

Branches

Unknown

Tags

Unknown

Event Timeline

GitHub <noreply@github.com> committed rLAMMPS7185ec92b3f0: Merge pull request #377 from stanmoore1/kokkos_update (authored by sjplimp <sjplimp@sandia.gov>).Feb 21 2017, 23:49

Merged Changes

Commit	Author	Details	Committed
90e5ae965d7f	Stan Moore	Add missing flags to Kokkos Makefile	Feb 13 2017
33af7ab24874	Stan Moore	Remove merge line	Feb 13 2017
8f9b2aca06e7	Stan Moore	Removing unused files in Kokkos lib	Feb 13 2017
383da816c221	Stan Moore	Updating Kokkos lib	Feb 13 2017

Changes (188)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			lib/kokkos/CHANGELOG.md
	M			lib/kokkos/CMakeLists.txt
	P			lib/kokkos/LICENSE Copied to lib/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_s.cpp
	M			lib/kokkos/Makefile.kokkos
	M			lib/kokkos/README
	M			lib/kokkos/algorithms/src/Kokkos_Random.hpp
	M			lib/kokkos/algorithms/unit_tests/TestCuda.cpp
	M			lib/kokkos/algorithms/unit_tests/TestOpenMP.cpp
	M			lib/kokkos/algorithms/unit_tests/TestSerial.cpp
	M			lib/kokkos/algorithms/unit_tests/TestThreads.cpp
	M			lib/kokkos/cmake/tribits.cmake
	M			lib/kokkos/config/master_history.txt
	M			lib/kokkos/config/test_all_sandia
	A			lib/kokkos/config/test_kokkos_master_develop_promotion.sh
	M			lib/kokkos/config/trilinos-integration/prepare_trilinos_repos.sh
	M			lib/kokkos/containers/performance_tests/TestCuda.cpp
	M			lib/kokkos/containers/performance_tests/TestUnorderedMapPerformance.hpp
	M			lib/kokkos/containers/src/Kokkos_DynRankView.hpp
	M			lib/kokkos/containers/src/Kokkos_StaticCrsGraph.hpp
	M			lib/kokkos/containers/src/Kokkos_Vector.hpp
	M			lib/kokkos/containers/src/impl/Kokkos_Functional_impl.hpp
	M			lib/kokkos/containers/src/impl/Kokkos_StaticCrsGraph_factory.hpp
	M			lib/kokkos/containers/unit_tests/TestCuda.cpp
	M			lib/kokkos/containers/unit_tests/TestDynViewAPI.hpp
	M			lib/kokkos/containers/unit_tests/TestErrorReporter.hpp
	M			lib/kokkos/containers/unit_tests/TestOpenMP.cpp
	M			lib/kokkos/containers/unit_tests/TestSerial.cpp
	M			lib/kokkos/containers/unit_tests/TestStaticCrsGraph.hpp
	M			lib/kokkos/containers/unit_tests/TestThreads.cpp
	M			lib/kokkos/core/perf_test/PerfTestCuda.cpp
	M			lib/kokkos/core/perf_test/PerfTestDriver.hpp
	M			lib/kokkos/core/perf_test/PerfTestHost.cpp
	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_Error.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_Task.cpp
	M			lib/kokkos/core/src/Cuda/Kokkos_Cuda_Vectorization.hpp
	M			lib/kokkos/core/src/Cuda/Kokkos_Cuda_View.hpp
	M			lib/kokkos/core/src/Cuda/Kokkos_Cuda_abort.hpp
	M			lib/kokkos/core/src/KokkosExp_MDRangePolicy.hpp
	M			lib/kokkos/core/src/Kokkos_Array.hpp
	M			lib/kokkos/core/src/Kokkos_Atomic.hpp
	M			lib/kokkos/core/src/Kokkos_Concepts.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_HBWSpace.hpp
	M			lib/kokkos/core/src/Kokkos_HostSpace.hpp
	M			lib/kokkos/core/src/Kokkos_Macros.hpp
	M			lib/kokkos/core/src/Kokkos_MemoryPool.hpp
	M			lib/kokkos/core/src/Kokkos_OpenMP.hpp
	M			lib/kokkos/core/src/Kokkos_Parallel.hpp
	M			lib/kokkos/core/src/Kokkos_Parallel_Reduce.hpp
	M			lib/kokkos/core/src/Kokkos_ScratchSpace.hpp
	M			lib/kokkos/core/src/Kokkos_Serial.hpp
	M			lib/kokkos/core/src/Kokkos_TaskScheduler.hpp
	M			lib/kokkos/core/src/Kokkos_Threads.hpp
	M			lib/kokkos/core/src/Kokkos_Timer.hpp
	M			lib/kokkos/core/src/Kokkos_Vectorization.hpp
	M			lib/kokkos/core/src/Kokkos_View.hpp
	M			lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Parallel.hpp
	M			lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Task.cpp
	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_Qthread_Parallel.hpp
	M			lib/kokkos/core/src/Qthread/Kokkos_Qthread_TaskPolicy.cpp
	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
	M			lib/kokkos/core/src/impl/Kokkos_Atomic_Assembly.hpp
	M			lib/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Strong.hpp
	M			lib/kokkos/core/src/impl/Kokkos_Atomic_Decrement.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_And.hpp
	M			lib/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Or.hpp
	M			lib/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Sub.hpp
	M			lib/kokkos/core/src/impl/Kokkos_Atomic_Increment.hpp
	M			lib/kokkos/core/src/impl/Kokkos_Core.cpp
	M			lib/kokkos/core/src/impl/Kokkos_Error.hpp
	M			lib/kokkos/core/src/impl/Kokkos_HBWSpace.cpp
	M			lib/kokkos/core/src/impl/Kokkos_HostSpace.cpp
	M			lib/kokkos/core/src/impl/Kokkos_Memory_Fence.hpp
	A			lib/kokkos/core/src/impl/Kokkos_OldMacros.hpp
	M			lib/kokkos/core/src/impl/Kokkos_Serial.cpp
	M			lib/kokkos/core/src/impl/Kokkos_Serial_Task.cpp
	M			lib/kokkos/core/src/impl/Kokkos_Serial_Task.hpp
	M			lib/kokkos/core/src/impl/Kokkos_SharedAlloc.hpp
	M			lib/kokkos/core/src/impl/Kokkos_Tags.hpp
	M			lib/kokkos/core/src/impl/Kokkos_TaskQueue.hpp
	M			lib/kokkos/core/src/impl/Kokkos_TaskQueue_impl.hpp
	M			lib/kokkos/core/src/impl/Kokkos_Traits.hpp
	M			lib/kokkos/core/src/impl/Kokkos_Utilities.hpp
	M			lib/kokkos/core/src/impl/Kokkos_ViewMapping.hpp
	M			lib/kokkos/core/src/impl/Kokkos_Volatile_Load.hpp
	M			lib/kokkos/core/src/impl/Kokkos_hwloc.cpp
	P			lib/kokkos/core/src/impl/Kokkos_spinwait.cpp Copied to lib/kokkos/core/unit_test/TestViewSpaceAssign.hpp
	M			lib/kokkos/core/unit_test/Makefile
	A			lib/kokkos/core/unit_test/TestAtomicViews.hpp
	M			lib/kokkos/core/unit_test/TestCXX11.hpp
	M			lib/kokkos/core/unit_test/TestCompilerMacros.hpp
	M			lib/kokkos/core/unit_test/TestDefaultDeviceType.cpp
	M			lib/kokkos/core/unit_test/TestDefaultDeviceTypeInit.hpp
	M			lib/kokkos/core/unit_test/TestDefaultDeviceType_a.cpp
	M			lib/kokkos/core/unit_test/TestDefaultDeviceType_b.cpp
	M			lib/kokkos/core/unit_test/TestDefaultDeviceType_c.cpp
	M			lib/kokkos/core/unit_test/TestDefaultDeviceType_d.cpp
	M			lib/kokkos/core/unit_test/TestMemoryPool.hpp
	M			lib/kokkos/core/unit_test/TestReduce.hpp
	M			lib/kokkos/core/unit_test/TestScan.hpp
	M			lib/kokkos/core/unit_test/TestSynchronic.cpp
	M			lib/kokkos/core/unit_test/TestTeam.hpp
	M			lib/kokkos/core/unit_test/TestTemplateMetaFunctions.hpp
	M			lib/kokkos/core/unit_test/TestViewAPI.hpp
	M			lib/kokkos/core/unit_test/TestViewMapping.hpp
	P			lib/kokkos/core/unit_test/TestViewSpaceAssign.hpp Copied from lib/kokkos/core/src/impl/Kokkos_spinwait.cpp
	M			lib/kokkos/core/unit_test/cuda/TestCuda.hpp
	M			lib/kokkos/core/unit_test/cuda/TestCuda_Atomics.cpp
	M			lib/kokkos/core/unit_test/cuda/TestCuda_Other.cpp
	M			lib/kokkos/core/unit_test/cuda/TestCuda_Team.cpp
	P			lib/kokkos/core/unit_test/cuda/TestCuda_ViewAPI_s.cpp Copied from lib/kokkos/LICENSE
	M			lib/kokkos/core/unit_test/openmp/TestOpenMP.hpp
	M			lib/kokkos/core/unit_test/openmp/TestOpenMP_Atomics.cpp
	M			lib/kokkos/core/unit_test/openmp/TestOpenMP_Other.cpp
	M			lib/kokkos/core/unit_test/openmp/TestOpenMP_Team.cpp
	M			lib/kokkos/core/unit_test/serial/TestSerial.hpp
	M			lib/kokkos/core/unit_test/serial/TestSerial_Atomics.cpp
	M			lib/kokkos/core/unit_test/serial/TestSerial_Other.cpp
	M			lib/kokkos/core/unit_test/serial/TestSerial_Team.cpp
	M			lib/kokkos/core/unit_test/threads/TestThreads.hpp
	M			lib/kokkos/core/unit_test/threads/TestThreads_Atomics.cpp
	M			lib/kokkos/core/unit_test/threads/TestThreads_Other.cpp
	M			lib/kokkos/core/unit_test/threads/TestThreads_Team.cpp
	M			lib/kokkos/example/cmake/Dependencies.cmake
	M			lib/kokkos/example/common/VectorImport.hpp
	M			lib/kokkos/example/common/WrapMPI.hpp
	M			lib/kokkos/example/feint/feint_cuda.cpp
	M			lib/kokkos/example/feint/feint_openmp.cpp
	M			lib/kokkos/example/feint/feint_threads.cpp
	M			lib/kokkos/example/feint/main.cpp
	M			lib/kokkos/example/fenl/fenl.cpp
	M			lib/kokkos/example/fenl/fenl_impl.hpp
	M			lib/kokkos/example/fenl/main.cpp
	M			lib/kokkos/example/fixture/Main.cpp
	M			lib/kokkos/example/fixture/TestFixture.cpp
	M			lib/kokkos/example/global_2_local_ids/G2L_Main.cpp
	M			lib/kokkos/example/grow_array/grow_array.hpp
	M			lib/kokkos/example/grow_array/main.cpp
	M			lib/kokkos/example/md_skeleton/force.cpp
	M			lib/kokkos/example/md_skeleton/main.cpp
	M			lib/kokkos/example/multi_fem/Explicit.hpp
	M			lib/kokkos/example/multi_fem/LinAlgBLAS.hpp
	M			lib/kokkos/example/multi_fem/Nonlinear.hpp
	M			lib/kokkos/example/multi_fem/ParallelComm.hpp
	M			lib/kokkos/example/multi_fem/ParallelDataMap.hpp
	M			lib/kokkos/example/multi_fem/ParallelMachine.cpp
	M			lib/kokkos/example/multi_fem/ParallelMachine.hpp
	M			lib/kokkos/example/multi_fem/SparseLinearSystem.hpp
	M			lib/kokkos/example/multi_fem/TestBoxMeshFixture.hpp
	M			lib/kokkos/example/multi_fem/TestCuda.cpp
	M			lib/kokkos/example/multi_fem/TestHybridFEM.cpp
	M			lib/kokkos/example/query_device/query_device.cpp
	M			lib/kokkos/example/sort_array/main.cpp
	M			lib/kokkos/example/sort_array/sort_array.hpp
	M			lib/kokkos/example/tutorial/01_hello_world_lambda/hello_world_lambda.cpp
	M			lib/kokkos/example/tutorial/02_simple_reduce_lambda/simple_reduce_lambda.cpp
	M			lib/kokkos/example/tutorial/03_simple_view_lambda/simple_view_lambda.cpp
	M			lib/kokkos/example/tutorial/Advanced_Views/05_NVIDIA_UVM/uvm_example.cpp
	M			lib/kokkos/example/tutorial/Hierarchical_Parallelism/01_thread_teams_lambda/thread_teams_lambda.cpp
	M			lib/kokkos/example/tutorial/Hierarchical_Parallelism/03_vectorization/vectorization.cpp
	M			lib/kokkos/generate_makefile.bash
	D			lib/kokkos/tpls
	D			lib/kokkos/tpls/gtest
	D			lib/kokkos/tpls/gtest/gtest
	D			lib/kokkos/tpls/gtest/gtest/LICENSE
	D			lib/kokkos/tpls/gtest/gtest/README
	D			lib/kokkos/tpls/gtest/gtest/gtest-all.cc
	D			lib/kokkos/tpls/gtest/gtest/gtest-test-part.h
	D			lib/kokkos/tpls/gtest/gtest/gtest.h