NN runtime: ANAPIC review follow up
This topic makes the following three HAL interface changes:
* Removes @1.3::Operand.ExtraParams, because it was the same as
@1.2::Operand.ExtraParams
* Changes int32_t token to uint32_t for IDevice::allocate and for
@1.3::Request.MemoryPool
* Renames OptionalTimePoint::nanoseconds to
OptionalTimePoint::nanosecondsSinceEpoch
This CL also makes runtime changes in response to the interface changes,
and fixes a minor comment issue in NeuralNetworks.h.
Bug: 148617339
Test: mma
Test: CtsNNAPITestCases
Test: NeuralNetworksTest_static
Change-Id: I3ecc8f3f38e0551c309824c24ecd780a07cc1959
Merged-In: I3ecc8f3f38e0551c309824c24ecd780a07cc1959
(cherry picked from commit 131d838cd44536405d5ea394558625192b77901e)
diff --git a/runtime/Memory.cpp b/runtime/Memory.cpp
index f8f90f7..34c8c56 100644
--- a/runtime/Memory.cpp
+++ b/runtime/Memory.cpp
@@ -182,7 +182,7 @@
Memory::Memory(hal::hidl_memory memory, std::unique_ptr<MemoryValidatorBase> validator)
: kHidlMemory(std::move(memory)), mValidator(std::move(validator)) {}
-Memory::Memory(sp<hal::IBuffer> buffer, int32_t token)
+Memory::Memory(sp<hal::IBuffer> buffer, uint32_t token)
: kBuffer(std::move(buffer)), kToken(token) {}
Memory::~Memory() {
@@ -577,7 +577,7 @@
};
std::pair<int, std::unique_ptr<MemoryFromDevice>> MemoryFromDevice::create(sp<hal::IBuffer> buffer,
- int32_t token) {
+ uint32_t token) {
if (buffer == nullptr) {
LOG(ERROR) << "nullptr IBuffer for device memory.";
return {ANEURALNETWORKS_BAD_DATA, nullptr};
@@ -589,7 +589,7 @@
return {ANEURALNETWORKS_NO_ERROR, std::make_unique<MemoryFromDevice>(std::move(buffer), token)};
};
-MemoryFromDevice::MemoryFromDevice(sp<hal::IBuffer> buffer, int32_t token)
+MemoryFromDevice::MemoryFromDevice(sp<hal::IBuffer> buffer, uint32_t token)
: Memory(std::move(buffer), token) {}
} // namespace nn
