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

Commit 54c9f546 authored by Michael Butler's avatar Michael Butler Committed by Automerger Merge Worker
Browse files

Introduce canonical IBurst object in NNAPI -- hal am: 2a8b679b 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic36701b04eb8282ffea12cb8ec4d8a359b2972ec
parents 510518ca 2a8b679b

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

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ class PreparedModel final : public nn::IPreparedModel { 
            const nn::OptionalDuration& loopTimeoutDuration,

            const nn::OptionalDuration& timeoutDurationAfterFence) const override;



    nn::GeneralResult<nn::SharedBurst> configureExecutionBurst() const override;



    std::any getUnderlyingResource() const override;



  private:

neuralnetworks/1.0/utils/src/PreparedModel.cpp

+4 −0
Original line number Diff line number Diff line
@@ -90,6 +90,10 @@ PreparedModel::executeFenced(const nn::Request& /*request*/, 
           << "IPreparedModel::executeFenced is not supported on 1.0 HAL service";

}



nn::GeneralResult<nn::SharedBurst> PreparedModel::configureExecutionBurst() const {

    return NN_ERROR(nn::ErrorStatus::GENERAL_FAILURE) << "Not yet implemented";

}



std::any PreparedModel::getUnderlyingResource() const {

    sp<V1_0::IPreparedModel> resource = kPreparedModel;

    return resource;

neuralnetworks/1.2/utils/include/nnapi/hal/1.2/PreparedModel.h

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ class PreparedModel final : public nn::IPreparedModel { 
            const nn::OptionalDuration& loopTimeoutDuration,

            const nn::OptionalDuration& timeoutDurationAfterFence) const override;



    nn::GeneralResult<nn::SharedBurst> configureExecutionBurst() const override;



    std::any getUnderlyingResource() const override;



  private:

neuralnetworks/1.2/utils/src/PreparedModel.cpp

+4 −0
Original line number Diff line number Diff line
@@ -117,6 +117,10 @@ PreparedModel::executeFenced(const nn::Request& /*request*/, 
           << "IPreparedModel::executeFenced is not supported on 1.2 HAL service";

}



nn::GeneralResult<nn::SharedBurst> PreparedModel::configureExecutionBurst() const {

    return NN_ERROR(nn::ErrorStatus::GENERAL_FAILURE) << "Not yet implemented";

}



std::any PreparedModel::getUnderlyingResource() const {

    sp<V1_2::IPreparedModel> resource = kPreparedModel;

    return resource;

neuralnetworks/1.3/utils/include/nnapi/hal/1.3/PreparedModel.h

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ class PreparedModel final : public nn::IPreparedModel { 
            const nn::OptionalDuration& loopTimeoutDuration,

            const nn::OptionalDuration& timeoutDurationAfterFence) const override;



    nn::GeneralResult<nn::SharedBurst> configureExecutionBurst() const override;



    std::any getUnderlyingResource() const override;



  private: