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 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/core/CL') 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(); } -- cgit v1.2.1