Commit c6683eea authored by rocking's avatar rocking
Browse files

Remove CShuffleDataType in dlops

Let acc and CShuffleDataType be the same in xdlops
parent 25e3772e
...@@ -9,7 +9,6 @@ using WeiDataType = int8_t; ...@@ -9,7 +9,6 @@ using WeiDataType = int8_t;
using BiasDataType = int32_t; using BiasDataType = int32_t;
using RequantScaleDataType = float; using RequantScaleDataType = float;
using AccDataType = int32_t; using AccDataType = int32_t;
using CShuffleDataType = int32_t;
using OutDataType = int8_t; using OutDataType = int8_t;
template <ck::index_t... Is> template <ck::index_t... Is>
......
...@@ -4,12 +4,11 @@ ...@@ -4,12 +4,11 @@
#include "common.hpp" #include "common.hpp"
#include "ck/tensor_operation/gpu/device/device_grouped_conv_fwd_dl_multiple_d_nhwc_kyxc_nhwk.hpp" #include "ck/tensor_operation/gpu/device/device_grouped_conv_fwd_dl_multiple_d_nhwc_kyxc_nhwk.hpp"
using InDataType = int8_t; using InDataType = int8_t;
using WeiDataType = int8_t; using WeiDataType = int8_t;
using BiasDataType = int32_t; using BiasDataType = int32_t;
using AccDataType = int32_t; using AccDataType = int32_t;
using CShuffleDataType = int32_t; using OutDataType = int8_t;
using OutDataType = int8_t;
template <ck::index_t... Is> template <ck::index_t... Is>
using S = ck::Sequence<Is...>; using S = ck::Sequence<Is...>;
......
...@@ -8,7 +8,6 @@ using InDataType = int8_t; ...@@ -8,7 +8,6 @@ using InDataType = int8_t;
using WeiDataType = int8_t; using WeiDataType = int8_t;
using RequantScaleDataType = float; using RequantScaleDataType = float;
using AccDataType = int32_t; using AccDataType = int32_t;
using CShuffleDataType = int32_t;
using OutDataType = int8_t; using OutDataType = int8_t;
template <ck::index_t... Is> template <ck::index_t... Is>
......
...@@ -4,11 +4,10 @@ ...@@ -4,11 +4,10 @@
#include "common.hpp" #include "common.hpp"
#include "ck/tensor_operation/gpu/device/device_grouped_conv_fwd_dl_multiple_d_nhwc_kyxc_nhwk.hpp" #include "ck/tensor_operation/gpu/device/device_grouped_conv_fwd_dl_multiple_d_nhwc_kyxc_nhwk.hpp"
using InDataType = int8_t; using InDataType = int8_t;
using WeiDataType = int8_t; using WeiDataType = int8_t;
using AccDataType = int32_t; using AccDataType = int32_t;
using CShuffleDataType = int32_t; using OutDataType = int8_t;
using OutDataType = int8_t;
template <ck::index_t... Is> template <ck::index_t... Is>
using S = ck::Sequence<Is...>; using S = ck::Sequence<Is...>;
......
...@@ -9,7 +9,7 @@ using WeiDataType = int8_t; ...@@ -9,7 +9,7 @@ using WeiDataType = int8_t;
using BiasDataType = int32_t; using BiasDataType = int32_t;
using RequantScaleDataType = float; using RequantScaleDataType = float;
using AccDataType = int32_t; using AccDataType = int32_t;
using CShuffleDataType = int32_t; using CShuffleDataType = AccDataType;
using OutDataType = int8_t; using OutDataType = int8_t;
template <ck::index_t... Is> template <ck::index_t... Is>
......
...@@ -8,7 +8,7 @@ using InDataType = int8_t; ...@@ -8,7 +8,7 @@ using InDataType = int8_t;
using WeiDataType = int8_t; using WeiDataType = int8_t;
using BiasDataType = int32_t; using BiasDataType = int32_t;
using AccDataType = int32_t; using AccDataType = int32_t;
using CShuffleDataType = int32_t; using CShuffleDataType = AccDataType;
using OutDataType = int8_t; using OutDataType = int8_t;
template <ck::index_t... Is> template <ck::index_t... Is>
......
...@@ -8,7 +8,7 @@ using InDataType = int8_t; ...@@ -8,7 +8,7 @@ using InDataType = int8_t;
using WeiDataType = int8_t; using WeiDataType = int8_t;
using RequantScaleDataType = float; using RequantScaleDataType = float;
using AccDataType = int32_t; using AccDataType = int32_t;
using CShuffleDataType = int32_t; using CShuffleDataType = AccDataType;
using OutDataType = int8_t; using OutDataType = int8_t;
template <ck::index_t... Is> template <ck::index_t... Is>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
using InDataType = int8_t; using InDataType = int8_t;
using WeiDataType = int8_t; using WeiDataType = int8_t;
using AccDataType = int32_t; using AccDataType = int32_t;
using CShuffleDataType = int32_t; using CShuffleDataType = AccDataType;
using OutDataType = int8_t; using OutDataType = int8_t;
template <ck::index_t... Is> template <ck::index_t... Is>
......
...@@ -129,12 +129,12 @@ bool run_grouped_conv_fwd(bool do_verification, ...@@ -129,12 +129,12 @@ bool run_grouped_conv_fwd(bool do_verification,
if(do_verification) if(do_verification)
{ {
Tensor<CShuffleDataType> c_host(out_g_n_k_wos_desc); Tensor<AccDataType> c_host(out_g_n_k_wos_desc);
auto ref_conv = ck::tensor_operation::host::ReferenceConvFwd<NDimSpatial, auto ref_conv = ck::tensor_operation::host::ReferenceConvFwd<NDimSpatial,
InDataType, InDataType,
WeiDataType, WeiDataType,
CShuffleDataType, AccDataType,
InElementOp, InElementOp,
WeiElementOp, WeiElementOp,
PassThrough>(); PassThrough>();
......
...@@ -118,12 +118,12 @@ bool run_grouped_conv_fwd(bool do_verification, ...@@ -118,12 +118,12 @@ bool run_grouped_conv_fwd(bool do_verification,
if(do_verification) if(do_verification)
{ {
Tensor<CShuffleDataType> c_host(out_g_n_k_wos_desc); Tensor<AccDataType> c_host(out_g_n_k_wos_desc);
auto ref_conv = ck::tensor_operation::host::ReferenceConvFwd<NDimSpatial, auto ref_conv = ck::tensor_operation::host::ReferenceConvFwd<NDimSpatial,
InDataType, InDataType,
WeiDataType, WeiDataType,
CShuffleDataType, AccDataType,
InElementOp, InElementOp,
WeiElementOp, WeiElementOp,
PassThrough>(); PassThrough>();
......
...@@ -119,12 +119,12 @@ bool run_grouped_conv_fwd(bool do_verification, ...@@ -119,12 +119,12 @@ bool run_grouped_conv_fwd(bool do_verification,
if(do_verification) if(do_verification)
{ {
Tensor<CShuffleDataType> c_host(out_g_n_k_wos_desc); Tensor<AccDataType> c_host(out_g_n_k_wos_desc);
auto ref_conv = ck::tensor_operation::host::ReferenceConvFwd<NDimSpatial, auto ref_conv = ck::tensor_operation::host::ReferenceConvFwd<NDimSpatial,
InDataType, InDataType,
WeiDataType, WeiDataType,
CShuffleDataType, AccDataType,
InElementOp, InElementOp,
WeiElementOp, WeiElementOp,
PassThrough>(); PassThrough>();
......
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