From 5c47bbff375eb44d86f90f0fee87e57159b5c7fc Mon Sep 17 00:00:00 2001 From: liuqi Date: Fri, 1 Dec 2017 14:07:31 +0800 Subject: [PATCH] Rename is_relu to fused_relu. --- mace/kernels/opencl/conv_2d_opencl.cc | 10 +++++----- mace/kernels/opencl/conv_2d_opencl_1x1.cc | 12 ++++++------ mace/kernels/opencl/conv_2d_opencl_3x3.cc | 12 ++++++------ mace/kernels/opencl/fused_conv_2d_opencl.cc | 10 +++++----- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/mace/kernels/opencl/conv_2d_opencl.cc b/mace/kernels/opencl/conv_2d_opencl.cc index 40663ea0..cb48be92 100644 --- a/mace/kernels/opencl/conv_2d_opencl.cc +++ b/mace/kernels/opencl/conv_2d_opencl.cc @@ -9,22 +9,22 @@ namespace mace { namespace kernels { extern void Conv2dOpenclK1x1S1(const Tensor *input, const Tensor *filter, - const Tensor *bias, const bool is_relu, + const Tensor *bias, const bool fused_relu, const int *padding, const DataType dt, Tensor *output); extern void Conv2dOpenclK1x1S2(const Tensor *input, const Tensor *filter, - const Tensor *bias, const bool is_relu, + const Tensor *bias, const bool fused_relu, const int *padding, const DataType dt, Tensor *output); extern void Conv2dOpenclK3x3S1(const Tensor *input, const Tensor *filter, - const Tensor *bias, const bool is_relu, + const Tensor *bias, const bool fused_relu, const int *padding, const DataType dt, Tensor *output); extern void Conv2dOpenclK3x3S2(const Tensor *input, const Tensor *filter, - const Tensor *bias, const bool is_relu, + const Tensor *bias, const bool fused_relu, const int *padding, const DataType dt, Tensor *output); @@ -34,7 +34,7 @@ void Conv2dFunctor::operator()(const Tensor *input, const Tensor *bias, Tensor *output) { typedef void (*Conv2dOpenclFunction)(const Tensor *input, const Tensor *filter, - const Tensor *bias, const bool is_relu, + const Tensor *bias, const bool fused_relu, const int *padding, const DataType dt, Tensor *output); // Selection matrix: kernel_size x stride_size diff --git a/mace/kernels/opencl/conv_2d_opencl_1x1.cc b/mace/kernels/opencl/conv_2d_opencl_1x1.cc index b460eee9..c3a17c7b 100644 --- a/mace/kernels/opencl/conv_2d_opencl_1x1.cc +++ b/mace/kernels/opencl/conv_2d_opencl_1x1.cc @@ -14,7 +14,7 @@ namespace kernels { void Conv1x1(const Tensor *input, const Tensor *filter, const Tensor *bias, - const bool is_relu, + const bool fused_relu, const int stride, const DataType dt, Tensor *output) { @@ -40,7 +40,7 @@ void Conv1x1(const Tensor *input, if (bias != nullptr) { built_options.emplace("-DBIAS"); } - if (is_relu) { + if (fused_relu) { built_options.emplace("-DFUSED_RELU"); } @@ -78,21 +78,21 @@ void Conv1x1(const Tensor *input, extern void Conv2dOpenclK1x1S1(const Tensor *input, const Tensor *filter, const Tensor *bias, - const bool is_relu, + const bool fused_relu, const int *padding, const DataType dt, Tensor *output) { - Conv1x1(input, filter, bias, is_relu, 1, dt, output); + Conv1x1(input, filter, bias, fused_relu, 1, dt, output); }; extern void Conv2dOpenclK1x1S2(const Tensor *input, const Tensor *filter, const Tensor *bias, - const bool is_relu, + const bool fused_relu, const int *padding, const DataType dt, Tensor *output) { - Conv1x1(input, filter, bias, is_relu, 2, dt, output); + Conv1x1(input, filter, bias, fused_relu, 2, dt, output); }; } // namespace kernels diff --git a/mace/kernels/opencl/conv_2d_opencl_3x3.cc b/mace/kernels/opencl/conv_2d_opencl_3x3.cc index cd12c3b7..e29c4d92 100644 --- a/mace/kernels/opencl/conv_2d_opencl_3x3.cc +++ b/mace/kernels/opencl/conv_2d_opencl_3x3.cc @@ -12,7 +12,7 @@ namespace mace { namespace kernels { static void Conv2d3x3S12(const Tensor *input, const Tensor *filter, - const Tensor *bias, const bool is_relu, + const Tensor *bias, const bool fused_relu, const uint32_t stride, const int *padding, const DataType dt, Tensor *output) { const index_t batch = output->dim(0); @@ -30,7 +30,7 @@ static void Conv2d3x3S12(const Tensor *input, const Tensor *filter, built_options.emplace("-DCMD_DATA_TYPE=" + DataTypeToOPENCLCMDDataType(dt)); built_options.emplace(bias != nullptr ? "-DBIAS" : ""); built_options.emplace("-DSTRIDE=" + ToString(stride)); - if (is_relu) { + if (fused_relu) { built_options.emplace("-DFUSED_RELU"); } @@ -69,21 +69,21 @@ static void Conv2d3x3S12(const Tensor *input, const Tensor *filter, void Conv2dOpenclK3x3S1(const Tensor *input, const Tensor *filter, const Tensor *bias, - const bool is_relu, + const bool fused_relu, const int *padding, const DataType dt, Tensor *output) { - Conv2d3x3S12(input, filter, bias, is_relu, 1, padding, dt, output); + Conv2d3x3S12(input, filter, bias, fused_relu, 1, padding, dt, output); }; void Conv2dOpenclK3x3S2(const Tensor *input, const Tensor *filter, const Tensor *bias, - const bool is_relu, + const bool fused_relu, const int *padding, const DataType dt, Tensor *output) { - Conv2d3x3S12(input, filter, bias, is_relu, 2, padding, dt, output); + Conv2d3x3S12(input, filter, bias, fused_relu, 2, padding, dt, output); }; } // namespace kernels diff --git a/mace/kernels/opencl/fused_conv_2d_opencl.cc b/mace/kernels/opencl/fused_conv_2d_opencl.cc index 786b4557..8e75cb9d 100644 --- a/mace/kernels/opencl/fused_conv_2d_opencl.cc +++ b/mace/kernels/opencl/fused_conv_2d_opencl.cc @@ -9,22 +9,22 @@ namespace mace { namespace kernels { extern void Conv2dOpenclK1x1S1(const Tensor *input, const Tensor *filter, - const Tensor *bias, const bool is_relu, + const Tensor *bias, const bool fused_relu, const int *padding, const DataType dt, Tensor *output); extern void Conv2dOpenclK1x1S2(const Tensor *input, const Tensor *filter, - const Tensor *bias, const bool is_relu, + const Tensor *bias, const bool fused_relu, const int *padding, const DataType dt, Tensor *output); extern void Conv2dOpenclK3x3S1(const Tensor *input, const Tensor *filter, - const Tensor *bias, const bool is_relu, + const Tensor *bias, const bool fused_relu, const int *padding, const DataType dt, Tensor *output); extern void Conv2dOpenclK3x3S2(const Tensor *input, const Tensor *filter, - const Tensor *bias, const bool is_relu, + const Tensor *bias, const bool fused_relu, const int *padding, const DataType dt, Tensor *output); @@ -34,7 +34,7 @@ void FusedConv2dFunctor::operator()(const Tensor *input, const Tensor *bias, Tensor *output) { typedef void (*Conv2dOpenclFunction)(const Tensor *input, const Tensor *filter, - const Tensor *bias, const bool is_relu, + const Tensor *bias, const bool fused_relu, const int *padding, const DataType dt, Tensor *output); // Selection matrix: kernel_size x stride_size -- GitLab