aboutsummaryrefslogtreecommitdiff
path: root/utils/GraphUtils.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'utils/GraphUtils.cpp')
-rw-r--r--utils/GraphUtils.cpp24
1 files changed, 3 insertions, 21 deletions
diff --git a/utils/GraphUtils.cpp b/utils/GraphUtils.cpp
index 9a1ed3d7d9..b9be9d4085 100644
--- a/utils/GraphUtils.cpp
+++ b/utils/GraphUtils.cpp
@@ -301,30 +301,12 @@ bool NumPyBinLoader::access_tensor(ITensor &tensor)
// Open file
std::ifstream stream(_filename, std::ios::in | std::ios::binary);
ARM_COMPUTE_ERROR_ON_MSG(!stream.good(), "Failed to load binary data");
- // Check magic bytes and version number
- unsigned char v_major = 0;
- unsigned char v_minor = 0;
- npy::read_magic(stream, &v_major, &v_minor);
-
- // Read header
- std::string header;
- if(v_major == 1 && v_minor == 0)
- {
- header = npy::read_header_1_0(stream);
- }
- else if(v_major == 2 && v_minor == 0)
- {
- header = npy::read_header_2_0(stream);
- }
- else
- {
- ARM_COMPUTE_ERROR("Unsupported file format version");
- }
+ std::string header = npy::read_header(stream);
// Parse header
bool fortran_order = false;
std::string typestr;
- npy::ParseHeader(header, typestr, &fortran_order, shape);
+ npy::parse_header(header, typestr, fortran_order, shape);
// Check if the typestring matches the given one
std::string expect_typestr = arm_compute::utils::get_typestring(tensor.info()->data_type());
@@ -365,4 +347,4 @@ bool NumPyBinLoader::access_tensor(ITensor &tensor)
});
}
return true;
-} \ No newline at end of file
+}