diff options
Diffstat (limited to 'neuralnetworks/1.3/utils/src/Device.cpp')
| -rw-r--r-- | neuralnetworks/1.3/utils/src/Device.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/neuralnetworks/1.3/utils/src/Device.cpp b/neuralnetworks/1.3/utils/src/Device.cpp index d710b85070..824cec61c8 100644 --- a/neuralnetworks/1.3/utils/src/Device.cpp +++ b/neuralnetworks/1.3/utils/src/Device.cpp @@ -33,13 +33,13 @@ #include <nnapi/OperandTypes.h> #include <nnapi/Result.h> #include <nnapi/Types.h> +#include <nnapi/hal/1.0/HandleError.h> +#include <nnapi/hal/1.0/ProtectCallback.h> #include <nnapi/hal/1.1/Conversions.h> #include <nnapi/hal/1.2/Conversions.h> #include <nnapi/hal/1.2/Device.h> #include <nnapi/hal/1.2/Utils.h> #include <nnapi/hal/CommonUtils.h> -#include <nnapi/hal/HandleError.h> -#include <nnapi/hal/ProtectCallback.h> #include <any> #include <functional> @@ -72,7 +72,7 @@ nn::GeneralResult<hidl_vec<sp<IPreparedModel>>> convert( nn::GeneralResult<nn::Capabilities> capabilitiesCallback(ErrorStatus status, const Capabilities& capabilities) { - HANDLE_HAL_STATUS(status) << "getting capabilities failed with " << toString(status); + HANDLE_STATUS_HIDL(status) << "getting capabilities failed with " << toString(status); return nn::convert(capabilities); } @@ -89,7 +89,7 @@ nn::GeneralResult<nn::Capabilities> getCapabilitiesFrom(V1_3::IDevice* device) { nn::GeneralResult<nn::SharedBuffer> allocationCallback(ErrorStatus status, const sp<IBuffer>& buffer, uint32_t token) { - HANDLE_HAL_STATUS(status) << "IDevice::allocate failed with " << toString(status); + HANDLE_STATUS_HIDL(status) << "IDevice::allocate failed with " << toString(status); return Buffer::create(buffer, static_cast<nn::Request::MemoryDomainToken>(token)); } @@ -143,7 +143,7 @@ const std::string& Device::getVersionString() const { } nn::Version Device::getFeatureLevel() const { - return nn::Version::ANDROID_R; + return kVersion; } nn::DeviceType Device::getType() const { @@ -187,7 +187,9 @@ nn::GeneralResult<std::vector<bool>> Device::getSupportedOperations(const nn::Mo nn::GeneralResult<nn::SharedPreparedModel> Device::prepareModel( const nn::Model& model, nn::ExecutionPreference preference, nn::Priority priority, nn::OptionalTimePoint deadline, const std::vector<nn::SharedHandle>& modelCache, - const std::vector<nn::SharedHandle>& dataCache, const nn::CacheToken& token) const { + const std::vector<nn::SharedHandle>& dataCache, const nn::CacheToken& token, + const std::vector<nn::TokenValuePair>& /*hints*/, + const std::vector<nn::ExtensionNameAndPrefix>& /*extensionNameToPrefix*/) const { // Ensure that model is ready for IPC. std::optional<nn::Model> maybeModelInShared; const nn::Model& modelInShared = @@ -208,7 +210,7 @@ nn::GeneralResult<nn::SharedPreparedModel> Device::prepareModel( kDevice->prepareModel_1_3(hidlModel, hidlPreference, hidlPriority, hidlDeadline, hidlModelCache, hidlDataCache, hidlToken, cb); const auto status = HANDLE_TRANSPORT_FAILURE(ret); - HANDLE_HAL_STATUS(status) << "model preparation failed with " << toString(status); + HANDLE_STATUS_HIDL(status) << "model preparation failed with " << toString(status); return cb->get(); } @@ -227,7 +229,7 @@ nn::GeneralResult<nn::SharedPreparedModel> Device::prepareModelFromCache( const auto ret = kDevice->prepareModelFromCache_1_3(hidlDeadline, hidlModelCache, hidlDataCache, hidlToken, cb); const auto status = HANDLE_TRANSPORT_FAILURE(ret); - HANDLE_HAL_STATUS(status) << "model preparation from cache failed with " << toString(status); + HANDLE_STATUS_HIDL(status) << "model preparation from cache failed with " << toString(status); return cb->get(); } |