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

Commit 6767158b authored by Michael Butler's avatar Michael Butler Committed by Automerger Merge Worker
Browse files

Merge "Allow implicit conversions for NN errors -- hal" am: 68e98f40 am:... 

Merge "Allow implicit conversions for NN errors -- hal" am: 68e98f40 am: d236dbf3 am: 36c599d5 am: 0e0dc63c am: 2542d951

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

Change-Id: I2d5d614f17b8762d2523dde714ae5f6a38adf2a2
parents 1a0a5129 2542d951

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -50,8 +50,8 @@ bool valid(const Type& halObject) { 
}

}





template <typename Type>

template <typename Type>

nn::GeneralResult<void> compliantVersion(const Type& canonical) {

nn::Result<void> compliantVersion(const Type& canonical) {

    const auto version = NN_TRY(hal::utils::makeGeneralFailure(nn::validate(canonical)));

    const auto version = NN_TRY(nn::validate(canonical));

    if (version > kVersion) {

    if (version > kVersion) {

        return NN_ERROR() << "Insufficient version: " << version << " vs required " << kVersion;

        return NN_ERROR() << "Insufficient version: " << version << " vs required " << kVersion;

    }

    }

neuralnetworks/1.0/utils/src/PreparedModel.cpp

+4 −5
Original line number Original line Diff line number Diff line
@@ -63,12 +63,11 @@ nn::ExecutionResult<std::pair<std::vector<nn::OutputShape>, nn::Timing>> Prepare 
    // Ensure that request is ready for IPC.

    // Ensure that request is ready for IPC.

    std::optional<nn::Request> maybeRequestInShared;

    std::optional<nn::Request> maybeRequestInShared;

    hal::utils::RequestRelocation relocation;

    hal::utils::RequestRelocation relocation;

    const nn::Request& requestInShared =

    const nn::Request& requestInShared = NN_TRY(hal::utils::convertRequestFromPointerToShared(

            NN_TRY(hal::utils::makeExecutionFailure(hal::utils::convertRequestFromPointerToShared(

            &request, nn::kDefaultRequestMemoryAlignment, nn::kMinMemoryPadding,

            &request, nn::kDefaultRequestMemoryAlignment, nn::kMinMemoryPadding,

                    &maybeRequestInShared, &relocation)));

            &maybeRequestInShared, &relocation));





    const auto hidlRequest = NN_TRY(hal::utils::makeExecutionFailure(convert(requestInShared)));

    const auto hidlRequest = NN_TRY(convert(requestInShared));





    return executeInternal(hidlRequest, relocation);

    return executeInternal(hidlRequest, relocation);

}

}

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -52,8 +52,8 @@ bool valid(const Type& halObject) { 
}

}





template <typename Type>

template <typename Type>

nn::GeneralResult<void> compliantVersion(const Type& canonical) {

nn::Result<void> compliantVersion(const Type& canonical) {

    const auto version = NN_TRY(hal::utils::makeGeneralFailure(nn::validate(canonical)));

    const auto version = NN_TRY(nn::validate(canonical));

    if (version > kVersion) {

    if (version > kVersion) {

        return NN_ERROR() << "Insufficient version: " << version << " vs required " << kVersion;

        return NN_ERROR() << "Insufficient version: " << version << " vs required " << kVersion;

    }

    }

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -61,8 +61,8 @@ bool valid(const Type& halObject) { 
}

}





template <typename Type>

template <typename Type>

nn::GeneralResult<void> compliantVersion(const Type& canonical) {

nn::Result<void> compliantVersion(const Type& canonical) {

    const auto version = NN_TRY(hal::utils::makeGeneralFailure(nn::validate(canonical)));

    const auto version = NN_TRY(nn::validate(canonical));

    if (version > kVersion) {

    if (version > kVersion) {

        return NN_ERROR() << "Insufficient version: " << version << " vs required " << kVersion;

        return NN_ERROR() << "Insufficient version: " << version << " vs required " << kVersion;

    }

    }

neuralnetworks/1.2/utils/src/Callbacks.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -75,8 +75,7 @@ nn::ExecutionResult<std::pair<std::vector<nn::OutputShape>, nn::Timing>> executi 
               << "execution failed with " << toString(status);

               << "execution failed with " << toString(status);

    }

    }

    HANDLE_HAL_STATUS(status) << "execution failed with " << toString(status);

    HANDLE_HAL_STATUS(status) << "execution failed with " << toString(status);

    return hal::utils::makeExecutionFailure(

    return convertExecutionGeneralResultsHelper(outputShapes, timing);

            convertExecutionGeneralResultsHelper(outputShapes, timing));

}

}





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

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