Skip to content

Mace
Mace

Xiaomi / Mace

通知 107
Star 40
Fork 27
Mace
Mace
提交 db275dec 编写于 作者: L liutuo
浏览文件
操作

add winograd 6x6 kernel

上级 02cadd13
隐藏空白更改
内联 并排
Showing with 10 addition and 10 deletion
mace/ops/winograd_convolution_test.cc
浏览文件 @ db275dec
...@@ -281,63 +281,63 @@ void WinogradConvolutionWithPad(const index_t batch, ...@@ -281,63 +281,63 @@ void WinogradConvolutionWithPad(const index_t batch,
TEST_F(WinogradConvlutionTest, AlignedConvolutionM2WithPad) { TEST_F(WinogradConvlutionTest, AlignedConvolutionM2WithPad) {
WinogradConvolutionWithPad<DeviceType::GPU, float>(1, 32, 32, 32, 16, WinogradConvolutionWithPad<DeviceType::GPU, float>(1, 32, 32, 32, 16,
1, 2); 1, 2);
WinogradConvolutionWithPad<DeviceType::GPU, half>(1, 32, 32, 32, 16, WinogradConvolutionWithPad<DeviceType::GPU, float>(1, 32, 32, 32, 16,
2, 2); 2, 2);
} }
TEST_F(WinogradConvlutionTest, UnAlignedConvolutionM2WithPad) { TEST_F(WinogradConvlutionTest, UnAlignedConvolutionM2WithPad) {
WinogradConvolutionWithPad<DeviceType::GPU, float>(1, 61, 67, 31, 37, WinogradConvolutionWithPad<DeviceType::GPU, float>(1, 61, 67, 31, 37,
1, 2); 1, 2);
WinogradConvolutionWithPad<DeviceType::GPU, half>(1, 61, 67, 37, 31, WinogradConvolutionWithPad<DeviceType::GPU, float>(1, 61, 67, 37, 31,
2, 2); 2, 2);
} }
TEST_F(WinogradConvlutionTest, BatchConvolutionWithM2Pad) { TEST_F(WinogradConvlutionTest, BatchConvolutionWithM2Pad) {
WinogradConvolutionWithPad<DeviceType::GPU, float>(3, 64, 64, 32, 32, WinogradConvolutionWithPad<DeviceType::GPU, float>(3, 64, 64, 32, 32,
1, 2); 1, 2);
WinogradConvolutionWithPad<DeviceType::GPU, half>(5, 61, 67, 37, 31, WinogradConvolutionWithPad<DeviceType::GPU, float>(5, 61, 67, 37, 31,
2, 2); 2, 2);
} }
TEST_F(WinogradConvlutionTest, AlignedConvolutionM6WithPad) { TEST_F(WinogradConvlutionTest, AlignedConvolutionM6WithPad) {
WinogradConvolutionWithPad<DeviceType::GPU, float>(1, 32, 32, 32, 16, WinogradConvolutionWithPad<DeviceType::GPU, float>(1, 32, 32, 32, 16,
1, 6); 1, 6);
WinogradConvolutionWithPad<DeviceType::GPU, half>(1, 32, 32, 32, 16, WinogradConvolutionWithPad<DeviceType::GPU, float>(1, 32, 32, 32, 16,
2, 6); 2, 6);
} }
TEST_F(WinogradConvlutionTest, UnAlignedConvolutionM6WithPad) { TEST_F(WinogradConvlutionTest, UnAlignedConvolutionM6WithPad) {
WinogradConvolutionWithPad<DeviceType::GPU, float>(1, 61, 67, 31, 37, WinogradConvolutionWithPad<DeviceType::GPU, float>(1, 61, 67, 31, 37,
1, 6); 1, 6);
WinogradConvolutionWithPad<DeviceType::GPU, half>(1, 61, 67, 37, 31, WinogradConvolutionWithPad<DeviceType::GPU, float>(1, 61, 67, 37, 31,
2, 6); 2, 6);
} }
TEST_F(WinogradConvlutionTest, BatchConvolutionWithM6Pad) { TEST_F(WinogradConvlutionTest, BatchConvolutionWithM6Pad) {
WinogradConvolutionWithPad<DeviceType::GPU, float>(3, 64, 64, 32, 32, WinogradConvolutionWithPad<DeviceType::GPU, float>(3, 64, 64, 32, 32,
1, 6); 1, 6);
// WinogradConvolutionWithPad<DeviceType::GPU, half>(5, 61, 67, 37, 31, WinogradConvolutionWithPad<DeviceType::GPU, float>(5, 61, 67, 37, 31,
// 2, 6); 2, 6);
} }
TEST_F(WinogradConvlutionTest, AlignedConvolutionM4WithPad) { TEST_F(WinogradConvlutionTest, AlignedConvolutionM4WithPad) {
WinogradConvolutionWithPad<DeviceType::GPU, float>(1, 32, 32, 32, 16, WinogradConvolutionWithPad<DeviceType::GPU, float>(1, 32, 32, 32, 16,
1, 4); 1, 4);
WinogradConvolutionWithPad<DeviceType::GPU, half>(1, 32, 32, 32, 16, WinogradConvolutionWithPad<DeviceType::GPU, float>(1, 32, 32, 32, 16,
2, 4); 2, 4);
} }
TEST_F(WinogradConvlutionTest, UnAlignedConvolutionM4WithPad) { TEST_F(WinogradConvlutionTest, UnAlignedConvolutionM4WithPad) {
WinogradConvolutionWithPad<DeviceType::GPU, float>(1, 61, 67, 31, 37, WinogradConvolutionWithPad<DeviceType::GPU, float>(1, 61, 67, 31, 37,
1, 4); 1, 4);
WinogradConvolutionWithPad<DeviceType::GPU, half>(1, 61, 67, 37, 31, WinogradConvolutionWithPad<DeviceType::GPU, float>(1, 61, 67, 37, 31,
2, 4); 2, 4);
} }
TEST_F(WinogradConvlutionTest, BatchConvolutionWithM4Pad) { TEST_F(WinogradConvlutionTest, BatchConvolutionWithM4Pad) {
WinogradConvolutionWithPad<DeviceType::GPU, float>(3, 64, 64, 32, 32, WinogradConvolutionWithPad<DeviceType::GPU, float>(3, 64, 64, 32, 32,
1, 4); 1, 4);
WinogradConvolutionWithPad<DeviceType::GPU, half>(5, 61, 67, 37, 31, WinogradConvolutionWithPad<DeviceType::GPU, float>(5, 61, 67, 37, 31,
2, 4); 2, 4);
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或