Unverified Commit cea992b8 authored by zjing14's avatar zjing14 Committed by GitHub
Browse files

Merge branch 'develop' into aosewski/gemm_tile_loop

parents e7a53782 c8a8385f
...@@ -66,7 +66,7 @@ class TestMaxPool3dFwd : public ::testing::Test ...@@ -66,7 +66,7 @@ class TestMaxPool3dFwd : public ::testing::Test
} }
}; };
#ifdef __fp16__ #ifdef CK_ENABLE_FP16
using KernelTypes = using KernelTypes =
::testing::Types<std::tuple<F16, F16, F32, I32>, std::tuple<F32, F32, F32, I32>>; ::testing::Types<std::tuple<F16, F16, F32, I32>, std::tuple<F32, F32, F32, I32>>;
#else #else
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
template <ck::index_t N> template <ck::index_t N>
using I = ck::Number<N>; using I = ck::Number<N>;
#ifdef __fp16__ #ifdef CK_ENABLE_FP16
using F16 = ck::half_t; using F16 = ck::half_t;
#endif #endif
using F32 = float; using F32 = float;
...@@ -23,7 +23,7 @@ class TestSoftmax : public ck::TestSoftmax<Tuple> ...@@ -23,7 +23,7 @@ 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__ #ifdef CK_ENABLE_FP16
std::tuple< F16, F32, F16, I<3>>, std::tuple< F16, F32, F16, I<3>>,
#endif #endif
std::tuple< F32, F32, F32, I<3>> std::tuple< F32, F32, F32, I<3>>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
template <ck::index_t N> template <ck::index_t N>
using I = ck::Number<N>; using I = ck::Number<N>;
#ifdef __fp16__ #ifdef CK_ENABLE_FP16
using F16 = ck::half_t; using F16 = ck::half_t;
#endif #endif
using F32 = float; using F32 = float;
...@@ -23,7 +23,7 @@ class TestSoftmax : public ck::TestSoftmax<Tuple> ...@@ -23,7 +23,7 @@ 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__ #ifdef CK_ENABLE_FP16
std::tuple< F16, F32, F16, I<4>>, std::tuple< F16, F32, F16, I<4>>,
#endif #endif
std::tuple< F32, F32, F32, I<4>> std::tuple< F32, F32, F32, I<4>>
......
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