diff options
| author | Kristofer Jonsson <kristofer.jonsson@arm.com> | 2022-03-10 11:17:29 +0100 |
|---|---|---|
| committer | Kristofer Jonsson <kristofer.jonsson@arm.com> | 2022-03-14 11:14:06 +0100 |
| commit | 3c6a260a705a668b5ff8e8159f04c257273fb458 (patch) | |
| tree | 3661451b5d0e2675534c290f36c2cf834fc1f4a6 /driver_library | |
| parent | 35de9e63d9c2fe0a557637ac104d7d73382d2d4a (diff) | |
| download | ethos-u-linux-driver-stack-3c6a260a705a668b5ff8e8159f04c257273fb458.tar.gz | |
Network info
Add UAPI and core message that allows user space space to fetch
information about network models built into the firmware.
Change-Id: Ic92529bce3edd0a5499e691a566bd065da2a72ad
Diffstat (limited to 'driver_library')
| -rw-r--r-- | driver_library/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | driver_library/include/ethosu.hpp | 4 | ||||
| -rw-r--r-- | driver_library/src/ethosu.cpp | 26 | ||||
| -rw-r--r-- | driver_library/src/ethosu_stub.cpp | 2 |
4 files changed, 14 insertions, 20 deletions
diff --git a/driver_library/CMakeLists.txt b/driver_library/CMakeLists.txt index 4444357..41eb115 100644 --- a/driver_library/CMakeLists.txt +++ b/driver_library/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2020 Arm Limited. All rights reserved. +# Copyright (c) 2020,2022 Arm Limited. # # SPDX-License-Identifier: Apache-2.0 # diff --git a/driver_library/include/ethosu.hpp b/driver_library/include/ethosu.hpp index 0738aa2..e4fd4f1 100644 --- a/driver_library/include/ethosu.hpp +++ b/driver_library/include/ethosu.hpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022 Arm Limited. All rights reserved. + * Copyright (c) 2020-2022 Arm Limited. * * SPDX-License-Identifier: Apache-2.0 * @@ -161,7 +161,7 @@ private: class Network { public: Network(const Device &device, std::shared_ptr<Buffer> &buffer); - Network(const Device &device, const std::string &model, const unsigned index); + Network(const Device &device, const unsigned index); virtual ~Network(); int ioctl(unsigned long cmd, void *data = nullptr); diff --git a/driver_library/src/ethosu.cpp b/driver_library/src/ethosu.cpp index 16d2db0..f792399 100644 --- a/driver_library/src/ethosu.cpp +++ b/driver_library/src/ethosu.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2022 Arm Limited. All rights reserved. + * Copyright (c) 2020-2022 Arm Limited. * * SPDX-License-Identifier: Apache-2.0 * @@ -305,7 +305,7 @@ Network::Network(const Device &device, shared_ptr<Buffer> &buffer) : fd(-1), buf } } -Network::Network(const Device &device, const string &model, const unsigned index) : fd(-1) { +Network::Network(const Device &device, const unsigned index) : fd(-1) { // Create buffer handle ethosu_uapi_network_create uapi; uapi.type = ETHOSU_UAPI_NETWORK_INDEX; @@ -313,22 +313,16 @@ Network::Network(const Device &device, const string &model, const unsigned index fd = device.ioctl(ETHOSU_IOCTL_NETWORK_CREATE, static_cast<void *>(&uapi)); try { - // Open file - ifstream ifs(model, std::ios::binary); - if (!ifs.is_open()) { - throw Exception("Failed to open model file."); - } - - // Get file size - ifs.seekg(0, ios_base::end); - size_t size = ifs.tellg(); - ifs.seekg(0, ios_base::beg); + ethosu_uapi_network_info info; + ioctl(ETHOSU_IOCTL_NETWORK_INFO, static_cast<void *>(&info)); - // Read data into buffer - vector<char> buffer(size); - ifs.read(buffer.data(), size); + for (uint32_t i = 0; i < info.ifm_count; i++) { + ifmDims.push_back(info.ifm_size[i]); + } - parseModel(buffer.data()); + for (uint32_t i = 0; i < info.ofm_count; i++) { + ofmDims.push_back(info.ofm_size[i]); + } } catch (...) { eclose(fd); throw; diff --git a/driver_library/src/ethosu_stub.cpp b/driver_library/src/ethosu_stub.cpp index 428d276..d85f653 100644 --- a/driver_library/src/ethosu_stub.cpp +++ b/driver_library/src/ethosu_stub.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2021 Arm Limited. All rights reserved. + * Copyright (c) 2020-2022 Arm Limited. * * SPDX-License-Identifier: Apache-2.0 * |