Update Kokkos library in LAMMPS to v4.0
This commit is contained in:
@ -1,46 +1,18 @@
|
||||
/*
|
||||
//@HEADER
|
||||
// ************************************************************************
|
||||
//
|
||||
// Kokkos v. 3.0
|
||||
// Copyright (2020) National Technology & Engineering
|
||||
// Kokkos v. 4.0
|
||||
// Copyright (2022) National Technology & Engineering
|
||||
// Solutions of Sandia, LLC (NTESS).
|
||||
//
|
||||
// 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
|
||||
// modification, are permitted provided that the following conditions are
|
||||
// met:
|
||||
// Part of Kokkos, under the Apache License v2.0 with LLVM Exceptions.
|
||||
// See https://kokkos.org/LICENSE for license information.
|
||||
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
||||
//
|
||||
// 1. Redistributions of source code must retain the above copyright
|
||||
// notice, this list of conditions and the following disclaimer.
|
||||
//
|
||||
// 2. Redistributions in binary form must reproduce the above copyright
|
||||
// notice, this list of conditions and the following disclaimer in the
|
||||
// documentation and/or other materials provided with the distribution.
|
||||
//
|
||||
// 3. Neither the name of the Corporation nor the names of the
|
||||
// contributors may be used to endorse or promote products derived from
|
||||
// this software without specific prior written permission.
|
||||
//
|
||||
// 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 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
|
||||
// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||
// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
||||
// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
//
|
||||
// Questions? Contact Christian R. Trott (crtrott@sandia.gov)
|
||||
//
|
||||
// ************************************************************************
|
||||
//@HEADER
|
||||
*/
|
||||
|
||||
#include <impl/Kokkos_StringManipulation.hpp>
|
||||
#include <impl/Kokkos_HostSharedPtr.hpp>
|
||||
@ -136,6 +108,12 @@ TEST(TEST_CATEGORY, host_shared_ptr_dereference_on_device) {
|
||||
static_cast<T*>(Kokkos::kokkos_malloc<MemorySpace>(sizeof(T))),
|
||||
[](T* p) { Kokkos::kokkos_free<MemorySpace>(p); });
|
||||
|
||||
#if defined(KOKKOS_ENABLE_CUDA) && \
|
||||
defined(KOKKOS_COMPILER_NVHPC) // FIXME_NVHPC
|
||||
if constexpr (std::is_same_v<TEST_EXECSPACE, Kokkos::Cuda>) {
|
||||
GTEST_SKIP() << "FIXME wrong result";
|
||||
}
|
||||
#endif
|
||||
check_access_stored_pointer_and_dereference_on_device(device_ptr);
|
||||
}
|
||||
|
||||
@ -277,13 +255,11 @@ TEST(TEST_CATEGORY, host_shared_ptr_tracking) {
|
||||
Kokkos::Experimental::SYCLSharedUSMSpace>();
|
||||
#endif
|
||||
#ifdef KOKKOS_ENABLE_HIP
|
||||
if (std::is_same<TEST_EXECSPACE, Kokkos::Experimental::HIP>::value) {
|
||||
host_shared_ptr_test_reference_counting<
|
||||
Kokkos::Experimental::HIPHostPinnedSpace,
|
||||
Kokkos::Experimental::HIPHostPinnedSpace>();
|
||||
host_shared_ptr_test_reference_counting<
|
||||
Kokkos::Experimental::HIPManagedSpace,
|
||||
Kokkos::Experimental::HIPManagedSpace>();
|
||||
if (std::is_same<TEST_EXECSPACE, Kokkos::HIP>::value) {
|
||||
host_shared_ptr_test_reference_counting<Kokkos::HIPHostPinnedSpace,
|
||||
Kokkos::HIPHostPinnedSpace>();
|
||||
host_shared_ptr_test_reference_counting<Kokkos::HIPManagedSpace,
|
||||
Kokkos::HIPManagedSpace>();
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user