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

Commit 9b2940db authored by Lev Proleev's avatar Lev Proleev Committed by Gerrit Code Review
Browse files

Merge changes from topic "nnapi_aidl_interface" 

* changes:
  Implement VTS tests for NNAPI AIDL interface
  Add utils for AIDL types conversions
  Create first version of NNAPI AIDL interface
  Add dynamic interface casting to NN utility code
parents e9fb347e c185e88c

compatibility_matrices/compatibility_matrix.current.xml

+7 −0
Original line number Diff line number Diff line
@@ -378,6 +378,13 @@ 
            <regex-instance>.*</regex-instance>

        </interface>

    </hal>

    <hal format="aidl" optional="true">

        <name>android.hardware.neuralnetworks</name>

        <interface>

            <name>IDevice</name>

            <regex-instance>.*</regex-instance>

        </interface>

    </hal>

    <hal format="hidl" optional="true">

        <name>android.hardware.nfc</name>

        <version>1.2</version>

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

+6 −0
Original line number Diff line number Diff line
@@ -44,6 +44,12 @@ bool valid(const Type& halObject) { 
    return result.has_value();

}



template <typename Type>

auto convertFromNonCanonical(const Type& nonCanonicalObject)

        -> decltype(convert(nn::convert(nonCanonicalObject).value())) {

    return convert(NN_TRY(nn::convert(nonCanonicalObject)));

}



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



#endif  // ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_1_0_UTILS_H

neuralnetworks/1.1/utils/include/nnapi/hal/1.1/Utils.h

+6 −0
Original line number Diff line number Diff line
@@ -47,6 +47,12 @@ bool valid(const Type& halObject) { 
    return result.has_value();

}



template <typename Type>

auto convertFromNonCanonical(const Type& nonCanonicalObject)

        -> decltype(convert(nn::convert(nonCanonicalObject).value())) {

    return convert(NN_TRY(nn::convert(nonCanonicalObject)));

}



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



#endif  // ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_1_1_UTILS_H

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

+6 −0
Original line number Diff line number Diff line
@@ -54,6 +54,12 @@ bool valid(const Type& halObject) { 
    return result.has_value();

}



template <typename Type>

auto convertFromNonCanonical(const Type& nonCanonicalObject)

        -> decltype(convert(nn::convert(nonCanonicalObject).value())) {

    return convert(NN_TRY(nn::convert(nonCanonicalObject)));

}



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



#endif  // ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_1_2_UTILS_H

neuralnetworks/1.2/utils/src/Callbacks.cpp

+10 −1
Original line number Diff line number Diff line
@@ -43,6 +43,15 @@ 
namespace android::hardware::neuralnetworks::V1_2::utils {

namespace {



nn::GeneralResult<nn::SharedPreparedModel> prepareModelCallback(

        V1_0::ErrorStatus status, const sp<V1_0::IPreparedModel>& preparedModel) {

    if (const auto dynamicPreparedModel =

                V1_2::IPreparedModel::castFrom(preparedModel).withDefault(nullptr)) {

        return V1_2::utils::prepareModelCallback(status, dynamicPreparedModel);

    }

    return V1_0::utils::prepareModelCallback(status, preparedModel);

}



nn::GeneralResult<std::pair<std::vector<nn::OutputShape>, nn::Timing>>

convertExecutionGeneralResultsHelper(const hidl_vec<OutputShape>& outputShapes,

                                     const Timing& timing) {
@@ -72,7 +81,7 @@ nn::ExecutionResult<std::pair<std::vector<nn::OutputShape>, nn::Timing>> executi 


Return<void> PreparedModelCallback::notify(V1_0::ErrorStatus status,

                                           const sp<V1_0::IPreparedModel>& preparedModel) {

    mData.put(V1_0::utils::prepareModelCallback(status, preparedModel));

    mData.put(prepareModelCallback(status, preparedModel));

    return Void();

}