Skip to content

Commit

Permalink
remove allclose for testing
Browse files Browse the repository at this point in the history
  • Loading branch information
Yuuichi Asahi committed Jun 14, 2024
1 parent bace490 commit 9c1bdb7
Show file tree
Hide file tree
Showing 3 changed files with 125 additions and 166 deletions.
61 changes: 59 additions & 2 deletions batched/dense/unit_test/Test_Batched_DenseUtils.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,12 @@
#ifndef TEST_BATCHED_DENSE_HELPER_HPP
#define TEST_BATCHED_DENSE_HELPER_HPP

#include "KokkosBatched_Util.hpp"

namespace KokkosBatched {
template <typename MatrixViewType, typename VectorViewType>
void create_tridiagonal_batched_matrices(const MatrixViewType &A,
const VectorViewType &B) {
void create_tridiagonal_batched_matrices(const MatrixViewType& A,
const VectorViewType& B) {
Kokkos::Random_XorShift64_Pool<
typename VectorViewType::device_type::execution_space>
random(13718);
Expand Down Expand Up @@ -54,6 +56,61 @@ void create_tridiagonal_batched_matrices(const MatrixViewType &A,

Kokkos::fence();
}

template <typename InViewType, typename OutViewType, typename UploType>
void create_banded_triangular_matrix(InViewType& in, OutViewType& out,
int k = 1, bool band_storage = true) {
auto h_in = Kokkos::create_mirror_view(in);
auto h_out = Kokkos::create_mirror_view(out);
const int N = in.extent(0), BlkSize = in.extent(1);

Kokkos::deep_copy(h_in, in);
if (band_storage) {
assert(out.extent(0) == in.extent(0));
assert(out.extent(1) == static_cast<std::size_t>(k + 1));
assert(out.extent(2) == in.extent(2));
if constexpr (std::is_same_v<UploType, KokkosBatched::Uplo::Upper>) {
for (int i0 = 0; i0 < N; i0++) {
for (int i1 = 0; i1 < k + 1; i1++) {
for (int i2 = i1; i2 < BlkSize; i2++) {
h_out(i0, k - i1, i2) = h_in(i0, i2 - i1, i2);
}
}
}
} else {
for (int i0 = 0; i0 < N; i0++) {
for (int i1 = 0; i1 < k + 1; i1++) {
for (int i2 = 0; i2 < BlkSize - i1; i2++) {
h_out(i0, i1, i2) = h_in(i0, i2 + i1, i2);
}
}
}
}
} else {
for (std::size_t i = 0; i < InViewType::rank(); i++) {
assert(out.extent(i) == in.extent(i));
}

if constexpr (std::is_same_v<UploType, KokkosBatched::Uplo::Upper>) {
for (int i0 = 0; i0 < N; i0++) {
for (int i1 = 0; i1 < BlkSize; i1++) {
for (int i2 = i1; i2 < Kokkos::min(i1 + k + 1, BlkSize); i2++) {
h_out(i0, i1, i2) = h_in(i0, i1, i2);
}
}
}
} else {
for (int i0 = 0; i0 < N; i0++) {
for (int i1 = 0; i1 < BlkSize; i1++) {
for (int i2 = Kokkos::max(0, i1 - k); i2 <= i1; i2++) {
h_out(i0, i1, i2) = h_in(i0, i1, i2);
}
}
}
}
}
Kokkos::deep_copy(out, h_out);
}
} // namespace KokkosBatched

#endif // TEST_BATCHED_DENSE_HELPER_HPP
125 changes: 66 additions & 59 deletions batched/dense/unit_test/Test_Batched_SerialTbsv.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include "KokkosBatched_Util.hpp"
#include "KokkosBatched_Tbsv.hpp"
#include "Test_Utils.hpp"
#include "Test_Batched_DenseUtils.hpp"

using namespace KokkosBatched;

Expand Down Expand Up @@ -60,7 +60,7 @@ struct Functor_BatchedSerialTrsv {

inline void run() {
using value_type = typename AViewType::non_const_value_type;
std::string name_region("KokkosBatched::Test::SerialTrsv");
std::string name_region("KokkosBatched::Test::SerialTbsv");
const std::string name_value_type = Test::value_type_name<value_type>();
std::string name = name_region + name_value_type;
Kokkos::RangePolicy<execution_space, ParamTagType> policy(0, _b.extent(0));
Expand Down Expand Up @@ -153,7 +153,13 @@ void impl_test_batched_tbsv(const int N, const int k, const int BlkSize) {
mag_type eps = 1.0e3 * ats::epsilon();

// Check x0 = x1
EXPECT_TRUE(allclose<execution_space>(x1, x0, 1.e-5, eps));
auto h_x0 = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), x0);
auto h_x1 = Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), x1);
for (int i = 0; i < N; i++) {
for (int j = 0; j < BlkSize; j++) {
EXPECT_NEAR_KK(h_x0(i, j), h_x1(i, j), eps);
}
}
}

