ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Kokkos library in LAMMPS to v3.0

Browse Source
This commit is contained in:
Stan Moore
2020-03-25 14:08:39 -06:00
parent 0252d8c210
commit 60864e38d1
2169 changed files with 121406 additions and 126492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/kokkos/core/unit_test/standalone/Makefile
View File

@ -1,4 +1,4 @@
KOKKOS_DEVICES=Cuda
KOKKOS_DEVICES=OpenMP
KOKKOS_CUDA_OPTIONS=enable_lambda
KOKKOS_ARCH = "SNB,Kepler35"
@ -9,6 +9,7 @@ ifndef KOKKOS_PATH
endif
SRC = $(wildcard $(MAKEFILE_PATH)*.cpp)
SRC += $(MAKEFILE_PATH)/../TestStackTrace.cpp
HEADERS = $(wildcard $(MAKEFILE_PATH)*.hpp)
HEADERS = $(wildcard $(MAKEFILE_PATH)/../*.hpp)
@ -25,13 +26,13 @@ CXX = g++
EXE = test.host
endif
CXXFLAGS ?= -O3 -g
CXXFLAGS ?= -O0 -g -rdynamic
override CXXFLAGS += -I$(MAKEFILE_PATH) -I$(KOKKOS_PATH)/core/unit_test -I$(KOKKOS_PATH)/tpls/gtest -DTESTFILE=$(TESTFILE)
#SRC += $(KOKKOS_PATH)/tpls/gtest/gtest/gtest-all.cc
DEPFLAGS = -M
LINK = ${CXX}
LINKFLAGS =
LINKFLAGS = -rdynamic
OBJ = $(notdir $(SRC:.cpp=.o))
LIB =

23
lib/kokkos/core/unit_test/standalone/UnitTestMainInit.cpp
View File

@ -2,10 +2,11 @@
//@HEADER
// ************************************************************************
//
// Kokkos v. 2.0
// Copyright (2014) Sandia Corporation
// Kokkos v. 3.0
// Copyright (2020) National Technology & Engineering
// Solutions of Sandia, LLC (NTESS).
//
// Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
// Under the terms of Contract DE-NA0003525 with NTESS,
// the U.S. Government retains certain rights in this software.
//
// Redistribution and use in source and binary forms, with or without
@ -23,10 +24,10 @@
// contributors may be used to endorse or promote products derived from
// this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY SANDIA CORPORATION "AS IS" AND ANY
// THIS SOFTWARE IS PROVIDED BY NTESS "AS IS" AND ANY
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SANDIA CORPORATION OR THE
// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL NTESS OR THE
// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
@ -65,14 +66,14 @@
#ifdef KOKKOS_ENABLE_SERIAL
#include <serial/TestSerial_Category.hpp>
#endif
#endif
#include <TestReduceDeviceView.hpp>
#endif
#include <TestStackTrace.hpp>
int main( int argc, char *argv[] ) {
Kokkos::initialize(argc,argv);
::testing::InitGoogleTest( &argc, argv );
int main(int argc, char *argv[]) {
Kokkos::initialize(argc, argv);
::testing::InitGoogleTest(&argc, argv);
int result = RUN_ALL_TESTS();
int result = RUN_ALL_TESTS();
Kokkos::finalize();
return result;
}