From 0d1e46152895c522c90d5bcf70267d81caf8547e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=AF=85?= Date: Tue, 22 May 2018 16:42:00 +0800 Subject: [PATCH] Make ndk15+ happy --- mace/kernels/transpose.h | 3 ++- mace/ops/conv_2d_benchmark.cc | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mace/kernels/transpose.h b/mace/kernels/transpose.h index 5f42b8ad..3e52de1a 100644 --- a/mace/kernels/transpose.h +++ b/mace/kernels/transpose.h @@ -73,7 +73,8 @@ static void TransposeNCHWToNHWCC2(const float *input, for (w = 0; w + 3 < width; w += 4) { float32x4_t vi0 = vld1q_f32(input + in_offset); float32x4_t vi1 = vld1q_f32(input + in_offset + image_size); - vst2q_f32(output + out_offset, {vi0, vi1}); + float32x4x2_t vi = {vi0, vi1}; + vst2q_f32(output + out_offset, vi); in_offset += 4; out_offset += 8; diff --git a/mace/ops/conv_2d_benchmark.cc b/mace/ops/conv_2d_benchmark.cc index d935c503..4a5d80e4 100644 --- a/mace/ops/conv_2d_benchmark.cc +++ b/mace/ops/conv_2d_benchmark.cc @@ -168,7 +168,6 @@ BM_CONV_2D(1, 1024, 7, 7, 1, 1, 1, 1, SAME, 1024); BM_CONV_2D(64, 32, 34, 34, 3, 3, 1, 1, VALID, 32); BM_CONV_2D(1, 32, 34, 34, 3, 3, 1, 1, VALID, 32); -// bokeh BM_CONV_2D(1, 32, 256, 256, 1, 15, 1, 1, SAME, 2); BM_CONV_2D(1, 32, 256, 256, 15, 1, 1, 1, SAME, 2); BM_CONV_2D(1, 64, 64, 64, 15, 1, 1, 1, SAME, 2); -- GitLab