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

Update Kokkos library in LAMMPS to v4.5.0

Browse Source
This commit is contained in:
Stan Moore
2024-12-13 09:23:03 -07:00
parent a78aee5731
commit 7f68aeb6d5
617 changed files with 21499 additions and 17255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/kokkos/core/unit_test/TestHostSharedPtrAccessOnDevice.hpp
View File

@ -37,7 +37,7 @@ template <class SmartPtr>
struct CheckAccessStoredPointerAndDereferenceOnDevice {
SmartPtr m_device_ptr;
using ElementType = typename SmartPtr::element_type;
static_assert(std::is_same<ElementType, Data>::value);
static_assert(std::is_same_v<ElementType, Data>);
CheckAccessStoredPointerAndDereferenceOnDevice(SmartPtr device_ptr)
: m_device_ptr(device_ptr) {
@ -127,8 +127,7 @@ TEST(TEST_CATEGORY, host_shared_ptr_special_members_on_device) {
#endif
// FIXME_OPENMPTARGET
#if defined(KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA) && \
!defined(KOKKOS_ENABLE_OPENMPTARGET)
#if !defined(KOKKOS_ENABLE_OPENMPTARGET)
namespace {
struct Bar {
@ -155,7 +154,7 @@ void host_shared_ptr_test_reference_counting() {
static_cast<Foo*>(Kokkos::kokkos_malloc<DevMemSpace>(sizeof(Foo)));
Kokkos::View<Foo, DevMemSpace> fp_d(fp_d_ptr);
// If using UVM or on the CPU don't make an extra HostCopy
Foo* fp_h_ptr = std::is_same<DevMemSpace, HostMemSpace>::value
Foo* fp_h_ptr = std::is_same_v<DevMemSpace, HostMemSpace>
? fp_d_ptr
: static_cast<Foo*>(
Kokkos::kokkos_malloc<HostMemSpace>(sizeof(Foo)));
@ -243,10 +242,9 @@ TEST(TEST_CATEGORY, host_shared_ptr_tracking) {
Kokkos::CudaUVMSpace>();
#endif
#ifdef KOKKOS_ENABLE_SYCL
if (std::is_same<TEST_EXECSPACE, Kokkos::Experimental::SYCL>::value)
host_shared_ptr_test_reference_counting<
Kokkos::Experimental::SYCLSharedUSMSpace,
Kokkos::Experimental::SYCLSharedUSMSpace>();
if (std::is_same<TEST_EXECSPACE, Kokkos::SYCL>::value)
host_shared_ptr_test_reference_counting<Kokkos::SYCLSharedUSMSpace,
Kokkos::SYCLSharedUSMSpace>();
#endif
#ifdef KOKKOS_ENABLE_HIP
if (std::is_same<TEST_EXECSPACE, Kokkos::HIP>::value) {
@ -258,4 +256,4 @@ TEST(TEST_CATEGORY, host_shared_ptr_tracking) {
#endif
}
#endif // KOKKOS_ENABLE_CXX11_DISPATCH_LAMBDA
#endif