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

Update Kokkos library in LAMMPS to v3.7.0

Browse Source
This commit is contained in:
Stan Gerald Moore
2022-10-04 14:04:40 -06:00
parent dd072f7e08
commit f9f9e44f2d
653 changed files with 41432 additions and 33597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/kokkos/core/unit_test/TestDeepCopyAlignment.hpp
View File

@ -225,12 +225,12 @@ struct TestDeepCopyScalarConversion {
using view_type_s1_2d = Kokkos::View<Scalar1**, Layout1, TEST_EXECSPACE>;
using view_type_s2_2d = Kokkos::View<Scalar2**, Layout2, TEST_EXECSPACE>;
using base_layout1 = typename std::conditional<
std::is_same<Layout1, Kokkos::LayoutStride>::value, Kokkos::LayoutLeft,
Layout1>::type;
using base_layout2 = typename std::conditional<
std::is_same<Layout2, Kokkos::LayoutStride>::value, Kokkos::LayoutLeft,
Layout2>::type;
using base_layout1 =
std::conditional_t<std::is_same<Layout1, Kokkos::LayoutStride>::value,
Kokkos::LayoutLeft, Layout1>;
using base_layout2 =
std::conditional_t<std::is_same<Layout2, Kokkos::LayoutStride>::value,
Kokkos::LayoutLeft, Layout2>;
using base_type_s1_1d = Kokkos::View<Scalar1*, base_layout1, TEST_EXECSPACE>;
using base_type_s2_1d = Kokkos::View<Scalar2*, base_layout2, TEST_EXECSPACE>;