From 87f21cd39639118293b51fa776d30aa7722917bd Mon Sep 17 00:00:00 2001 From: Anthony Barbier Date: Fri, 10 Nov 2017 16:27:32 +0000 Subject: COMPMID-556 Updated libnpy.hpp Change-Id: I380a11f41ca2158de1dd0a6339ed9c884feb8f69 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/95385 Tested-by: Kaizen Reviewed-by: Michalis Spyrou --- utils/Utils.cpp | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'utils/Utils.cpp') diff --git a/utils/Utils.cpp b/utils/Utils.cpp index b99afb441c..f6aff6f92d 100644 --- a/utils/Utils.cpp +++ b/utils/Utils.cpp @@ -172,30 +172,13 @@ std::tuple, bool, std::string> parse_npy_header(std:: { std::vector shape; // NOLINT - // Check magic bytes and version number - unsigned char v_major = 0; - unsigned char v_minor = 0; - npy::read_magic(fs, &v_major, &v_minor); - // Read header - std::string header; - if(v_major == 1 && v_minor == 0) - { - header = npy::read_header_1_0(fs); - } - else if(v_major == 2 && v_minor == 0) - { - header = npy::read_header_2_0(fs); - } - else - { - ARM_COMPUTE_ERROR("Unsupported file format version"); - } + std::string header = npy::read_header(fs); // Parse header bool fortran_order = false; std::string typestr; - npy::ParseHeader(header, typestr, &fortran_order, shape); + npy::parse_header(header, typestr, fortran_order, shape); if(!fortran_order) { -- cgit v1.2.1