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 --- arm_compute/core/Window.h | 4 ++-- arm_compute/core/Window.inl | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'arm_compute') diff --git a/arm_compute/core/Window.h b/arm_compute/core/Window.h index baf767e7d5..654f5ed4f8 100644 --- a/arm_compute/core/Window.h +++ b/arm_compute/core/Window.h @@ -157,10 +157,10 @@ public: /** Use the tensor's dimensions to fill the window dimensions. * - * @param[in] info Tensor information to copy the dimensions from. + * @param[in] shape @ref TensorShape to copy the dimensions from. * @param[in] first_dimension Only copy dimensions which are greater or equal to this value. */ - void use_tensor_dimensions(const ITensorInfo *info, size_t first_dimension = Window::DimX); + void use_tensor_dimensions(const TensorShape &shape, size_t first_dimension = Window::DimX); /** Shift the values of a given dimension by the given shift_value * diff --git a/arm_compute/core/Window.inl b/arm_compute/core/Window.inl index 01cd988ea0..6b02128797 100644 --- a/arm_compute/core/Window.inl +++ b/arm_compute/core/Window.inl @@ -201,11 +201,11 @@ inline Window Window::first_slice_window() const return slice; } -inline void Window::use_tensor_dimensions(const ITensorInfo *info, size_t first_dimension) +inline void Window::use_tensor_dimensions(const TensorShape &shape, size_t first_dimension) { - for(unsigned int n = first_dimension; n < info->num_dimensions(); ++n) + for(unsigned int n = first_dimension; n < shape.num_dimensions(); ++n) { - set(n, Window::Dimension(0, std::max(info->dimension(n), static_cast(1)))); + set(n, Window::Dimension(0, std::max(shape[n], static_cast(1)))); } } } -- cgit v1.2.1