Skip to content

Mace
Mace

慢慢CG / Mace
与 Fork 源项目一致

Fork自 Xiaomi / Mace

通知 1
Star 0
Fork 0
Mace
Mace
“70c05971a98f510d824cf4877d68ec03a49ab1f7”上不存在“mobile/src/operators/kernel/conv_add_relu_kernel.h”
提交 feb234de 编写于 作者: L Liangliang He
浏览文件
操作

Merge branch 'google-coding-style' into 'master' 

fix issue 149  google C++ coding style

See merge request !310
上级 cf234f2a f161d43b
隐藏空白更改
内联 并排
Showing with 567 addition and 212 deletion
mace/core/operator.cc
浏览文件 @ feb234de
......@@ -62,6 +62,8 @@ std::unique_ptr<OperatorBase> OperatorRegistry::CreateOperator(
}
}
namespace ops {
extern void Register_Activation(OperatorRegistry *op_registry);
extern void Register_AddN(OperatorRegistry *op_registry);
extern void Register_BatchNorm(OperatorRegistry *op_registry);
......@@ -88,32 +90,34 @@ extern void Register_Eltwise(OperatorRegistry *op_registry);
extern void Register_FullyConnected(OperatorRegistry *op_registry);
extern void Register_Slice(OperatorRegistry *op_registry);
} // namespace ops
OperatorRegistry::OperatorRegistry() {
Register_Activation(this);
Register_AddN(this);
Register_BatchNorm(this);
Register_BatchToSpaceND(this);
Register_BiasAdd(this);
Register_BufferToImage(this);
Register_ChannelShuffle(this);
Register_Concat(this);
Register_Conv2D(this);
Register_DepthwiseConv2d(this);
Register_FoldedBatchNorm(this);
Register_FusedConv2D(this);
Register_GlobalAvgPooling(this);
Register_ImageToBuffer(this);
Register_Pooling(this);
Register_ResizeBilinear(this);
Register_Softmax(this);
Register_SpaceToBatchND(this);
Register_MatMul(this);
Register_WinogradTransform(this);
Register_WinogradInverseTransform(this);
Register_Reshape(this);
Register_Eltwise(this);
Register_FullyConnected(this);
Register_Slice(this);
ops::Register_Activation(this);
ops::Register_AddN(this);
ops::Register_BatchNorm(this);
ops::Register_BatchToSpaceND(this);
ops::Register_BiasAdd(this);
ops::Register_BufferToImage(this);
ops::Register_ChannelShuffle(this);
ops::Register_Concat(this);
ops::Register_Conv2D(this);
ops::Register_DepthwiseConv2d(this);
ops::Register_FoldedBatchNorm(this);
ops::Register_FusedConv2D(this);
ops::Register_GlobalAvgPooling(this);
ops::Register_ImageToBuffer(this);
ops::Register_Pooling(this);
ops::Register_ResizeBilinear(this);
ops::Register_Softmax(this);
ops::Register_SpaceToBatchND(this);
ops::Register_MatMul(this);
ops::Register_WinogradTransform(this);
ops::Register_WinogradInverseTransform(this);
ops::Register_Reshape(this);
ops::Register_Eltwise(this);
ops::Register_FullyConnected(this);
ops::Register_Slice(this);
}
} // namespace mace
mace/ops/activation.cc
浏览文件 @ feb234de
......@@ -5,6 +5,7 @@
#include "mace/ops/activation.h"
namespace mace {
namespace ops {
void Register_Activation(OperatorRegistry *op_registry) {
REGISTER_OPERATOR(op_registry, OpKeyBuilder("Activation")
......@@ -26,4 +27,5 @@ void Register_Activation(OperatorRegistry *op_registry) {
ActivationOp<DeviceType::OPENCL, half>);
}
} // namespace ops
} // namespace mace
mace/ops/activation.h
浏览文件 @ feb234de
......@@ -5,10 +5,13 @@
#ifndef MACE_OPS_ACTIVATION_H_
#define MACE_OPS_ACTIVATION_H_
#include <string>
#include "mace/core/operator.h"
#include "mace/kernels/activation.h"
namespace mace {
namespace ops {
template <DeviceType D, class T>
class ActivationOp : public Operator<D, T> {
......@@ -36,6 +39,7 @@ class ActivationOp : public Operator<D, T> {
kernels::ActivationFunctor<D, T> functor_;
};
} // namespace ops
} // namespace mace
#endif // MACE_OPS_ACTIVATION_H_
mace/ops/activation_benchmark.cc
浏览文件 @ feb234de
......@@ -3,11 +3,15 @@
//
#include <string>
#include "mace/core/operator.h"
#include "mace/core/testing/test_benchmark.h"
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
template <DeviceType D, typename T>
static void ReluBenchmark(
int iters, int batch, int channels, int height, int width) {
......@@ -316,4 +320,6 @@ BM_SIGMOID(1, 3, 512, 512);
BM_SIGMOID(1, 32, 112, 112);
BM_SIGMOID(1, 64, 256, 256);
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/activation_test.cc
浏览文件 @ feb234de
......@@ -6,6 +6,8 @@
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
class ActivationOpTest : public OpsTestBase {};
......@@ -365,4 +367,6 @@ TEST_F(ActivationOpTest, OPENCLSimpleSigmoid) {
TestSimpleSigmoid<DeviceType::OPENCL>();
}
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/addn.cc
浏览文件 @ feb234de
......@@ -5,6 +5,7 @@
#include "mace/ops/addn.h"
namespace mace {
namespace ops {
void Register_AddN(OperatorRegistry *op_registry) {
REGISTER_OPERATOR(op_registry, OpKeyBuilder("AddN")
......@@ -26,4 +27,5 @@ void Register_AddN(OperatorRegistry *op_registry) {
AddNOp<DeviceType::OPENCL, half>);
}
} // namespace ops
} // namespace mace
mace/ops/addn.h
浏览文件 @ feb234de
......@@ -11,6 +11,7 @@
#include "mace/kernels/addn.h"
namespace mace {
namespace ops {
template <DeviceType D, class T>
class AddNOp : public Operator<D, T> {
......@@ -40,6 +41,7 @@ class AddNOp : public Operator<D, T> {
kernels::AddNFunctor<D, T> functor_;
};
} // namespace ops
} // namespace mace
#endif // MACE_OPS_ADDN_H_
mace/ops/addn_benchmark.cc
浏览文件 @ feb234de
......@@ -3,11 +3,15 @@
//
#include <string>
#include "mace/core/operator.h"
#include "mace/core/testing/test_benchmark.h"
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
template <DeviceType D, typename T>
static void AddNBenchmark(int iters, int inputs, int n, int h, int w, int c) {
mace::testing::StopTiming();
......@@ -75,4 +79,6 @@ BM_ADDN(4, 1, 128, 128, 3);
BM_ADDN(2, 1, 256, 256, 3);
BM_ADDN(2, 1, 512, 512, 3);
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/addn_test.cc
浏览文件 @ feb234de
......@@ -6,6 +6,8 @@
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
class AddnOpTest : public OpsTestBase {};
......@@ -62,15 +64,15 @@ TEST_F(AddnOpTest, CPUSimpleAdd3) { SimpleAdd3<DeviceType::CPU>(); }
template <DeviceType D>
void RandomTest() {
testing::internal::LogToStderr();
srand(time(NULL));
static unsigned int seed = time(NULL);
for (int round = 0; round < 10; ++round) {
// generate random input
index_t n = 1 + (rand() % 5);
index_t h = 1 + (rand() % 100);
index_t w = 1 + (rand() % 100);
index_t c = 1 + (rand() % 32);
int input_num = 2 + rand() % 3;
// generate random input
index_t n = 1 + (rand_r(&seed) % 5);
index_t h = 1 + (rand_r(&seed) % 100);
index_t w = 1 + (rand_r(&seed) % 100);
index_t c = 1 + (rand_r(&seed) % 32);
int input_num = 2 + rand_r(&seed) % 3;
// Construct graph
OpsTestNet net;
auto op_def = OpDefBuilder("AddN", "AddNTest");
......@@ -117,4 +119,6 @@ void RandomTest() {
TEST_F(AddnOpTest, OPENCLRandom) { RandomTest<DeviceType::OPENCL>(); }
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/batch_norm.cc
浏览文件 @ feb234de
......@@ -5,6 +5,7 @@
#include "mace/ops/batch_norm.h"
namespace mace {
namespace ops {
void Register_BatchNorm(OperatorRegistry *op_registry) {
REGISTER_OPERATOR(op_registry, OpKeyBuilder("BatchNorm")
......@@ -26,4 +27,5 @@ void Register_BatchNorm(OperatorRegistry *op_registry) {
BatchNormOp<DeviceType::OPENCL, half>);
}
} // namespace ops
} // namespace mace
mace/ops/batch_norm.h
浏览文件 @ feb234de
......@@ -10,6 +10,7 @@
#include "mace/kernels/batch_norm.h"
namespace mace {
namespace ops {
template <DeviceType D, class T>
class BatchNormOp : public Operator<D, T> {
......@@ -55,6 +56,7 @@ class BatchNormOp : public Operator<D, T> {
OP_OUTPUT_TAGS(OUTPUT);
};
} // namespace ops
} // namespace mace
#endif // MACE_OPS_BATCH_NORM_H_
mace/ops/batch_norm_benchmark.cc
浏览文件 @ feb234de
......@@ -8,6 +8,9 @@
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
template <DeviceType D, typename T>
static void BatchNorm(
int iters, int batch, int channels, int height, int width) {
......@@ -101,4 +104,6 @@ BM_BATCH_NORM(1, 1024, 7, 7);
BM_BATCH_NORM(32, 1, 256, 256);
BM_BATCH_NORM(32, 3, 256, 256);
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/batch_norm_test.cc
浏览文件 @ feb234de
......@@ -6,6 +6,8 @@
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
class BatchNormOpTest : public OpsTestBase {};
......@@ -75,11 +77,10 @@ TEST_F(BatchNormOpTest, SimpleCPU) { Simple<DeviceType::CPU>(); }
TEST_F(BatchNormOpTest, SimpleOPENCL) { Simple<DeviceType::OPENCL>(); }
TEST_F(BatchNormOpTest, SimpleRandomOPENCL) {
srand(time(NULL));
// generate random input
index_t batch = 1 + rand() % 10;
index_t channels = 3 + rand() % 50;
static unsigned int seed = time(NULL);
index_t batch = 1 + rand_r(&seed) % 10;
index_t channels = 3 + rand_r(&seed) % 50;
index_t height = 64;
index_t width = 64;
......@@ -147,11 +148,10 @@ TEST_F(BatchNormOpTest, SimpleRandomOPENCL) {
}
TEST_F(BatchNormOpTest, SimpleRandomHalfOPENCL) {
srand(time(NULL));
// generate random input
index_t batch = 1 + rand() % 10;
index_t channels = 3 + rand() % 50;
static unsigned int seed = time(NULL);
index_t batch = 1 + rand_r(&seed) % 10;
index_t channels = 3 + rand_r(&seed) % 50;
index_t height = 64;
index_t width = 64;
......@@ -220,11 +220,10 @@ TEST_F(BatchNormOpTest, SimpleRandomHalfOPENCL) {
}
TEST_F(BatchNormOpTest, ComplexRandomOPENCL) {
srand(time(NULL));
// generate random input
index_t batch = 1 + rand() % 10;
index_t channels = 3 + rand() % 50;
static unsigned int seed = time(NULL);
index_t batch = 1 + rand_r(&seed) % 10;
index_t channels = 3 + rand_r(&seed) % 50;
index_t height = 103;
index_t width = 113;
......@@ -292,11 +291,10 @@ TEST_F(BatchNormOpTest, ComplexRandomOPENCL) {
}
TEST_F(BatchNormOpTest, ComplexRandomHalfOPENCL) {
srand(time(NULL));
// generate random input
index_t batch = 1 + rand() % 10;
index_t channels = 3 + rand() % 50;
static unsigned int seed = time(NULL);
index_t batch = 1 + rand_r(&seed) % 10;
index_t channels = 3 + rand_r(&seed) % 50;
index_t height = 103;
index_t width = 113;
......@@ -363,4 +361,7 @@ TEST_F(BatchNormOpTest, ComplexRandomHalfOPENCL) {
kernels::BufferType::IN_OUT_CHANNEL);
ExpectTensorNear<float>(expected, *net.GetOutput("OPENCLOutput"), 0.5);
}
}
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/batch_to_space.cc
浏览文件 @ feb234de
......@@ -5,6 +5,7 @@
#include "mace/ops/batch_to_space.h"
namespace mace {
namespace ops {
void Register_BatchToSpaceND(OperatorRegistry *op_registry) {
REGISTER_OPERATOR(op_registry, OpKeyBuilder("BatchToSpaceND")
......@@ -19,4 +20,5 @@ void Register_BatchToSpaceND(OperatorRegistry *op_registry) {
BatchToSpaceNDOp<DeviceType::OPENCL, half>);
}
} // namespace ops
} // namespace mace
mace/ops/batch_to_space.h
浏览文件 @ feb234de
......@@ -2,15 +2,17 @@
// Copyright (c) 2017 XiaoMi All rights reserved.
//
#ifndef MACE_OPS_SPACE_TO_BATCH_H_
#define MACE_OPS_SPACE_TO_BATCH_H_
#ifndef MACE_OPS_BATCH_TO_SPACE_H_
#define MACE_OPS_BATCH_TO_SPACE_H_
#include <memory>
#include <vector>
#include "mace/core/operator.h"
#include "mace/kernels/space_to_batch.h"
namespace mace {
namespace ops {
template <DeviceType D, typename T>
class BatchToSpaceNDOp : public Operator<D, T> {
......@@ -68,6 +70,7 @@ class BatchToSpaceNDOp : public Operator<D, T> {
OP_OUTPUT_TAGS(OUTPUT);
};
} // namespace ops
} // namespace mace
#endif // MACE_OPS_SPACE_TO_BATCH_H_
#endif // MACE_OPS_BATCH_TO_SPACE_H_
mace/ops/batch_to_space_benchmark.cc
浏览文件 @ feb234de
......@@ -7,6 +7,9 @@
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
template <DeviceType D, typename T>
static void BMBatchToSpace(
int iters, int batch, int channels, int height, int width, int arg) {
......@@ -53,4 +56,7 @@ static void BMBatchToSpace(
BM_BATCH_TO_SPACE(128, 8, 8, 128, 2);
BM_BATCH_TO_SPACE(4, 128, 128, 32, 2);
BM_BATCH_TO_SPACE(16, 64, 64, 32, 4);
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/bias_add.cc
浏览文件 @ feb234de
......@@ -5,6 +5,7 @@
#include "mace/ops/bias_add.h"
namespace mace {
namespace ops {
void Register_BiasAdd(OperatorRegistry *op_registry) {
REGISTER_OPERATOR(op_registry, OpKeyBuilder("BiasAdd")
......@@ -26,4 +27,5 @@ void Register_BiasAdd(OperatorRegistry *op_registry) {
BiasAddOp<DeviceType::OPENCL, half>);
}
} // namespace ops
} // namespace mace
mace/ops/bias_add.h
浏览文件 @ feb234de
......@@ -2,13 +2,14 @@
// Copyright (c) 2017 XiaoMi All rights reserved.
//
#ifndef MACE_BIAS_ADD_H_
#define MACE_BIAS_ADD_H_
#ifndef MACE_OPS_BIAS_ADD_H_
#define MACE_OPS_BIAS_ADD_H_
#include "mace/core/operator.h"
#include "mace/kernels/bias_add.h"
namespace mace {
namespace ops {
template <DeviceType D, class T>
class BiasAddOp : public Operator<D, T> {
......@@ -40,6 +41,7 @@ class BiasAddOp : public Operator<D, T> {
OP_OUTPUT_TAGS(OUTPUT);
};
} // namespace ops
} // namespace mace
#endif // MACE_BIAS_ADD_H_
#endif // MACE_OPS_BIAS_ADD_H_
mace/ops/bias_add_benchmark.cc
浏览文件 @ feb234de
......@@ -8,6 +8,9 @@
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
template <DeviceType D, typename T>
static void BiasAdd(int iters, int batch, int channels, int height, int width) {
mace::testing::StopTiming();
......@@ -77,4 +80,7 @@ BM_BIAS_ADD(1, 512, 14, 14);
BM_BIAS_ADD(1, 1024, 7, 7);
BM_BIAS_ADD(32, 1, 256, 256);
BM_BIAS_ADD(32, 3, 256, 256);
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/bias_add_test.cc
浏览文件 @ feb234de
......@@ -6,6 +6,8 @@
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
class BiasAddOpTest : public OpsTestBase {};
......@@ -60,13 +62,12 @@ TEST_F(BiasAddOpTest, BiasAddSimpleOPENCL) {
}
TEST_F(BiasAddOpTest, SimpleRandomOPENCL) {
srand(time(NULL));
// generate random input
index_t batch = 1 + rand() % 10;
index_t channels = 3 + rand() % 50;
index_t height = 64 + rand() % 50;
index_t width = 64 + rand() % 50;
static unsigned int seed = time(NULL);
index_t batch = 1 + rand_r(&seed) % 10;
index_t channels = 3 + rand_r(&seed) % 50;
index_t height = 64 + rand_r(&seed) % 50;
index_t width = 64 + rand_r(&seed) % 50;
// Construct graph
OpsTestNet net;
......@@ -110,13 +111,12 @@ TEST_F(BiasAddOpTest, SimpleRandomOPENCL) {
}
TEST_F(BiasAddOpTest, ComplexRandomOPENCL) {
srand(time(NULL));
// generate random input
index_t batch = 1 + rand() % 10;
index_t channels = 3 + rand() % 50;
index_t height = 103 + rand() % 100;
index_t width = 113 + rand() % 100;
static unsigned int seed = time(NULL);
index_t batch = 1 + rand_r(&seed) % 10;
index_t channels = 3 + rand_r(&seed) % 50;
index_t height = 103 + rand_r(&seed) % 100;
index_t width = 113 + rand_r(&seed) % 100;
// Construct graph
OpsTestNet net;
......@@ -158,4 +158,7 @@ TEST_F(BiasAddOpTest, ComplexRandomOPENCL) {
kernels::BufferType::IN_OUT_CHANNEL);
ExpectTensorNear<float>(expected, *net.GetOutput("OPENCLOutput"), 1e-2);
}
}
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/buffer_to_image.cc
浏览文件 @ feb234de
......@@ -5,6 +5,7 @@
#include "mace/ops/buffer_to_image.h"
namespace mace {
namespace ops {
void Register_BufferToImage(OperatorRegistry *op_registry) {
REGISTER_OPERATOR(op_registry, OpKeyBuilder("BufferToImage")
......@@ -20,4 +21,5 @@ void Register_BufferToImage(OperatorRegistry *op_registry) {
BufferToImageOp<DeviceType::OPENCL, half>);
}
} // namespace ops
} // namespace mace
mace/ops/buffer_to_image.h
浏览文件 @ feb234de
......@@ -9,6 +9,7 @@
#include "mace/kernels/buffer_to_image.h"
namespace mace {
namespace ops {
template <DeviceType D, typename T>
class BufferToImageOp : public Operator<D, T> {
......@@ -36,5 +37,6 @@ class BufferToImageOp : public Operator<D, T> {
OP_OUTPUT_TAGS(OUTPUT);
};
} // namespace ops
} // namespace mace
#endif // MACE_OPS_BUFFER_TO_IMAGE_H_
mace/ops/buffer_to_image_test.cc
浏览文件 @ feb234de
......@@ -5,7 +5,9 @@
#include "gtest/gtest.h"
#include "mace/ops/ops_test_util.h"
using namespace mace;
namespace mace {
namespace ops {
namespace test {
template <DeviceType D, typename T>
void TestBidirectionTransform(const int type,
......@@ -188,3 +190,7 @@ TEST(BufferToImageTest, ArgStringHalfToHalfSmall) {
TestStringHalfBidirectionTransform<DeviceType::OPENCL, half>(
kernels::ARGUMENT, {2}, input_data);
}
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/channel_shuffle.cc
浏览文件 @ feb234de
......@@ -5,6 +5,7 @@
#include "mace/ops/channel_shuffle.h"
namespace mace {
namespace ops {
void Register_ChannelShuffle(OperatorRegistry *op_registry) {
REGISTER_OPERATOR(op_registry, OpKeyBuilder("ChannelShuffle")
......@@ -24,4 +25,5 @@ void Register_ChannelShuffle(OperatorRegistry *op_registry) {
ChannelShuffleOp<DeviceType::OPENCL, half>);
}
} // namespace ops
} // namespace mace
mace/ops/channel_shuffle.h
浏览文件 @ feb234de
......@@ -11,6 +11,7 @@
#include "mace/kernels/channel_shuffle.h"
namespace mace {
namespace ops {
template <DeviceType D, typename T>
class ChannelShuffleOp : public Operator<D, T> {
......@@ -42,6 +43,7 @@ class ChannelShuffleOp : public Operator<D, T> {
kernels::ChannelShuffleFunctor<D, T> functor_;
};
} // namespace ops
} // namespace mace
#endif // MACE_OPS_CHANNEL_SHUFFLE_H_
mace/ops/channel_shuffle_benchmark.cc
浏览文件 @ feb234de
......@@ -7,10 +7,12 @@
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
template<DeviceType D, typename T>
template <DeviceType D, typename T>
static void ChannelShuffle(
int iters, int batch, int channels, int height, int width, int group) {
int iters, int batch, int channels, int height, int width, int group) {
mace::testing::StopTiming();
OpsTestNet net;
......@@ -23,15 +25,15 @@ static void ChannelShuffle(
kernels::BufferType::IN_OUT_CHANNEL);
OpDefBuilder("ChannelShuffle", "ChannelShuffleTest")
.Input("InputImage")
.Output("Output")
.AddIntArg("group", group)
.Finalize(net.NewOperatorDef());
.Input("InputImage")
.Output("Output")
.AddIntArg("group", group)
.Finalize(net.NewOperatorDef());
} else {
OpDefBuilder("Softmax", "SoftmaxBM")
.Input("Input")
.Output("Output")
.Finalize(net.NewOperatorDef());
.Input("Input")
.Output("Output")
.Finalize(net.NewOperatorDef());
}
// Warm-up
......@@ -47,18 +49,19 @@ static void ChannelShuffle(
net.Sync();
}
#define BM_CHANNEL_SHUFFLE_MACRO(N, C, H, W, G, TYPE, DEVICE) \
static void BM_CHANNEL_SHUFFLE_##N##_##C##_##H##_##W##_##G##_##TYPE##_##DEVICE( \
int iters) { \
const int64_t tot = static_cast<int64_t>(iters) * N * C * H * W; \
mace::testing::MaccProcessed(tot); \
mace::testing::BytesProcessed(tot *(sizeof(TYPE))); \
ChannelShuffle<DEVICE, TYPE>(iters, N, C, H, W, G); \
} \
#define BM_CHANNEL_SHUFFLE_MACRO(N, C, H, W, G, TYPE, DEVICE) \
static void \
BM_CHANNEL_SHUFFLE_##N##_##C##_##H##_##W##_##G##_##TYPE##_##DEVICE( \
int iters) { \
const int64_t tot = static_cast<int64_t>(iters) * N * C * H * W; \
mace::testing::MaccProcessed(tot); \
mace::testing::BytesProcessed(tot *(sizeof(TYPE))); \
ChannelShuffle<DEVICE, TYPE>(iters, N, C, H, W, G); \
} \
BENCHMARK(BM_CHANNEL_SHUFFLE_##N##_##C##_##H##_##W##_##G##_##TYPE##_##DEVICE)
#define BM_CHANNEL_SHUFFLE(N, C, H, W, G) \
BM_CHANNEL_SHUFFLE_MACRO(N, C, H, W, G, float, CPU); \
#define BM_CHANNEL_SHUFFLE(N, C, H, W, G) \
BM_CHANNEL_SHUFFLE_MACRO(N, C, H, W, G, float, CPU); \
BM_CHANNEL_SHUFFLE_MACRO(N, C, H, W, G, float, OPENCL); \
BM_CHANNEL_SHUFFLE_MACRO(N, C, H, W, G, half, OPENCL);
......@@ -66,4 +69,6 @@ BM_CHANNEL_SHUFFLE(1, 64, 64, 64, 8);
BM_CHANNEL_SHUFFLE(1, 64, 128, 128, 8);
BM_CHANNEL_SHUFFLE(1, 64, 256, 256, 8);
} // namespace mace
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/channel_shuffle_test.cc
浏览文件 @ feb234de
//
// Copyright (c) 2017 XiaoMi All rights reserved.
//
#include "mace/core/operator.h"
#include "mace/ops/ops_test_util.h"
using namespace mace;
namespace mace {
namespace ops {
namespace test {
class ChannelShuffleOpTest : public OpsTestBase {};
......@@ -38,30 +41,34 @@ TEST_F(ChannelShuffleOpTest, C16G4_OPENCL) {
// Add input data
net.AddInputFromArray<DeviceType::OPENCL, float>(
"Input", {1, 1, 2, 16},
{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31});
"Input", {1, 1, 2, 16},
{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31});
BufferToImage<DeviceType::OPENCL, float>(net, "Input", "InputImage",
kernels::BufferType::IN_OUT_CHANNEL);
kernels::BufferType::IN_OUT_CHANNEL);
OpDefBuilder("ChannelShuffle", "ChannelShuffleTest")
.Input("InputImage")
.Output("OutputImage")
.AddIntArg("group", 4)
.Finalize(net.NewOperatorDef());
.Input("InputImage")
.Output("OutputImage")
.AddIntArg("group", 4)
.Finalize(net.NewOperatorDef());
// Run
net.RunOp(DeviceType::OPENCL);
// Transfer output
ImageToBuffer<DeviceType::OPENCL, float>(net, "OutputImage", "Output",
kernels::BufferType::IN_OUT_CHANNEL);
kernels::BufferType::IN_OUT_CHANNEL);
// Check
auto expected = CreateTensor<float>(
{1, 1, 2, 16}, {0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15,
16, 20, 24, 28, 17, 21, 25, 29, 18, 22, 26, 30, 19, 23, 27, 31});
{1, 1, 2, 16},
{0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15,
16, 20, 24, 28, 17, 21, 25, 29, 18, 22, 26, 30, 19, 23, 27, 31});
ExpectTensorNear<float>(*expected, *net.GetOutput("Output"), 0.001);
}
\ No newline at end of file
}
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/concat.cc
浏览文件 @ feb234de
......@@ -5,6 +5,7 @@
#include "mace/ops/concat.h"
namespace mace {
namespace ops {
void Register_Concat(OperatorRegistry *op_registry) {
REGISTER_OPERATOR(op_registry, OpKeyBuilder("Concat")
......@@ -25,4 +26,5 @@ void Register_Concat(OperatorRegistry *op_registry) {
ConcatOp<DeviceType::OPENCL, half>);
}
} // namespace ops
} // namespace mace
mace/ops/concat.h
浏览文件 @ feb234de
......@@ -5,9 +5,13 @@
#ifndef MACE_OPS_CONCAT_H_
#define MACE_OPS_CONCAT_H_
#include <vector>
#include "mace/core/operator.h"
#include "mace/kernels/concat.h"
namespace mace {
namespace ops {
template <DeviceType D, typename T>
class ConcatOp : public Operator<D, T> {
......@@ -41,6 +45,7 @@ class ConcatOp : public Operator<D, T> {
OP_OUTPUT_TAGS(OUTPUT);
};
} // namespace ops
} // namespace mace
#endif // MACE_OPS_CONCAT_H_
mace/ops/concat_benchmark.cc
浏览文件 @ feb234de
......@@ -7,6 +7,9 @@
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
template <DeviceType D, typename T>
static void ConcatHelper(int iters, int concat_dim, int dim1) {
mace::testing::StopTiming();
......@@ -106,4 +109,6 @@ BM_CONCAT_OPENCL_MACRO(3, 32, 32, 64, half);
BM_CONCAT_OPENCL_MACRO(3, 32, 32, 128, half);
BM_CONCAT_OPENCL_MACRO(3, 32, 32, 256, half);
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/concat_test.cc
浏览文件 @ feb234de
......@@ -2,11 +2,16 @@
// Copyright (c) 2017 XiaoMi All rights reserved.
//
#include "mace/ops/concat.h"
#include <string>
#include <functional>
#include "gmock/gmock.h"
#include "mace/ops/ops_test_util.h"
#include "mace/ops/concat.h"
using namespace mace;
namespace mace {
namespace ops {
namespace test {
class ConcatOpTest : public OpsTestBase {};
......@@ -87,10 +92,10 @@ TEST_F(ConcatOpTest, CPUSimpleVertical) {
}
TEST_F(ConcatOpTest, CPURandom) {
srand(time(nullptr));
static unsigned int seed = time(NULL);
int dim = 5;
int num_inputs = 2 + rand() % 10;
int axis = rand() % dim;
int num_inputs = 2 + rand_r(&seed) % 10;
int axis = rand_r(&seed) % dim;
// Construct graph
OpsTestNet net;
auto builder = OpDefBuilder("Concat", "ConcatTest");
......@@ -108,7 +113,7 @@ TEST_F(ConcatOpTest, CPURandom) {
std::vector<float *> input_ptrs(num_inputs, nullptr);
index_t concat_axis_size = 0;
for (int i = 0; i < num_inputs; ++i) {
input_shapes[i][axis] = 1 + rand() % dim;
input_shapes[i][axis] = 1 + rand_r(&seed) % dim;
concat_axis_size += input_shapes[i][axis];
GenerateRandomRealTypeData(input_shapes[i], inputs[i]);
input_ptrs[i] = inputs[i].data();
......@@ -216,4 +221,8 @@ TEST_F(ConcatOpTest, OPENCLUnAligned) {
TEST_F(ConcatOpTest, OPENCLAlignedMultiInput) {
OpenclRandomTest<float>(
{{3, 32, 32, 32}, {3, 32, 32, 32}, {3, 32, 32, 32}, {3, 32, 32, 32}}, 3);
}
\ No newline at end of file
}
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/conv_2d.cc
浏览文件 @ feb234de
......@@ -5,6 +5,7 @@
#include "mace/ops/conv_2d.h"
namespace mace {
namespace ops {
void Register_Conv2D(OperatorRegistry *op_registry) {
REGISTER_OPERATOR(op_registry, OpKeyBuilder("Conv2D")
......@@ -26,4 +27,5 @@ void Register_Conv2D(OperatorRegistry *op_registry) {
Conv2dOp<DeviceType::OPENCL, half>);
}
} // namespace ops
} // namespace mace
mace/ops/conv_2d.h
浏览文件 @ feb234de
......@@ -12,6 +12,7 @@
#include "mace/ops/conv_pool_2d_base.h"
namespace mace {
namespace ops {
template <DeviceType D, typename T>
class Conv2dOp : public ConvPool2dOpBase<D, T> {
......@@ -44,6 +45,7 @@ class Conv2dOp : public ConvPool2dOpBase<D, T> {
OP_OUTPUT_TAGS(OUTPUT);
};
} // namespace ops
} // namespace mace
#endif // MACE_OPS_CONV_2D_H_
mace/ops/conv_2d_benchmark.cc
浏览文件 @ feb234de
......@@ -10,6 +10,8 @@
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
template <DeviceType D, typename T>
static void Conv2d(int iters,
......@@ -139,4 +141,6 @@ BM_CONV_2D(1, 32, 256, 256, 3, 3, 1, 4, VALID, 32);
BM_CONV_2D(1, 128, 56, 56, 1, 1, 1, 1, SAME, 128);
BM_CONV_2D(1, 1024, 7, 7, 1, 1, 1, 1, SAME, 1024);
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/conv_2d_test.cc
浏览文件 @ feb234de
......@@ -2,11 +2,15 @@
// Copyright (c) 2017 XiaoMi All rights reserved.
//
#include "mace/ops/conv_2d.h"
#include <fstream>
#include <vector>
#include "mace/ops/conv_2d.h"
#include "mace/ops/ops_test_util.h"
using namespace mace;
namespace mace {
namespace ops {
namespace test {
class Conv2dOpTest : public OpsTestBase {};
......@@ -347,14 +351,13 @@ static void TestComplexConvNxNS12(const std::vector<index_t> &shape,
testing::internal::LogToStderr();
auto func = [&](int kernel_h, int kernel_w, int stride_h, int stride_w,
Padding type) {
srand(time(NULL));
// generate random input
index_t batch = 3 + (rand() % 10);
static unsigned int seed = time(NULL);
index_t batch = 3 + (rand_r(&seed) % 10);
index_t height = shape[0];
index_t width = shape[1];
index_t input_channels = shape[2] + (rand() % 10);
index_t output_channels = shape[3] + (rand() % 10);
index_t input_channels = shape[2] + (rand_r(&seed) % 10);
index_t output_channels = shape[3] + (rand_r(&seed) % 10);
// Construct graph
OpsTestNet net;
OpDefBuilder("Conv2D", "Conv2dTest")
......@@ -729,3 +732,7 @@ TEST_F(Conv2dOpTest, OPENCLAlignedPad2) {
TEST_F(Conv2dOpTest, OPENCLUnalignedPad4) {
TestArbitraryPadConvNxN<DeviceType::OPENCL, float>({107, 113, 5, 7}, {4, 4});
}
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/conv_pool_2d_base.h
浏览文件 @ feb234de
......@@ -5,10 +5,13 @@
#ifndef MACE_OPS_CONV_POOL_2D_BASE_H_
#define MACE_OPS_CONV_POOL_2D_BASE_H_
#include <vector>
#include "mace/core/operator.h"
#include "mace/kernels/conv_pool_2d_util.h"
namespace mace {
namespace ops {
template <DeviceType D, class T>
class ConvPool2dOpBase : public Operator<D, T> {
......@@ -29,6 +32,7 @@ class ConvPool2dOpBase : public Operator<D, T> {
std::vector<int> dilations_;
};
} // namespace ops
} // namespace mace
#endif // MACE_OPS_CONV_POOL_2D_BASE_H_
mace/ops/core_test.cc
浏览文件 @ feb234de
......@@ -5,6 +5,8 @@
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
TEST(CoreTest, INIT_MODE) {
std::vector<OperatorDef> op_defs;
......@@ -56,4 +58,6 @@ TEST(CoreTest, INIT_MODE) {
1e-5);
}
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/depthwise_conv2d.cc
浏览文件 @ feb234de
......@@ -5,6 +5,7 @@
#include "mace/ops/depthwise_conv2d.h"
namespace mace {
namespace ops {
void Register_DepthwiseConv2d(OperatorRegistry *op_registry) {
REGISTER_OPERATOR(op_registry, OpKeyBuilder("DepthwiseConv2d")
......@@ -26,4 +27,5 @@ void Register_DepthwiseConv2d(OperatorRegistry *op_registry) {
DepthwiseConv2dOp<DeviceType::OPENCL, half>);
}
} // namespace ops
} // namespace mace
mace/ops/depthwise_conv2d.h
浏览文件 @ feb234de
......@@ -6,6 +6,7 @@
#define MACE_OPS_DEPTHWISE_CONV2D_H_
#include <memory>
#include <string>
#include "mace/core/operator.h"
#include "mace/kernels/conv_2d.h"
......@@ -13,6 +14,7 @@
#include "mace/ops/conv_pool_2d_base.h"
namespace mace {
namespace ops {
template <DeviceType D, typename T>
class DepthwiseConv2dOp : public ConvPool2dOpBase<D, T> {
......@@ -48,6 +50,7 @@ class DepthwiseConv2dOp : public ConvPool2dOpBase<D, T> {
OP_OUTPUT_TAGS(OUTPUT);
};
} // namespace ops
} // namespace mace
#endif // MACE_OPS_DEPTHWISE_CONV2D_H_
mace/ops/depthwise_conv2d_benchmark.cc
浏览文件 @ feb234de
......@@ -10,6 +10,8 @@
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
template <DeviceType D, typename T>
static void DepthwiseConv2d(int iters,
......@@ -121,4 +123,6 @@ BM_DEPTHWISE_CONV_2D(1, 64, 33, 31, 3, 3, 2, SAME, 1);
BM_DEPTHWISE_CONV_2D(1, 3, 512, 512, 3, 3, 2, VALID, 1);
BM_DEPTHWISE_CONV_2D(1, 3, 512, 512, 3, 3, 2, SAME, 1);
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/depthwise_conv2d_test.cc
浏览文件 @ feb234de
......@@ -5,9 +5,9 @@
#include "mace/ops/conv_2d.h"
#include "mace/ops/ops_test_util.h"
using namespace mace;
namespace {
namespace mace {
namespace ops {
namespace test {
class DepthwiseConv2dOpTest : public OpsTestBase {};
......@@ -207,11 +207,10 @@ void TestNxNS12(const index_t height, const index_t width) {
testing::internal::LogToStderr();
auto func = [&](int kernel_h, int kernel_w, int stride_h, int stride_w,
Padding type) {
srand(time(NULL));
// generate random input
index_t batch = 1 + rand() % 5;
index_t input_channels = 3 + rand() % 16;
static unsigned int seed = time(NULL);
index_t batch = 1 + rand_r(&seed) % 5;
index_t input_channels = 3 + rand_r(&seed) % 16;
index_t multiplier = 1;
// Construct graph
OpsTestNet net;
......@@ -316,4 +315,6 @@ TEST_F(DepthwiseConv2dOpTest, OpenCLUnalignedNxNS12Half) {
TestNxNS12<DeviceType::OPENCL, half>(107, 113);
}
} // namespace
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/eltwise.cc
浏览文件 @ feb234de
......@@ -5,6 +5,7 @@
#include "mace/ops/eltwise.h"
namespace mace {
namespace ops {
void Register_Eltwise(OperatorRegistry *op_registry) {
REGISTER_OPERATOR(op_registry, OpKeyBuilder("Eltwise")
......@@ -26,4 +27,5 @@ void Register_Eltwise(OperatorRegistry *op_registry) {
EltwiseOp<DeviceType::OPENCL, half>);
}
} // namespace ops
} // namespace mace
mace/ops/eltwise.h
浏览文件 @ feb234de
......@@ -2,13 +2,14 @@
// Copyright (c) 2017 XiaoMi All rights reserved.
//
#ifndef MACE_OPS_RESHAPE_H_
#define MACE_OPS_RESHAPE_H_
#ifndef MACE_OPS_ELTWISE_H_
#define MACE_OPS_ELTWISE_H_
#include "mace/core/operator.h"
#include "mace/kernels/eltwise.h"
namespace mace {
namespace ops {
template <DeviceType D, typename T>
class EltwiseOp : public Operator<D, T> {
......@@ -44,6 +45,7 @@ class EltwiseOp : public Operator<D, T> {
OP_OUTPUT_TAGS(OUTPUT);
};
} // namespace ops
} // namespace mace
#endif // MACE_OPS_RESHAPE_H_
#endif // MACE_OPS_ELTWISE_H_
mace/ops/eltwise_benchmark.cc
浏览文件 @ feb234de
......@@ -2,13 +2,17 @@
// Copyright (c) 2017 XiaoMi All rights reserved.
//
#include "mace/kernels/eltwise.h"
#include <string>
#include "mace/core/operator.h"
#include "mace/core/testing/test_benchmark.h"
#include "mace/kernels/eltwise.h"
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
template <DeviceType D, typename T>
static void EltwiseBenchmark(
int iters, kernels::EltwiseType type, int n, int h, int w, int c) {
......@@ -81,4 +85,6 @@ BM_ELTWISE(0, 1, 240, 240, 256);
BM_ELTWISE(1, 1, 240, 240, 256);
BM_ELTWISE(2, 1, 240, 240, 256);
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/eltwise_test.cc
浏览文件 @ feb234de
......@@ -7,6 +7,8 @@
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
class EltwiseOpTest : public OpsTestBase {};
......@@ -170,4 +172,6 @@ TEST_F(EltwiseOpTest, OPENCLRandomHalf) {
{13, 32, 32, 64});
}
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/folded_batch_norm.cc
浏览文件 @ feb234de
......@@ -5,6 +5,7 @@
#include "mace/ops/folded_batch_norm.h"
namespace mace {
namespace ops {
void Register_FoldedBatchNorm(OperatorRegistry *op_registry) {
REGISTER_OPERATOR(op_registry, OpKeyBuilder("FoldedBatchNorm")
......@@ -26,4 +27,5 @@ void Register_FoldedBatchNorm(OperatorRegistry *op_registry) {
FoldedBatchNormOp<DeviceType::OPENCL, half>);
}
} // namespace ops
} // namespace mace
mace/ops/folded_batch_norm.h
浏览文件 @ feb234de
......@@ -5,10 +5,13 @@
#ifndef MACE_OPS_FOLDED_BATCH_NORM_H_
#define MACE_OPS_FOLDED_BATCH_NORM_H_
#include <string>
#include "mace/core/operator.h"
#include "mace/kernels/batch_norm.h"
namespace mace {
namespace ops {
template <DeviceType D, class T>
class FoldedBatchNormOp : public Operator<D, T> {
......@@ -48,6 +51,7 @@ class FoldedBatchNormOp : public Operator<D, T> {
OP_OUTPUT_TAGS(OUTPUT);
};
} // namespace ops
} // namespace mace
#endif // MACE_OPS_FOLDED_BATCH_NORM_H_
mace/ops/folded_batch_norm_test.cc
浏览文件 @ feb234de
......@@ -6,6 +6,8 @@
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
class FoldedBatchNormOpTest : public OpsTestBase {};
......@@ -14,12 +16,12 @@ void CalculateScaleOffset(const std::vector<float> &gamma,
const std::vector<float> &mean,
const std::vector<float> &var,
const float epsilon,
std::vector<float> &scale,
std::vector<float> &offset) {
std::vector<float> *scale,
std::vector<float> *offset) {
size_t size = gamma.size();
for (int i = 0; i < size; ++i) {
scale[i] = gamma[i] / std::sqrt(var[i] + epsilon);
offset[i] = offset[i] - mean[i] * scale[i];
(*scale)[i] = gamma[i] / std::sqrt(var[i] + epsilon);
(*offset)[i] = (*offset)[i] - mean[i] * (*scale)[i];
}
}
......@@ -32,7 +34,7 @@ void Simple() {
{5, 5, 7, 7, 9, 9, 11, 11, 13, 13, 15, 15});
std::vector<float> scale(1);
std::vector<float> offset(1);
CalculateScaleOffset({4.0f}, {2.0}, {10}, {11.67f}, 1e-3, scale, offset);
CalculateScaleOffset({4.0f}, {2.0}, {10}, {11.67f}, 1e-3, &scale, &offset);
net.AddInputFromArray<D, float>("Scale", {1}, scale);
net.AddInputFromArray<D, float>("Offset", {1}, offset);
......@@ -172,11 +174,10 @@ width});
*/
TEST_F(FoldedBatchNormOpTest, SimpleRandomOPENCL) {
srand(time(NULL));
// generate random input
index_t batch = 1 + rand() % 10;
index_t channels = 3 + rand() % 50;
static unsigned int seed = time(NULL);
index_t batch = 1 + rand_r(&seed) % 10;
index_t channels = 3 + rand_r(&seed) % 50;
index_t height = 64;
index_t width = 64;
......@@ -227,11 +228,10 @@ TEST_F(FoldedBatchNormOpTest, SimpleRandomOPENCL) {
}
TEST_F(FoldedBatchNormOpTest, SimpleRandomHalfOPENCL) {
srand(time(NULL));
// generate random input
index_t batch = 1 + rand() % 10;
index_t channels = 3 + rand() % 50;
static unsigned int seed = time(NULL);
index_t batch = 1 + rand_r(&seed) % 10;
index_t channels = 3 + rand_r(&seed) % 50;
index_t height = 64;
index_t width = 64;
......@@ -283,11 +283,10 @@ TEST_F(FoldedBatchNormOpTest, SimpleRandomHalfOPENCL) {
}
TEST_F(FoldedBatchNormOpTest, ComplexRandomOPENCL) {
srand(time(NULL));
// generate random input
index_t batch = 1 + rand() % 10;
index_t channels = 3 + rand() % 50;
static unsigned int seed = time(NULL);
index_t batch = 1 + rand_r(&seed) % 10;
index_t channels = 3 + rand_r(&seed) % 50;
index_t height = 103;
index_t width = 113;
......@@ -337,11 +336,10 @@ TEST_F(FoldedBatchNormOpTest, ComplexRandomOPENCL) {
}
TEST_F(FoldedBatchNormOpTest, ComplexRandomHalfOPENCL) {
srand(time(NULL));
// generate random input
index_t batch = 1 + rand() % 10;
index_t channels = 3 + rand() % 50;
static unsigned int seed = time(NULL);
index_t batch = 1 + rand_r(&seed) % 10;
index_t channels = 3 + rand_r(&seed) % 50;
index_t height = 103;
index_t width = 113;
......@@ -390,4 +388,7 @@ TEST_F(FoldedBatchNormOpTest, ComplexRandomHalfOPENCL) {
kernels::BufferType::IN_OUT_CHANNEL);
ExpectTensorNear<float>(expected, *net.GetOutput("OPENCLOutput"), 0.5);
}
}
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/fully_connected.cc
浏览文件 @ feb234de
......@@ -5,6 +5,7 @@
#include "mace/ops/fully_connected.h"
namespace mace {
namespace ops {
void Register_FullyConnected(OperatorRegistry *op_registry) {
REGISTER_OPERATOR(op_registry, OpKeyBuilder("FC")
......@@ -26,4 +27,5 @@ void Register_FullyConnected(OperatorRegistry *op_registry) {
FullyConnectedOp<DeviceType::OPENCL, half>);
}
} // namespace ops
} // namespace mace
mace/ops/fully_connected.h
浏览文件 @ feb234de
......@@ -5,10 +5,13 @@
#ifndef MACE_OPS_FULLY_CONNECTED_H_
#define MACE_OPS_FULLY_CONNECTED_H_
#include <string>
#include "mace/core/operator.h"
#include "mace/kernels/fully_connected.h"
namespace mace {
namespace ops {
template <DeviceType D, class T>
class FullyConnectedOp : public Operator<D, T> {
......@@ -46,6 +49,7 @@ class FullyConnectedOp : public Operator<D, T> {
OP_OUTPUT_TAGS(OUTPUT);
};
} // namespace ops
} // namespace mace
#endif // MACE_OPS_FULLY_CONNECTED_H_
mace/ops/fully_connected_benchmark.cc
浏览文件 @ feb234de
......@@ -3,11 +3,15 @@
//
#include <string>
#include "mace/core/operator.h"
#include "mace/core/testing/test_benchmark.h"
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
template <DeviceType D, typename T>
static void FCBenchmark(
int iters, int batch, int height, int width, int channel, int out_channel) {
......@@ -83,4 +87,7 @@ BM_FC(1, 16, 16, 32, 32);
BM_FC(1, 8, 8, 32, 1000);
BM_FC(1, 2, 2, 512, 2);
BM_FC(1, 7, 7, 512, 4096);
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/fully_connected_test.cc
浏览文件 @ feb234de
......@@ -3,10 +3,13 @@
//
#include <fstream>
#include "mace/core/operator.h"
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
class FullyConnectedOpTest : public OpsTestBase {};
......@@ -263,4 +266,6 @@ TEST_F(FullyConnectedOpTest, OPENCLHalfWidthFormatAligned) {
TestWXFormat<half>(1, 16, 32, 32, 32);
}
}
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/fused_conv_2d.cc
浏览文件 @ feb234de
......@@ -5,6 +5,7 @@
#include "mace/ops/fused_conv_2d.h"
namespace mace {
namespace ops {
void Register_FusedConv2D(OperatorRegistry *op_registry) {
REGISTER_OPERATOR(op_registry, OpKeyBuilder("FusedConv2D")
......@@ -26,4 +27,5 @@ void Register_FusedConv2D(OperatorRegistry *op_registry) {
FusedConv2dOp<DeviceType::OPENCL, half>);
}
} // namespace ops
} // namespace mace
mace/ops/fused_conv_2d.h
浏览文件 @ feb234de
......@@ -6,12 +6,14 @@
#define MACE_OPS_FUSED_CONV_2D_H_
#include <memory>
#include <string>
#include "mace/core/operator.h"
#include "mace/kernels/conv_2d.h"
#include "mace/ops/conv_pool_2d_base.h"
namespace mace {
namespace ops {
template <DeviceType D, typename T>
class FusedConv2dOp : public ConvPool2dOpBase<D, T> {
......@@ -46,6 +48,7 @@ class FusedConv2dOp : public ConvPool2dOpBase<D, T> {
OP_OUTPUT_TAGS(OUTPUT);
};
} // namespace ops
} // namespace mace
#endif // MACE_OPS_FUSED_CONV_2D_H_
mace/ops/fused_conv_2d_test.cc
浏览文件 @ feb234de
......@@ -2,10 +2,14 @@
// Copyright (c) 2017 XiaoMi All rights reserved.
//
#include <vector>
#include "mace/ops/fused_conv_2d.h"
#include "mace/ops/ops_test_util.h"
using namespace mace;
namespace mace {
namespace ops {
namespace test {
class FusedConv2dOpTest : public OpsTestBase {};
......@@ -274,14 +278,13 @@ static void TestComplexConvNxNS12(const std::vector<index_t> &shape) {
testing::internal::LogToStderr();
auto func = [&](int kernel_h, int kernel_w, int stride_h, int stride_w,
Padding type) {
srand(time(NULL));
// generate random input
index_t batch = 3 + (rand() % 10);
static unsigned int seed = time(NULL);
index_t batch = 3 + (rand_r(&seed) % 10);
index_t height = shape[0];
index_t width = shape[1];
index_t input_channels = shape[2] + (rand() % 10);
index_t output_channels = shape[3] + (rand() % 10);
index_t input_channels = shape[2] + (rand_r(&seed) % 10);
index_t output_channels = shape[3] + (rand_r(&seed) % 10);
// Construct graph
OpsTestNet net;
OpDefBuilder("FusedConv2D", "FusedConv2dTest")
......@@ -350,14 +353,13 @@ static void TestHalfComplexConvNxNS12(const std::vector<index_t> &shape) {
testing::internal::LogToStderr();
auto func = [&](int kernel_h, int kernel_w, int stride_h, int stride_w,
Padding type) {
srand(time(NULL));
// generate random input
index_t batch = 3 + (rand() % 10);
static unsigned int seed = time(NULL);
index_t batch = 3 + (rand_r(&seed) % 10);
index_t height = shape[0];
index_t width = shape[1];
index_t input_channels = shape[2] + (rand() % 10);
index_t output_channels = shape[3] + (rand() % 10);
index_t input_channels = shape[2] + (rand_r(&seed) % 10);
index_t output_channels = shape[3] + (rand_r(&seed) % 10);
// Construct graph
OpsTestNet net;
OpDefBuilder("FusedConv2D", "FusedConv2dTest")
......@@ -676,3 +678,7 @@ TEST_F(FusedConv2dOpTest, OPENCL15X15AtrousConvD4) {
TestGeneralHalfAtrousConv<DeviceType::OPENCL>({63, 71}, {15, 15, 16, 16},
{2, 2});
}
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/global_avg_pooling.cc
浏览文件 @ feb234de
......@@ -5,6 +5,7 @@
#include "mace/ops/global_avg_pooling.h"
namespace mace {
namespace ops {
void Register_GlobalAvgPooling(OperatorRegistry *op_registry) {
REGISTER_OPERATOR(op_registry, OpKeyBuilder("GlobalAvgPooling")
......@@ -14,4 +15,5 @@ void Register_GlobalAvgPooling(OperatorRegistry *op_registry) {
GlobalAvgPoolingOp<DeviceType::CPU, float>);
}
} // namespace ops
} // namespace mace
mace/ops/global_avg_pooling.h
浏览文件 @ feb234de
......@@ -5,10 +5,13 @@
#ifndef MACE_OPS_GLOBAL_AVG_POOLING_H_
#define MACE_OPS_GLOBAL_AVG_POOLING_H_
#include <vector>
#include "mace/core/operator.h"
#include "mace/kernels/global_avg_pooling.h"
namespace mace {
namespace ops {
template <DeviceType D, class T>
class GlobalAvgPoolingOp : public Operator<D, T> {
......@@ -38,6 +41,7 @@ class GlobalAvgPoolingOp : public Operator<D, T> {
OP_OUTPUT_TAGS(OUTPUT);
};
} // namespace ops
} // namespace mace
#endif // MACE_OPS_GLOBAL_AVG_POOLING_H_
mace/ops/global_avg_pooling_benchmark.cc
浏览文件 @ feb234de
......@@ -7,8 +7,9 @@
#include "mace/core/testing/test_benchmark.h"
#include "mace/ops/ops_test_util.h"
using namespace mace;
using namespace mace::kernels;
namespace mace {
namespace ops {
namespace test {
template <DeviceType D>
static void GlobalAvgPooling(
......@@ -53,3 +54,7 @@ static void GlobalAvgPooling(
BM_GLOBAL_AVG_POOLING(1, 3, 7, 7);
BM_GLOBAL_AVG_POOLING(1, 3, 64, 64);
BM_GLOBAL_AVG_POOLING(1, 3, 256, 256);
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/global_avg_pooling_test.cc
浏览文件 @ feb234de
......@@ -4,7 +4,9 @@
#include "mace/core/operator.h"
#include "mace/ops/ops_test_util.h"
using namespace mace;
namespace mace {
namespace ops {
namespace test {
class GlobalAvgPoolingOpTest : public OpsTestBase {};
......@@ -31,3 +33,7 @@ TEST_F(GlobalAvgPoolingOpTest, 3x7x7_CPU) {
ExpectTensorNear<float>(*expected, *net.GetOutput("Output"), 0.001);
}
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/image_to_buffer.cc
浏览文件 @ feb234de
......@@ -5,6 +5,7 @@
#include "mace/ops/image_to_buffer.h"
namespace mace {
namespace ops {
void Register_ImageToBuffer(OperatorRegistry *op_registry) {
REGISTER_OPERATOR(op_registry, OpKeyBuilder("ImageToBuffer")
......@@ -20,4 +21,5 @@ void Register_ImageToBuffer(OperatorRegistry *op_registry) {
ImageToBufferOp<DeviceType::OPENCL, half>);
}
} // namespace ops
} // namespace mace
mace/ops/image_to_buffer.h
浏览文件 @ feb234de
......@@ -9,6 +9,7 @@
#include "mace/kernels/buffer_to_image.h"
namespace mace {
namespace ops {
template <DeviceType D, typename T>
class ImageToBufferOp : public Operator<D, T> {
......@@ -35,5 +36,7 @@ class ImageToBufferOp : public Operator<D, T> {
OP_OUTPUT_TAGS(OUTPUT);
};
} // namespace ops
} // namespace mace
#endif // MACE_OPS_IMAGE_TO_BUFFER_H_
mace/ops/matmul.cc
浏览文件 @ feb234de
......@@ -5,6 +5,7 @@
#include "mace/ops/matmul.h"
namespace mace {
namespace ops {
void Register_MatMul(OperatorRegistry *op_registry) {
REGISTER_OPERATOR(op_registry, OpKeyBuilder("MatMul")
......@@ -26,4 +27,5 @@ void Register_MatMul(OperatorRegistry *op_registry) {
MatMulOp<DeviceType::OPENCL, half>);
}
} // namespace ops
} // namespace mace
mace/ops/matmul.h
浏览文件 @ feb234de
......@@ -9,6 +9,7 @@
#include "mace/kernels/matmul.h"
namespace mace {
namespace ops {
template <DeviceType D, class T>
class MatMulOp : public Operator<D, T> {
......@@ -35,6 +36,7 @@ class MatMulOp : public Operator<D, T> {
kernels::MatMulFunctor<D, T> functor_;
};
} // namespace ops
} // namespace mace
#endif // MACE_OPS_MATMUL_H_
mace/ops/matmul_benchmark.cc
浏览文件 @ feb234de
......@@ -3,11 +3,15 @@
//
#include <string>
#include "mace/core/operator.h"
#include "mace/core/testing/test_benchmark.h"
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
template <DeviceType D, typename T>
static void MatMulBenchmark(
int iters, int batch, int height, int channels, int out_width) {
......@@ -71,4 +75,7 @@ BM_MATMUL(16, 32, 128, 3969);
BM_MATMUL(16, 128, 128, 49);
BM_MATMUL(16, 128, 128, 961);
BM_MATMUL(16, 128, 128, 3969);
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/matmul_test.cc
浏览文件 @ feb234de
......@@ -3,10 +3,13 @@
//
#include <fstream>
#include "mace/core/operator.h"
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
class MatMulOpTest : public OpsTestBase {};
......@@ -170,4 +173,7 @@ TEST_F(MatMulOpTest, OPENCLHalfUnAlignedWithBatch) {
Complex<half>(16, 32, 64, 64);
Complex<half>(31, 31, 61, 67);
}
}
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/ops_test_util.h
浏览文件 @ feb234de
......@@ -2,10 +2,14 @@
// Copyright (c) 2017 XiaoMi All rights reserved.
//
#ifndef MACE_OPS_TEST_UTIL_H_
#define MACE_OPS_TEST_UTIL_H_
#ifndef MACE_OPS_OPS_TEST_UTIL_H_
#define MACE_OPS_OPS_TEST_UTIL_H_
#include <type_traits>
#include <limits>
#include <functional>
#include <vector>
#include <string>
#include "gtest/gtest.h"
#include "mace/core/net.h"
......@@ -16,6 +20,8 @@
#include "mace/utils/utils.h"
namespace mace {
namespace ops {
namespace test {
class OpDefBuilder {
public:
......@@ -95,7 +101,7 @@ class OpDefBuilder {
class OpsTestNet {
public:
OpsTestNet() : op_registry_(new OperatorRegistry()){};
OpsTestNet() : op_registry_(new OperatorRegistry()) {}
template <DeviceType D, typename T>
void AddInputFromArray(const std::string &name,
......@@ -412,6 +418,8 @@ void ImageToBuffer(OpsTestNet &net,
net.Sync();
}
} // namespace test
} // namespace ops
} // namespace mace
#endif // MACE_OPS_TEST_UTIL_H_
#endif // MACE_OPS_OPS_TEST_UTIL_H_
mace/ops/pooling.cc
浏览文件 @ feb234de
......@@ -5,6 +5,7 @@
#include "mace/ops/pooling.h"
namespace mace {
namespace ops {
void Register_Pooling(OperatorRegistry *op_registry) {
REGISTER_OPERATOR(op_registry, OpKeyBuilder("Pooling")
......@@ -30,4 +31,5 @@ void Register_Pooling(OperatorRegistry *op_registry) {
PoolingOp<DeviceType::OPENCL, half>);
}
} // namespace ops
} // namespace mace
mace/ops/pooling.h
浏览文件 @ feb234de
......@@ -5,11 +5,14 @@
#ifndef MACE_OPS_POOLING_H_
#define MACE_OPS_POOLING_H_
#include <vector>
#include "mace/core/operator.h"
#include "mace/kernels/pooling.h"
#include "mace/ops/conv_pool_2d_base.h"
namespace mace {
namespace ops {
template <DeviceType D, class T>
class PoolingOp : public ConvPool2dOpBase<D, T> {
......@@ -25,7 +28,7 @@ class PoolingOp : public ConvPool2dOpBase<D, T> {
this->strides_.data(),
this->padding_type_,
this->paddings_,
this->dilations_.data()){};
this->dilations_.data()) {}
bool Run(StatsFuture *future) override {
const Tensor *input = this->Input(INPUT);
......@@ -44,6 +47,7 @@ class PoolingOp : public ConvPool2dOpBase<D, T> {
OP_OUTPUT_TAGS(OUTPUT);
};
} // namespace ops
} // namespace mace
#endif // MACE_OPS_POOLING_H_
mace/ops/pooling_benchmark.cc
浏览文件 @ feb234de
......@@ -8,8 +8,9 @@
#include "mace/kernels/conv_pool_2d_util.h"
#include "mace/ops/ops_test_util.h"
using namespace mace;
using namespace mace::kernels;
namespace mace {
namespace ops {
namespace test {
template <DeviceType D>
static void Pooling(int iters,
......@@ -70,3 +71,7 @@ BM_POOLING(1, 3, 129, 129, 2, 2, SAME, MAX);
BM_POOLING(1, 3, 257, 257, 2, 2, SAME, MAX);
BM_POOLING(1, 3, 513, 513, 2, 2, SAME, MAX);
BM_POOLING(1, 3, 1025, 1025, 2, 2, SAME, MAX);
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/pooling_test.cc
浏览文件 @ feb234de
......@@ -9,7 +9,9 @@
#include "mace/ops/conv_pool_2d_base.h"
#include "mace/ops/ops_test_util.h"
using namespace mace;
namespace mace {
namespace ops {
namespace test {
class PoolingOpTest : public OpsTestBase {};
......@@ -393,3 +395,7 @@ TEST_F(PoolingOpTest, OPENCLUnAlignedLargeKernelAvgPooling) {
AvgPoolingTest<OPENCL, float>({3, 31, 37, 128}, {8, 8}, {8, 8},
Padding::SAME);
}
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/reshape.cc
浏览文件 @ feb234de
......@@ -5,6 +5,7 @@
#include "mace/ops/reshape.h"
namespace mace {
namespace ops {
void Register_Reshape(OperatorRegistry *op_registry) {
REGISTER_OPERATOR(op_registry, OpKeyBuilder("Reshape")
......@@ -14,4 +15,5 @@ void Register_Reshape(OperatorRegistry *op_registry) {
ReshapeOp<DeviceType::CPU, float>);
}
} // namespace ops
} // namespace mace
mace/ops/reshape.h
浏览文件 @ feb234de
......@@ -5,10 +5,13 @@
#ifndef MACE_OPS_RESHAPE_H_
#define MACE_OPS_RESHAPE_H_
#include <vector>
#include "mace/core/operator.h"
#include "mace/kernels/reshape.h"
namespace mace {
namespace ops {
template <DeviceType D, typename T>
class ReshapeOp : public Operator<D, T> {
......@@ -61,6 +64,7 @@ class ReshapeOp : public Operator<D, T> {
OP_OUTPUT_TAGS(OUTPUT);
};
} // namespace ops
} // namespace mace
#endif // MACE_OPS_RESHAPE_H_
mace/ops/reshape_test.cc
浏览文件 @ feb234de
......@@ -6,7 +6,9 @@
#include "mace/core/operator.h"
#include "mace/ops/ops_test_util.h"
using namespace mace;
namespace mace {
namespace ops {
namespace test {
class ReshapeTest : public OpsTestBase {};
......@@ -53,3 +55,7 @@ TEST_F(ReshapeTest, Complex) {
TestReshape({1, 2, 3, 4}, {-1, 1}, {24, 1});
TestReshape({1, 2, 3, 4}, {1, 3, 8}, {1, 3, 8});
}
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/resize_bilinear.cc
浏览文件 @ feb234de
......@@ -5,6 +5,7 @@
#include "mace/ops/resize_bilinear.h"
namespace mace {
namespace ops {
void Register_ResizeBilinear(OperatorRegistry *op_registry) {
REGISTER_OPERATOR(op_registry, OpKeyBuilder("ResizeBilinear")
......@@ -26,4 +27,5 @@ void Register_ResizeBilinear(OperatorRegistry *op_registry) {
ResizeBilinearOp<DeviceType::OPENCL, half>);
}
} // namespace ops
} // namespace mace
mace/ops/resize_bilinear.h
浏览文件 @ feb234de
......@@ -2,13 +2,14 @@
// Copyright (c) 2017 XiaoMi All rights reserved.
//
#ifndef MACE_RESIZE_BILINEAR_H
#define MACE_RESIZE_BILINEAR_H
#ifndef MACE_OPS_RESIZE_BILINEAR_H_
#define MACE_OPS_RESIZE_BILINEAR_H_
#include "mace/core/operator.h"
#include "mace/kernels/resize_bilinear.h"
namespace mace {
namespace ops {
template <DeviceType D, class T>
class ResizeBilinearOp : public Operator<D, T> {
......@@ -34,6 +35,7 @@ class ResizeBilinearOp : public Operator<D, T> {
kernels::ResizeBilinearFunctor<D, T> functor_;
};
} // namespace ops
} // namespace mace
#endif // MACE_RESIZE_BILINEAR_H
#endif // MACE_OPS_RESIZE_BILINEAR_H_
mace/ops/resize_bilinear_benchmark.cc
浏览文件 @ feb234de
......@@ -8,6 +8,9 @@
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
template <DeviceType D, typename T>
static void ResizeBilinearBenchmark(int iters,
int batch,
......@@ -84,4 +87,6 @@ BM_RESIZE_BILINEAR(1, 128, 240, 240, 480, 480);
BM_RESIZE_BILINEAR(1, 3, 4032, 3016, 480, 480);
BM_RESIZE_BILINEAR(1, 3, 480, 480, 4032, 3016);
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/resize_bilinear_test.cc
浏览文件 @ feb234de
......@@ -2,11 +2,15 @@
// Copyright (c) 2017 XiaoMi All rights reserved.
//
#include "mace/ops/resize_bilinear.h"
#include <vector>
#include "mace/core/operator.h"
#include "mace/ops/resize_bilinear.h"
#include "mace/ops/ops_test_util.h"
using namespace mace;
namespace mace {
namespace ops {
namespace test {
class ResizeBilinearTest : public OpsTestBase {};
......@@ -61,17 +65,16 @@ TEST_F(ResizeBilinearTest, ResizeBilinearWAlignCorners) {
template <DeviceType D>
void TestRandomResizeBilinear() {
srand(time(nullptr));
testing::internal::LogToStderr();
static unsigned int seed = time(NULL);
for (int round = 0; round < 10; ++round) {
int batch = 1 + rand() % 5;
int channels = 1 + rand() % 100;
int height = 1 + rand() % 100;
int width = 1 + rand() % 100;
int in_height = 1 + rand() % 100;
int in_width = 1 + rand() % 100;
int align_corners = rand() % 1;
int batch = 1 + rand_r(&seed) % 5;
int channels = 1 + rand_r(&seed) % 100;
int height = 1 + rand_r(&seed) % 100;
int width = 1 + rand_r(&seed) % 100;
int in_height = 1 + rand_r(&seed) % 100;
int in_width = 1 + rand_r(&seed) % 100;
int align_corners = rand_r(&seed) % 1;
// Construct graph
OpsTestNet net;
......@@ -106,7 +109,7 @@ void TestRandomResizeBilinear() {
ImageToBuffer<D, float>(net, "OutputImage", "DeviceOutput",
kernels::BufferType::IN_OUT_CHANNEL);
} else {
// TODO support NEON
// TODO(someone): support NEON
}
// Check
ExpectTensorNear<float>(expected, *net.GetOutput("DeviceOutput"), 0.001);
......@@ -122,3 +125,7 @@ TEST_F(ResizeBilinearTest, NEONRandomResizeBilinear) {
TEST_F(ResizeBilinearTest, OPENCLRandomResizeBilinear) {
TestRandomResizeBilinear<DeviceType::OPENCL>();
}
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/slice.cc
浏览文件 @ feb234de
......@@ -5,6 +5,7 @@
#include "mace/ops/slice.h"
namespace mace {
namespace ops {
void Register_Slice(OperatorRegistry *op_registry) {
REGISTER_OPERATOR(op_registry, OpKeyBuilder("Slice")
......@@ -25,4 +26,5 @@ void Register_Slice(OperatorRegistry *op_registry) {
SliceOp<DeviceType::OPENCL, half>);
}
} // namespace ops
} // namespace mace
mace/ops/slice.h
浏览文件 @ feb234de
......@@ -5,9 +5,13 @@
#ifndef MACE_OPS_SLICE_H_
#define MACE_OPS_SLICE_H_
#include <vector>
#include "mace/core/operator.h"
#include "mace/kernels/slice.h"
namespace mace {
namespace ops {
template <DeviceType D, typename T>
class SliceOp : public Operator<D, T> {
......@@ -32,6 +36,7 @@ class SliceOp : public Operator<D, T> {
OP_INPUT_TAGS(INPUT);
};
} // namespace ops
} // namespace mace
#endif // MACE_OPS_SLICE_H_
mace/ops/slice_benchmark.cc
浏览文件 @ feb234de
......@@ -7,6 +7,9 @@
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
template<DeviceType D, typename T>
static void BMSliceHelper(int iters,
const std::vector<index_t> &input_shape,
......@@ -75,5 +78,6 @@ BM_SLICE(1, 32, 32, 256, 2);
BM_SLICE(1, 128, 128, 32, 2);
BM_SLICE(1, 128, 128, 128, 2);
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/slice_test.cc
浏览文件 @ feb234de
......@@ -2,22 +2,26 @@
// Copyright (c) 2017 XiaoMi All rights reserved.
//
#include <functional>
#include "gmock/gmock.h"
#include "mace/ops/slice.h"
#include "mace/ops/ops_test_util.h"
#include "gmock/gmock.h"
using namespace mace;
namespace mace {
namespace ops {
namespace test {
class SliceOpTest : public OpsTestBase {};
template<DeviceType D, typename T>
void RandomTest(const int num_outputs) {
srand(time(nullptr));
const index_t output_channels = 4 * (1 + rand() % 10);
static unsigned int seed = time(NULL);
const index_t output_channels = 4 * (1 + rand_r(&seed) % 10);
const index_t input_channels = num_outputs * output_channels;
const index_t batch = 3 + (rand() % 10);
const index_t height = 13 + (rand() % 10);
const index_t width = 17 + (rand() % 10);
const index_t batch = 3 + (rand_r(&seed) % 10);
const index_t height = 13 + (rand_r(&seed) % 10);
const index_t width = 17 + (rand_r(&seed) % 10);
// Construct graph
OpsTestNet net;
......@@ -47,7 +51,6 @@ void RandomTest(const int num_outputs) {
builder = builder.Output(MakeString("Output", i));
}
builder.Finalize(net.NewOperatorDef());
}
// Run
......@@ -97,3 +100,7 @@ TEST_F(SliceOpTest, OPENCLHalf) {
RandomTest<DeviceType::OPENCL, half>(4);
RandomTest<DeviceType::OPENCL, half>(11);
}
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/softmax.cc
浏览文件 @ feb234de
......@@ -5,6 +5,7 @@
#include "mace/ops/softmax.h"
namespace mace {
namespace ops {
void Register_Softmax(OperatorRegistry *op_registry) {
REGISTER_OPERATOR(op_registry, OpKeyBuilder("Softmax")
......@@ -26,4 +27,5 @@ void Register_Softmax(OperatorRegistry *op_registry) {
SoftmaxOp<DeviceType::OPENCL, half>);
}
} // namespace ops
} // namespace mace
mace/ops/softmax.h
浏览文件 @ feb234de
......@@ -2,13 +2,14 @@
// Copyright (c) 2017 XiaoMi All rights reserved.
//
#ifndef MACE_SOFTMAX_H_
#define MACE_SOFTMAX_H_
#ifndef MACE_OPS_SOFTMAX_H_
#define MACE_OPS_SOFTMAX_H_
#include "mace/core/operator.h"
#include "mace/kernels/softmax.h"
namespace mace {
namespace ops {
template <DeviceType D, class T>
class SoftmaxOp : public Operator<D, T> {
......@@ -34,6 +35,7 @@ class SoftmaxOp : public Operator<D, T> {
OP_OUTPUT_TAGS(OUTPUT);
};
} // namespace ops
} // namespace mace
#endif // MACE_SOFTMAX_H_
#endif // MACE_OPS_SOFTMAX_H_
mace/ops/softmax_benchmark.cc
浏览文件 @ feb234de
......@@ -3,11 +3,15 @@
//
#include <string>
#include "mace/core/operator.h"
#include "mace/core/testing/test_benchmark.h"
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
template <DeviceType D, typename T>
static void SoftmaxBenchmark(
int iters, int batch, int channels, int height, int width) {
......@@ -66,4 +70,7 @@ BM_SOFTMAX(1, 3, 512, 512);
BM_SOFTMAX(1, 4, 512, 512);
BM_SOFTMAX(1, 10, 256, 256);
BM_SOFTMAX(1, 1024, 7, 7);
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/softmax_test.cc
浏览文件 @ feb234de
......@@ -6,6 +6,8 @@
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
class SoftmaxOpTest : public OpsTestBase {};
......@@ -102,4 +104,6 @@ TEST_F(SoftmaxOpTest, OPENCLUnAligned) {
Complex<DeviceType::OPENCL>({5, 211, 107, 1});
}
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/space_to_batch.cc
浏览文件 @ feb234de
......@@ -5,6 +5,7 @@
#include "mace/ops/space_to_batch.h"
namespace mace {
namespace ops {
void Register_SpaceToBatchND(OperatorRegistry *op_registry) {
REGISTER_OPERATOR(op_registry, OpKeyBuilder("SpaceToBatchND")
......@@ -19,4 +20,5 @@ void Register_SpaceToBatchND(OperatorRegistry *op_registry) {
SpaceToBatchNDOp<DeviceType::OPENCL, half>);
}
} // namespace ops
} // namespace mace
mace/ops/space_to_batch.h
浏览文件 @ feb234de
......@@ -6,11 +6,13 @@
#define MACE_OPS_SPACE_TO_BATCH_H_
#include <memory>
#include <vector>
#include "mace/core/operator.h"
#include "mace/kernels/space_to_batch.h"
namespace mace {
namespace ops {
template <DeviceType D, typename T>
class SpaceToBatchNDOp : public Operator<D, T> {
......@@ -71,6 +73,7 @@ class SpaceToBatchNDOp : public Operator<D, T> {
OP_OUTPUT_TAGS(OUTPUT);
};
} // namespace ops
} // namespace mace
#endif // MACE_OPS_SPACE_TO_BATCH_H_
mace/ops/space_to_batch_benchmark.cc
浏览文件 @ feb234de
......@@ -7,6 +7,9 @@
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
template <DeviceType D, typename T>
static void BMSpaceToBatch(
int iters, int batch, int height, int width, int channels, int shape) {
......@@ -55,4 +58,7 @@ static void BMSpaceToBatch(
BM_SPACE_TO_BATCH(128, 16, 16, 128, 2);
BM_SPACE_TO_BATCH(1, 256, 256, 32, 2);
BM_SPACE_TO_BATCH(1, 256, 256, 32, 4);
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/space_to_batch_test.cc
浏览文件 @ feb234de
......@@ -3,10 +3,13 @@
//
#include <fstream>
#include "gtest/gtest.h"
#include "mace/ops/ops_test_util.h"
using namespace mace;
namespace mace {
namespace ops {
namespace test {
template <DeviceType D>
void RunSpaceToBatch(const std::vector<index_t> &input_shape,
......@@ -216,3 +219,7 @@ TEST(SpaceToBatchTest, MultiBatchAndChannelData) {
// {2, 2, 2, 2},
// space_tensor.get());
//}
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/winograd_convolution_test.cc
浏览文件 @ feb234de
......@@ -3,11 +3,14 @@
//
#include <fstream>
#include "mace/core/operator.h"
#include "mace/kernels/conv_pool_2d_util.h"
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
class WinogradConvlutionTest : public OpsTestBase {};
......@@ -39,7 +42,7 @@ void WinogradConvolution(const index_t batch,
const index_t in_channels,
const index_t out_channels,
const Padding padding) {
srand(time(NULL));
// srand(time(NULL));
// Construct graph
OpsTestNet net;
......@@ -156,7 +159,7 @@ void WinogradConvolutionWithPad(const index_t batch,
const index_t in_channels,
const index_t out_channels,
const int padding) {
srand(time(NULL));
// srand(time(NULL));
// Construct graph
OpsTestNet net;
......@@ -245,9 +248,6 @@ void WinogradConvolutionWithPad(const index_t batch,
}
}
TEST_F(WinogradConvlutionTest, UnAlignedConvolutionPad2) {
WinogradConvolutionWithPad<DeviceType::OPENCL, float>(1, 64, 64, 40, 19, 2);
WinogradConvolutionWithPad<DeviceType::OPENCL, float>(1, 32, 32, 96, 109, 2);
}
}
} // namespace test
} // namespace ops
} // namespace mace
mace/ops/winograd_inverse_transform.cc
浏览文件 @ feb234de
......@@ -5,6 +5,7 @@
#include "mace/ops/winograd_inverse_transform.h"
namespace mace {
namespace ops {
void Register_WinogradInverseTransform(OperatorRegistry *op_registry) {
REGISTER_OPERATOR(op_registry, OpKeyBuilder("WinogradInverseTransform")
......@@ -19,4 +20,5 @@ void Register_WinogradInverseTransform(OperatorRegistry *op_registry) {
WinogradInverseTransformOp<DeviceType::OPENCL, half>);
}
} // namespace ops
} // namespace mace
mace/ops/winograd_inverse_transform.h
浏览文件 @ feb234de
......@@ -6,12 +6,14 @@
#define MACE_OPS_WINOGRAD_INVERSE_TRANSFORM_H_
#include <memory>
#include <string>
#include "mace/core/operator.h"
#include "mace/kernels/activation.h"
#include "mace/kernels/winograd_transform.h"
namespace mace {
namespace ops {
template <DeviceType D, typename T>
class WinogradInverseTransformOp : public Operator<D, T> {
......@@ -42,6 +44,7 @@ class WinogradInverseTransformOp : public Operator<D, T> {
OP_OUTPUT_TAGS(OUTPUT);
};
} // namespace ops
} // namespace mace
#endif // MACE_OPS_WINOGRAD_INVERSE_TRANSFORM_H_
mace/ops/winograd_transform.cc
浏览文件 @ feb234de
......@@ -5,6 +5,7 @@
#include "mace/ops/winograd_transform.h"
namespace mace {
namespace ops {
void Register_WinogradTransform(OperatorRegistry *op_registry) {
REGISTER_OPERATOR(op_registry, OpKeyBuilder("WinogradTransform")
......@@ -19,4 +20,5 @@ void Register_WinogradTransform(OperatorRegistry *op_registry) {
WinogradTransformOp<DeviceType::OPENCL, half>);
}
} // namespace ops
} // namespace mace
mace/ops/winograd_transform.h
浏览文件 @ feb234de
......@@ -11,6 +11,7 @@
#include "mace/kernels/winograd_transform.h"
namespace mace {
namespace ops {
template <DeviceType D, typename T>
class WinogradTransformOp : public Operator<D, T> {
......@@ -37,6 +38,7 @@ class WinogradTransformOp : public Operator<D, T> {
OP_OUTPUT_TAGS(OUTPUT);
};
} // namespace ops
} // namespace mace
#endif // MACE_OPS_WINOGRAD_TRANSFORM_H_
mace/ops/winograd_transform_benchmark.cc
浏览文件 @ feb234de
......@@ -7,6 +7,9 @@
#include "mace/ops/ops_test_util.h"
namespace mace {
namespace ops {
namespace test {
template <DeviceType D, typename T>
static void BMWinogradTransform(
int iters, int batch, int height, int width, int channels) {
......@@ -105,4 +108,6 @@ BM_WINOGRAD_INVERSE_TRANSFORM(1, 14, 14, 32);
BM_WINOGRAD_INVERSE_TRANSFORM(1, 62, 62, 32);
BM_WINOGRAD_INVERSE_TRANSFORM(1, 126, 126, 32);
} // namespace test
} // namespace ops
} // namespace mace
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或