From 86b53339679e12c952a24a8845a5409ac3d52de6 Mon Sep 17 00:00:00 2001 From: SiCong Li Date: Wed, 23 Aug 2017 11:02:43 +0100 Subject: COMPMID-514 (3RDPARTY_UPDATE)(DATA_UPDATE) Add support to load .npy data * Add tensorflow_data_extractor script. * Incorporate 3rdparty npy reader libnpy. * Port AlexNet system test to validation_new. * Port LeNet5 system test to validation_new. * Update 3rdparty/ and data/ submodules. Change-Id: I156d060fe9185cd8db810b34bf524cbf5cb34f61 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/84914 Reviewed-by: Anthony Barbier Tested-by: Kaizen --- src/core/CL/kernels/CLDirectConvolutionLayerKernel.cpp | 2 +- src/core/CL/kernels/CLFillBorderKernel.cpp | 2 +- src/core/CL/kernels/CLIm2ColKernel.cpp | 2 +- src/core/CL/kernels/CLLocallyConnectedMatrixMultiplyKernel.cpp | 2 +- src/core/CL/kernels/CLWeightsReshapeKernel.cpp | 4 ++-- src/core/ITensor.cpp | 6 +++--- src/core/NEON/kernels/NEFillBorderKernel.cpp | 2 +- src/core/NEON/kernels/NEFillInnerBorderKernel.cpp | 2 +- src/core/NEON/kernels/NEIm2ColKernel.cpp | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/core/CL/kernels/CLDirectConvolutionLayerKernel.cpp b/src/core/CL/kernels/CLDirectConvolutionLayerKernel.cpp index 9d1c87d9e1..265c5074c5 100644 --- a/src/core/CL/kernels/CLDirectConvolutionLayerKernel.cpp +++ b/src/core/CL/kernels/CLDirectConvolutionLayerKernel.cpp @@ -246,7 +246,7 @@ void CLDirectConvolutionLayerKernel::run(const Window &window, cl::CommandQueue if(_biases != nullptr) { Window slice_biases; - slice_biases.use_tensor_dimensions(_biases->info()); + slice_biases.use_tensor_dimensions(_biases->info()->tensor_shape()); add_1D_tensor_argument(idx1, _biases, slice_biases); } diff --git a/src/core/CL/kernels/CLFillBorderKernel.cpp b/src/core/CL/kernels/CLFillBorderKernel.cpp index 6ff152113b..d2610539d1 100644 --- a/src/core/CL/kernels/CLFillBorderKernel.cpp +++ b/src/core/CL/kernels/CLFillBorderKernel.cpp @@ -157,7 +157,7 @@ void CLFillBorderKernel::configure(ICLTensor *tensor, BorderSize border_size, Bo Window win; win.set(Window::DimX, Window::Dimension(0, total_valid_width + valid_height)); win.set(Window::DimY, Window::Dimension(0, 1, 1)); - win.use_tensor_dimensions(tensor->info(), Window::DimZ); + win.use_tensor_dimensions(tensor->info()->tensor_shape(), Window::DimZ); ICLKernel::configure(win); } diff --git a/src/core/CL/kernels/CLIm2ColKernel.cpp b/src/core/CL/kernels/CLIm2ColKernel.cpp index 5147ea0609..3d21a9e3c0 100644 --- a/src/core/CL/kernels/CLIm2ColKernel.cpp +++ b/src/core/CL/kernels/CLIm2ColKernel.cpp @@ -182,7 +182,7 @@ void CLIm2ColKernel::run_reduced(const Window &window, cl::CommandQueue &queue) ARM_COMPUTE_ERROR_ON_MISMATCHING_WINDOWS(ICLKernel::window(), window); Window out_window; - out_window.use_tensor_dimensions(_output->info()); + out_window.use_tensor_dimensions(_output->info()->tensor_shape()); Window out_slice = out_window.first_slice_window_1D(); Window in_slice = window.first_slice_window_3D(); diff --git a/src/core/CL/kernels/CLLocallyConnectedMatrixMultiplyKernel.cpp b/src/core/CL/kernels/CLLocallyConnectedMatrixMultiplyKernel.cpp index 794a1bc56e..508fb899f1 100644 --- a/src/core/CL/kernels/CLLocallyConnectedMatrixMultiplyKernel.cpp +++ b/src/core/CL/kernels/CLLocallyConnectedMatrixMultiplyKernel.cpp @@ -101,7 +101,7 @@ void CLLocallyConnectedMatrixMultiplyKernel::run(const Window &window, cl::Comma Window slice = window.first_slice_window_2D(); Window matrix_b_window; - matrix_b_window.use_tensor_dimensions(_input1->info()); + matrix_b_window.use_tensor_dimensions(_input1->info()->tensor_shape()); Window slice_matrix_b = matrix_b_window.first_slice_window_3D(); do diff --git a/src/core/CL/kernels/CLWeightsReshapeKernel.cpp b/src/core/CL/kernels/CLWeightsReshapeKernel.cpp index 7b80f3ff5a..bc27477971 100644 --- a/src/core/CL/kernels/CLWeightsReshapeKernel.cpp +++ b/src/core/CL/kernels/CLWeightsReshapeKernel.cpp @@ -107,7 +107,7 @@ void CLWeightsReshapeKernel::run(const Window &window, cl::CommandQueue &queue) ARM_COMPUTE_ERROR_ON_MISMATCHING_WINDOWS(ICLKernel::window(), window); Window out_window; - out_window.use_tensor_dimensions(_output->info()); + out_window.use_tensor_dimensions(_output->info()->tensor_shape()); Window in_slice = window.first_slice_window_3D(); Window out_slice = out_window.first_slice_window_2D(); @@ -117,7 +117,7 @@ void CLWeightsReshapeKernel::run(const Window &window, cl::CommandQueue &queue) if(_biases != nullptr) { - biases_window.use_tensor_dimensions(_biases->info()); + biases_window.use_tensor_dimensions(_biases->info()->tensor_shape()); biases_slice = biases_window.first_slice_window_1D(); } diff --git a/src/core/ITensor.cpp b/src/core/ITensor.cpp index 0b29eca57b..4a54675561 100644 --- a/src/core/ITensor.cpp +++ b/src/core/ITensor.cpp @@ -55,9 +55,9 @@ void ITensor::copy_from(const ITensor &src) dst_info->set_valid_region(src_info->valid_region()); Window win_src; - win_src.use_tensor_dimensions(src_info, Window::DimY); + win_src.use_tensor_dimensions(src_info->tensor_shape(), Window::DimY); Window win_dst; - win_dst.use_tensor_dimensions(dst_info, Window::DimY); + win_dst.use_tensor_dimensions(dst_info->tensor_shape(), Window::DimY); Iterator src_it(&src, win_src); Iterator dst_it(this, win_dst); @@ -147,4 +147,4 @@ void ITensor::print(std::ostream &s, IOFormatInfo io_fmt) const s << io_fmt.row_delim; } } -} \ No newline at end of file +} diff --git a/src/core/NEON/kernels/NEFillBorderKernel.cpp b/src/core/NEON/kernels/NEFillBorderKernel.cpp index 65d5388c4b..3f1f678a7e 100644 --- a/src/core/NEON/kernels/NEFillBorderKernel.cpp +++ b/src/core/NEON/kernels/NEFillBorderKernel.cpp @@ -120,7 +120,7 @@ void NEFillBorderKernel::configure(ITensor *tensor, BorderSize border_size, Bord Window win; win.set(Window::DimX, Window::Dimension(0, 1, 1)); win.set(Window::DimY, Window::Dimension(0, 1, 1)); - win.use_tensor_dimensions(_tensor->info(), Window::DimZ); + win.use_tensor_dimensions(_tensor->info()->tensor_shape(), Window::DimZ); INEKernel::configure(win); } diff --git a/src/core/NEON/kernels/NEFillInnerBorderKernel.cpp b/src/core/NEON/kernels/NEFillInnerBorderKernel.cpp index 5323733fd3..017e259ca4 100644 --- a/src/core/NEON/kernels/NEFillInnerBorderKernel.cpp +++ b/src/core/NEON/kernels/NEFillInnerBorderKernel.cpp @@ -57,7 +57,7 @@ void NEFillInnerBorderKernel::configure(ITensor *input, BorderSize border_size, Window win; win.set(Window::DimX, Window::Dimension(0, 1, 1)); win.set(Window::DimY, Window::Dimension(0, 1, 1)); - win.use_tensor_dimensions(_tensor->info(), Window::DimZ); + win.use_tensor_dimensions(_tensor->info()->tensor_shape(), Window::DimZ); INEKernel::configure(win); } diff --git a/src/core/NEON/kernels/NEIm2ColKernel.cpp b/src/core/NEON/kernels/NEIm2ColKernel.cpp index 3e50277cdf..71910e3a69 100644 --- a/src/core/NEON/kernels/NEIm2ColKernel.cpp +++ b/src/core/NEON/kernels/NEIm2ColKernel.cpp @@ -231,7 +231,7 @@ void NEIm2ColKernel::run_reduced(const Window &window) in_window.set(Window::DimX, Window::Dimension(0, 1, 1)); Window out_window; - out_window.use_tensor_dimensions(_output->info()); + out_window.use_tensor_dimensions(_output->info()->tensor_shape()); out_window.set(Window::DimX, Window::Dimension(out_window.x().start(), out_window.x().end(), in_width)); Window in_slice = in_window.first_slice_window_3D(); -- cgit v1.2.1