Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 243afb03 authored by Michael Butler's avatar Michael Butler Committed by Automerger Merge Worker
Browse files

Change NNAPI Memory to ref-counted SharedMemory -- hal am: fadeb8a9 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1593091

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic16c1df5174c8926683aabc8a655c6e5ab2b2ed7
parents 2e0eb52a fadeb8a9

neuralnetworks/1.0/utils/include/nnapi/hal/1.0/Burst.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ class Burst final : public nn::IBurst { 


    Burst(PrivateConstructorTag tag, nn::SharedPreparedModel preparedModel);



    OptionalCacheHold cacheMemory(const nn::Memory& memory) const override;

    OptionalCacheHold cacheMemory(const nn::SharedMemory& memory) const override;



    nn::ExecutionResult<std::pair<std::vector<nn::OutputShape>, nn::Timing>> execute(

            const nn::Request& request, nn::MeasureTiming measure) const override;

neuralnetworks/1.0/utils/include/nnapi/hal/1.0/Conversions.h

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ GeneralResult<Operand> unvalidatedConvert(const hal::V1_0::Operand& operand); 
GeneralResult<Operation> unvalidatedConvert(const hal::V1_0::Operation& operation);

GeneralResult<Model::OperandValues> unvalidatedConvert(

        const hardware::hidl_vec<uint8_t>& operandValues);

GeneralResult<Memory> unvalidatedConvert(const hardware::hidl_memory& memory);

GeneralResult<SharedMemory> unvalidatedConvert(const hardware::hidl_memory& memory);

GeneralResult<Model> unvalidatedConvert(const hal::V1_0::Model& model);

GeneralResult<Request::Argument> unvalidatedConvert(

        const hal::V1_0::RequestArgument& requestArgument);
@@ -65,7 +65,7 @@ nn::GeneralResult<Operand> unvalidatedConvert(const nn::Operand& operand); 
nn::GeneralResult<Operation> unvalidatedConvert(const nn::Operation& operation);

nn::GeneralResult<hidl_vec<uint8_t>> unvalidatedConvert(

        const nn::Model::OperandValues& operandValues);

nn::GeneralResult<hidl_memory> unvalidatedConvert(const nn::Memory& memory);

nn::GeneralResult<hidl_memory> unvalidatedConvert(const nn::SharedMemory& memory);

nn::GeneralResult<Model> unvalidatedConvert(const nn::Model& model);

nn::GeneralResult<RequestArgument> unvalidatedConvert(const nn::Request::Argument& requestArgument);

nn::GeneralResult<hidl_memory> unvalidatedConvert(const nn::Request::MemoryPool& memoryPool);

neuralnetworks/1.0/utils/src/Burst.cpp

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ Burst::Burst(PrivateConstructorTag /*tag*/, nn::SharedPreparedModel preparedMode 
    CHECK(kPreparedModel != nullptr);

}



Burst::OptionalCacheHold Burst::cacheMemory(const nn::Memory& /*memory*/) const {

Burst::OptionalCacheHold Burst::cacheMemory(const nn::SharedMemory& /*memory*/) const {

    return nullptr;

}

neuralnetworks/1.0/utils/src/Conversions.cpp

+6 −5
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ GeneralResult<Model::OperandValues> unvalidatedConvert(const hidl_vec<uint8_t>& 
    return Model::OperandValues(operandValues.data(), operandValues.size());

}



GeneralResult<Memory> unvalidatedConvert(const hidl_memory& memory) {

GeneralResult<SharedMemory> unvalidatedConvert(const hidl_memory& memory) {

    return createSharedMemoryFromHidlMemory(memory);

}
@@ -346,9 +346,10 @@ nn::GeneralResult<hidl_vec<uint8_t>> unvalidatedConvert( 
    return hidl_vec<uint8_t>(operandValues.data(), operandValues.data() + operandValues.size());

}



nn::GeneralResult<hidl_memory> unvalidatedConvert(const nn::Memory& memory) {

    return hidl_memory(memory.name, NN_TRY(hal::utils::hidlHandleFromSharedHandle(memory.handle)),

                       memory.size);

nn::GeneralResult<hidl_memory> unvalidatedConvert(const nn::SharedMemory& memory) {

    CHECK(memory != nullptr);

    return hidl_memory(memory->name, NN_TRY(hal::utils::hidlHandleFromSharedHandle(memory->handle)),

                       memory->size);

}



nn::GeneralResult<Model> unvalidatedConvert(const nn::Model& model) {
@@ -392,7 +393,7 @@ nn::GeneralResult<RequestArgument> unvalidatedConvert( 
}



nn::GeneralResult<hidl_memory> unvalidatedConvert(const nn::Request::MemoryPool& memoryPool) {

    return unvalidatedConvert(std::get<nn::Memory>(memoryPool));

    return unvalidatedConvert(std::get<nn::SharedMemory>(memoryPool));

}



nn::GeneralResult<Request> unvalidatedConvert(const nn::Request& request) {

neuralnetworks/1.1/utils/src/Conversions.cpp

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ nn::GeneralResult<hidl_vec<uint8_t>> unvalidatedConvert( 
    return V1_0::utils::unvalidatedConvert(operandValues);

}



nn::GeneralResult<hidl_memory> unvalidatedConvert(const nn::Memory& memory) {

nn::GeneralResult<hidl_memory> unvalidatedConvert(const nn::SharedMemory& memory) {

    return V1_0::utils::unvalidatedConvert(memory);

}