aboutsummaryrefslogtreecommitdiff
path: root/utils/Utils.cpp
diff options
context:
space:
mode:
authorJakub Sujak <jakub.sujak@arm.com>2022-12-07 23:55:22 +0000
committerJakub Sujak <jakub.sujak@arm.com>2023-01-20 15:56:39 +0000
commit3b504ef58b6893899a23810eba68db6663ce5f94 (patch)
treed20d87bb95bb534912c1264808cb2bbf463bb1de /utils/Utils.cpp
parenta23183221e5ba2c02863d3aa673da224ba42e364 (diff)
downloadComputeLibrary-3b504ef58b6893899a23810eba68db6663ce5f94.tar.gz
Update libnpy header external dependency to the latest version
Primarily fixes build error when building with Clang14 due to warning of use of deprecated 'sprintf' function Resolves: COMPMID-5803 Change-Id: Iaa7df7ccc482fbeaa1978988ce61bbc8fd792ca1 Signed-off-by: Jakub Sujak <jakub.sujak@arm.com> Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/8802 Reviewed-by: Pablo Marquez Tello <pablo.tello@arm.com> Tested-by: Arm Jenkins <bsgcomp@arm.com> Comments-Addressed: Arm Jenkins <bsgcomp@arm.com> Benchmark: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'utils/Utils.cpp')
-rw-r--r--utils/Utils.cpp17
1 files changed, 8 insertions, 9 deletions
diff --git a/utils/Utils.cpp b/utils/Utils.cpp
index 7380ad7909..545d64e4b9 100644
--- a/utils/Utils.cpp
+++ b/utils/Utils.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017-2019 Arm Limited.
+ * Copyright (c) 2017-2019, 2023 Arm Limited.
*
* SPDX-License-Identifier: MIT
*
@@ -230,21 +230,20 @@ std::tuple<unsigned int, unsigned int, int> parse_ppm_header(std::ifstream &fs)
return std::make_tuple(width, height, max_val);
}
-std::tuple<std::vector<unsigned long>, bool, std::string> parse_npy_header(std::ifstream &fs) //NOLINT
+npy::header_t parse_npy_header(std::ifstream &fs) //NOLINT
{
- std::vector<unsigned long> shape; // NOLINT
-
// Read header
- std::string header = npy::read_header(fs);
+ std::string header_s = npy::read_header(fs);
// Parse header
- bool fortran_order = false;
- std::string typestr;
- npy::parse_header(header, typestr, fortran_order, shape);
+ npy::header_t header = npy::parse_header(header_s);
+
+ bool fortran_order = false;
+ std::vector<unsigned long> shape = header.shape;
std::reverse(shape.begin(), shape.end());
- return std::make_tuple(shape, fortran_order, typestr);
+ return npy::header_t{ header.dtype, fortran_order, shape };
}
/** This function returns the amount of memory free reading from /proc/meminfo