Commit c7c47fd7 authored by Bartlomiej Wroblewski's avatar Bartlomiej Wroblewski
Browse files

Merge branch 'develop' into bwroblew/dpp8

parents f8eb91d7 578142db
...@@ -60,8 +60,12 @@ class TestMaxPool3dFwd : public ::testing::Test ...@@ -60,8 +60,12 @@ class TestMaxPool3dFwd : public ::testing::Test
} }
}; };
#ifdef __fp16__
using KernelTypes = using KernelTypes =
::testing::Types<std::tuple<F16, F16, F16, I32>, std::tuple<F32, F32, F32, I32>>; ::testing::Types<std::tuple<F16, F16, F32, I32>, std::tuple<F32, F32, F32, I32>>;
#else
using KernelTypes = ::testing::Types<std::tuple<F32, F32, F32, I32>>;
#endif
TYPED_TEST_SUITE(TestMaxPool3dFwd, KernelTypes); TYPED_TEST_SUITE(TestMaxPool3dFwd, KernelTypes);
TYPED_TEST(TestMaxPool3dFwd, Test_Pool) TYPED_TEST(TestMaxPool3dFwd, Test_Pool)
......
...@@ -10,8 +10,9 @@ ...@@ -10,8 +10,9 @@
template <ck::index_t N> template <ck::index_t N>
using I = ck::Number<N>; using I = ck::Number<N>;
#ifdef __fp16__
using F16 = ck::half_t; using F16 = ck::half_t;
#endif
using F32 = float; using F32 = float;
template <typename Tuple> template <typename Tuple>
...@@ -22,7 +23,9 @@ class TestSoftmax : public ck::TestSoftmax<Tuple> ...@@ -22,7 +23,9 @@ class TestSoftmax : public ck::TestSoftmax<Tuple>
// clang-format off // clang-format off
using KernelTypes = ::testing::Types< using KernelTypes = ::testing::Types<
// InDataType, AccDataType, OutDataType, Rank // InDataType, AccDataType, OutDataType, Rank
#ifdef __fp16__
std::tuple< F16, F32, F16, I<3>>, std::tuple< F16, F32, F16, I<3>>,
#endif
std::tuple< F32, F32, F32, I<3>> std::tuple< F32, F32, F32, I<3>>
>; >;
// clang-format on // clang-format on
......
...@@ -10,8 +10,9 @@ ...@@ -10,8 +10,9 @@
template <ck::index_t N> template <ck::index_t N>
using I = ck::Number<N>; using I = ck::Number<N>;
#ifdef __fp16__
using F16 = ck::half_t; using F16 = ck::half_t;
#endif
using F32 = float; using F32 = float;
template <typename Tuple> template <typename Tuple>
...@@ -22,7 +23,9 @@ class TestSoftmax : public ck::TestSoftmax<Tuple> ...@@ -22,7 +23,9 @@ class TestSoftmax : public ck::TestSoftmax<Tuple>
// clang-format off // clang-format off
using KernelTypes = ::testing::Types< using KernelTypes = ::testing::Types<
// InDataType, AccDataType, OutDataType, Rank // InDataType, AccDataType, OutDataType, Rank
#ifdef __fp16__
std::tuple< F16, F32, F16, I<4>>, std::tuple< F16, F32, F16, I<4>>,
#endif
std::tuple< F32, F32, F32, I<4>> std::tuple< F32, F32, F32, I<4>>
>; >;
// clang-format on // clang-format on
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment