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

Commit dab697fc authored by Michael Butler's avatar Michael Butler Committed by Android (Google) Code Review
Browse files

Merge changes from topic "nnapi-burst-extra-params" 

* changes:
  Create NN AIDL Burst adapter
  Add additional parameters for NN Burst -- HAL
parents 96b09238 504f4492

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

+3 −1
Original line number Diff line number Diff line
@@ -44,7 +44,9 @@ class Burst final : public nn::IBurst { 
    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;

            const nn::Request& request, nn::MeasureTiming measure,

            const nn::OptionalTimePoint& deadline,

            const nn::OptionalDuration& loopTimeoutDuration) const override;



  private:

    const nn::SharedPreparedModel kPreparedModel;

neuralnetworks/1.0/utils/src/Burst.cpp

+5 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <nnapi/IBurst.h>

#include <nnapi/IPreparedModel.h>

#include <nnapi/Result.h>

#include <nnapi/TypeUtils.h>

#include <nnapi/Types.h>



#include <memory>
@@ -48,8 +49,10 @@ Burst::OptionalCacheHold Burst::cacheMemory(const nn::SharedMemory& /*memory*/) 
}



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

        const nn::Request& request, nn::MeasureTiming measure) const {

    return kPreparedModel->execute(request, measure, {}, {});

        const nn::Request& request, nn::MeasureTiming measure,

        const nn::OptionalTimePoint& deadline,

        const nn::OptionalDuration& loopTimeoutDuration) const {

    return kPreparedModel->execute(request, measure, deadline, loopTimeoutDuration);

}



}  // namespace android::hardware::neuralnetworks::V1_0::utils

neuralnetworks/1.0/utils/test/MockDevice.h

+3 −3
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
 * limitations under the License.

 */



#ifndef ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_1_0_UTILS_TEST_MOCK_DEVICE

#define ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_1_0_UTILS_TEST_MOCK_DEVICE

#ifndef ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_1_0_UTILS_TEST_MOCK_DEVICE_H

#define ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_1_0_UTILS_TEST_MOCK_DEVICE_H



#include <android/hardware/neuralnetworks/1.0/IDevice.h>

#include <gmock/gmock.h>
@@ -83,4 +83,4 @@ inline void MockDevice::simulateCrash() { 


}  // namespace android::hardware::neuralnetworks::V1_0::utils



#endif  // ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_1_0_UTILS_TEST_MOCK_DEVICE
 
#endif  // ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_1_0_UTILS_TEST_MOCK_DEVICE_H

neuralnetworks/1.0/utils/test/MockPreparedModel.h

+3 −3
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
 * limitations under the License.

 */



#ifndef ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_1_0_UTILS_TEST_MOCK_PREPARED_MODEL

#define ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_1_0_UTILS_TEST_MOCK_PREPARED_MODEL

#ifndef ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_1_0_UTILS_TEST_MOCK_PREPARED_MODEL_H

#define ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_1_0_UTILS_TEST_MOCK_PREPARED_MODEL_H



#include <android/hardware/neuralnetworks/1.0/IPreparedModel.h>

#include <gmock/gmock.h>
@@ -82,4 +82,4 @@ inline void MockPreparedModel::simulateCrash() { 


}  // namespace android::hardware::neuralnetworks::V1_0::utils



#endif  // ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_1_0_UTILS_TEST_MOCK_PREPARED_MODEL
 
#endif  // ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_1_0_UTILS_TEST_MOCK_PREPARED_MODEL_H

neuralnetworks/1.0/utils/test/PreparedModelTest.cpp

+13 −1
Original line number Diff line number Diff line
@@ -224,7 +224,19 @@ TEST(PreparedModelTest, executeFencedNotSupported) { 
    EXPECT_EQ(result.error().code, nn::ErrorStatus::GENERAL_FAILURE);

}



// TODO: test burst execution if/when it is added to nn::IPreparedModel.

TEST(PreparedModelTest, configureExecutionBurst) {

    // setup test

    const auto mockPreparedModel = MockPreparedModel::create();

    const auto preparedModel = PreparedModel::create(mockPreparedModel).value();



    // run test

    const auto result = preparedModel->configureExecutionBurst();



    // verify result

    ASSERT_TRUE(result.has_value())

            << "Failed with " << result.error().code << ": " << result.error().message;

    EXPECT_NE(result.value(), nullptr);

}



TEST(PreparedModelTest, getUnderlyingResource) {

    // setup test