template <typename DeviceType, typename ScalarType, typename LayoutType,
Expand All @@ -177,7 +183,7 @@ void impl_test_batched_tbsv_analytical(const std::size_t N) {

// Testing incx argument with strided Views
Kokkos::LayoutStride layout{N, incx, BlkSize, N * incx};
StridedView2DType x1("x1", layout), x1_ref("x1_ref", layout); // Solutions
StridedView2DType x1("x1", layout); // Solutions

Kokkos::RangePolicy<execution_space> policy(0, N);
Kokkos::parallel_for(
Expand All @@ -188,80 +194,56 @@ void impl_test_batched_tbsv_analytical(const std::size_t N) {
ref(ib, i, j) = i + 1;
}
}
for (std::size_t n = 0; n < BlkSize; n++) {
x0(ib, n) = 1;
x1(ib, n) = 1;
for (std::size_t j = 0; j < BlkSize; j++) {
x0(ib, j) = 1;
x1(ib, j) = 1;
}

if (std::is_same_v<typename ParamTagType::uplo,
KokkosBatched::Uplo::Upper>) {
if (std::is_same_v<typename ParamTagType::trans,
Trans::NoTranspose>) {
if (std::is_same_v<typename ParamTagType::diag, Diag::NonUnit>) {
x_ref(ib, 0) = 1.0 / 2.0;
x_ref(ib, 1) = 1.0 / 6.0;
x_ref(ib, 2) = 1.0 / 3.0;
x1_ref(ib, 0) = 1.0 / 2.0;
x1_ref(ib, 1) = 1.0 / 6.0;
x1_ref(ib, 2) = 1.0 / 3.0;
x_ref(ib, 0) = 1.0 / 2.0;
x_ref(ib, 1) = 1.0 / 6.0;
x_ref(ib, 2) = 1.0 / 3.0;
} else {
x_ref(ib, 0) = 1.0;
x_ref(ib, 1) = -1.0;
x_ref(ib, 2) = 1.0;
x1_ref(ib, 0) = 1.0;
x1_ref(ib, 1) = -1.0;
x1_ref(ib, 2) = 1.0;
x_ref(ib, 0) = 1.0;
x_ref(ib, 1) = -1.0;
x_ref(ib, 2) = 1.0;
}
} else {
if (std::is_same_v<typename ParamTagType::diag, Diag::NonUnit>) {
x_ref(ib, 0) = 1.0;
x_ref(ib, 1) = 0.0;
x_ref(ib, 2) = 0.0;
x1_ref(ib, 0) = 1.0;
x1_ref(ib, 1) = 0.0;
x1_ref(ib, 2) = 0.0;
x_ref(ib, 0) = 1.0;
x_ref(ib, 1) = 0.0;
x_ref(ib, 2) = 0.0;
} else {
x_ref(ib, 0) = 1.0;
x_ref(ib, 1) = 0.0;
x_ref(ib, 2) = 0.0;
x1_ref(ib, 0) = 1.0;
x1_ref(ib, 1) = 0.0;
x1_ref(ib, 2) = 0.0;
x_ref(ib, 0) = 1.0;
x_ref(ib, 1) = 0.0;
x_ref(ib, 2) = 0.0;
}
}
} else {
if (std::is_same_v<typename ParamTagType::trans,
Trans::NoTranspose>) {
if (std::is_same_v<typename ParamTagType::diag, Diag::NonUnit>) {
x_ref(ib, 0) = 1.0;
x_ref(ib, 1) = -1.0 / 2.0;
x_ref(ib, 2) = -1.0 / 6.0;
x1_ref(ib, 0) = 1.0;
x1_ref(ib, 1) = -1.0 / 2.0;
x1_ref(ib, 2) = -1.0 / 6.0;
x_ref(ib, 0) = 1.0;
x_ref(ib, 1) = -1.0 / 2.0;
x_ref(ib, 2) = -1.0 / 6.0;
} else {
x_ref(ib, 0) = 1.0;
x_ref(ib, 1) = -1.0;
x_ref(ib, 2) = 1.0;
x1_ref(ib, 0) = 1.0;
x1_ref(ib, 1) = -1.0;
x1_ref(ib, 2) = 1.0;
x_ref(ib, 0) = 1.0;
x_ref(ib, 1) = -1.0;
x_ref(ib, 2) = 1.0;
}
} else {
if (std::is_same_v<typename ParamTagType::diag, Diag::NonUnit>) {
x_ref(ib, 0) = 0.0;
x_ref(ib, 1) = 0.0;
x_ref(ib, 2) = 1.0 / 3.0;
x1_ref(ib, 0) = 0.0;
x1_ref(ib, 1) = 0.0;
x1_ref(ib, 2) = 1.0 / 3.0;
x_ref(ib, 0) = 0.0;
x_ref(ib, 1) = 0.0;
x_ref(ib, 2) = 1.0 / 3.0;
} else {
x_ref(ib, 0) = 2.0;
x_ref(ib, 1) = -2.0;
x_ref(ib, 2) = 1.0;
x1_ref(ib, 0) = 2.0;
x1_ref(ib, 1) = -2.0;
x1_ref(ib, 2) = 1.0;
x_ref(ib, 0) = 2.0;
x_ref(ib, 1) = -2.0;
x_ref(ib, 2) = 1.0;
}
}
}
Expand Down Expand Up @@ -289,16 +271,41 @@ void impl_test_batched_tbsv_analytical(const std::size_t N) {

Kokkos::fence();

// Check x0 = x_ref and x1 = x_ref
// Firstly, prepare contiguous views on host
auto h_x0 = Kokkos::create_mirror_view(x0);
auto h_x1 = Kokkos::create_mirror_view(x0);

Kokkos::deep_copy(h_x0, x0);

// Pack x1 into x0 for contiguous storage
Kokkos::parallel_for(
"KokkosBatched::Test::SerialTbsv::Copy", policy,
KOKKOS_LAMBDA(const std::size_t ib) {
for (std::size_t j = 0; j < BlkSize; j++) {
x0(ib, j) = x1(ib, j);
}
});

Kokkos::fence();
Kokkos::deep_copy(h_x1, x0);

// this eps is about 10^-14
using ats = typename Kokkos::ArithTraits<ScalarType>;
using mag_type = typename ats::mag_type;
mag_type eps = 1.0e3 * ats::epsilon();

// Check x0 = x_ref
EXPECT_TRUE(allclose<execution_space>(x0, x_ref, 1.e-5, eps));
auto h_x_ref =
Kokkos::create_mirror_view_and_copy(Kokkos::HostSpace(), x_ref);
for (std::size_t ib = 0; ib < N; ib++) {
for (std::size_t j = 0; j < BlkSize; j++) {
// Check x0 = x_ref
EXPECT_NEAR_KK(h_x0(ib, j), h_x_ref(ib, j), eps);

// Check x1 = x1_ref
EXPECT_TRUE(allclose<execution_space>(x1, x1_ref, 1.e-5, eps));
// Check x1 = x_ref
EXPECT_NEAR_KK(h_x1(ib, j), h_x_ref(ib, j), eps);
}
}
}

} // namespace Tbsv
Expand Down
105 changes: 0 additions & 105 deletions batched/dense/unit_test/Test_Utils.hpp
View file

This file was deleted.

0 comments on commit 9c1bdb7

Please sign in to comment.