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

Commit b046c4eb authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "NNAPI v1.3-aosp" 

* changes:
  Increase neuralnetworks compatibility to 1.3
  Modify NNAPI VTS tests to run on version 1.3
  Copy VTS tests from v1.2 to v1.3
  Create NNAPI HAL v1.3 and add TENSOR_QUANT8_ASYMM_SIGNED OperandType
parents 80c288d7 860f7d1d

compatibility_matrices/compatibility_matrix.current.xml

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ 
    </hal>

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

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

        <version>1.0-2</version>

        <version>1.0-3</version>

        <interface>

            <name>IDevice</name>

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

current.txt

+2 −0
Original line number Diff line number Diff line
@@ -586,6 +586,8 @@ fd65298e1e09e0e3c781ab18305920d757dbe55a3b459ce17814ec5cf6dfee99 android.hardwar 
# HALs released in Android R

07d0a252b2d8fa35887908a996ba395cf392968395fc30afab791f46e0c22a52 android.hardware.boot@1.1::IBootControl

74049a402be913963edfdd80828a53736570e9d8124a1bf18166b6ed46a6b0ab android.hardware.boot@1.1::types

34515afa2bb792d3c6d8495a5f5d907d179c8507ca5e55c10050d02ae1d516ef android.hardware.neuralnetworks@1.3::IDevice

e2d20d4eb24f40b44a3766d05f77052581cb3f4df35fb48c0cc5d9cdcf5c872e android.hardware.neuralnetworks@1.3::types

544049dcda3f943ad67d83d5277f06681a3782982a9af5a78b5d4e8d295d061a android.hardware.vibrator@1.4::IVibrator

5e1c12efbbba89c9143d10b1b90eceff8bc79aa079f5106215b528e104fef101 android.hardware.vibrator@1.4::IVibratorCallback

033eae03c09ebc75e82db37bc39995dfaa9086745577b44d9e14e9ccb48bd8cc android.hardware.vibrator@1.4::types

neuralnetworks/1.2/vts/functional/Android.bp

+19 −1
Original line number Diff line number Diff line
@@ -14,12 +14,28 @@ 
// limitations under the License.

//



cc_library_static {

    name: "VtsHalNeuralNetworksV1_2Callbacks",

    defaults: ["VtsHalTargetTestDefaults"],

    export_include_dirs: ["include"],

    srcs: [

        "Callbacks.cpp",

    ],

    static_libs: [

        "android.hardware.neuralnetworks@1.0",

        "android.hardware.neuralnetworks@1.1",

        "android.hardware.neuralnetworks@1.2",

    ],

    header_libs: [

        "libbase_headers",

    ]

}



cc_test {

    name: "VtsHalNeuralnetworksV1_2TargetTest",

    defaults: ["VtsHalTargetTestDefaults"],

    srcs: [

        "BasicTests.cpp",

        "Callbacks.cpp",

        "CompilationCachingTests.cpp",

        "GeneratedTestHarness.cpp",

        "TestAssertions.cpp",
@@ -37,6 +53,7 @@ cc_test { 
        "android.hardware.neuralnetworks@1.0",

        "android.hardware.neuralnetworks@1.1",

        "android.hardware.neuralnetworks@1.2",

        "android.hardware.neuralnetworks@1.3",

        "android.hidl.allocator@1.0",

        "android.hidl.memory@1.0",

        "libgmock",
@@ -44,6 +61,7 @@ cc_test { 
        "libneuralnetworks_generated_test_harness",

        "libneuralnetworks_utils",

        "VtsHalNeuralNetworksV1_0_utils",

        "VtsHalNeuralNetworksV1_2Callbacks",

    ],

    whole_static_libs: [

        "neuralnetworks_generated_V1_0_example",

neuralnetworks/1.3/Android.bp

0 → 100644
+21 −0
Original line number Diff line number Diff line 
// This file is autogenerated by hidl-gen -Landroidbp.



hidl_interface {

    name: "android.hardware.neuralnetworks@1.3",

    root: "android.hardware",

    vndk: {

        enabled: true,

    },

    srcs: [

        "types.hal",

        "IDevice.hal",

    ],

    interfaces: [

        "android.hardware.neuralnetworks@1.0",

        "android.hardware.neuralnetworks@1.1",

        "android.hardware.neuralnetworks@1.2",

        "android.hidl.base@1.0",

        "android.hidl.safe_union@1.0",

    ],

    gen_java: false,

}

neuralnetworks/1.3/IDevice.hal

0 → 100644
+171 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.hardware.neuralnetworks@1.3;



import @1.0::ErrorStatus;

import @1.1::ExecutionPreference;

import @1.2::Constant;

import @1.2::DeviceType;

import @1.2::Extension;

import @1.2::IDevice;

import @1.2::IPreparedModelCallback;



/**

 * This interface represents a device driver.

 */

interface IDevice extends @1.2::IDevice {

    /**

     * Gets the capabilities of a driver.

     *

     * @return status Error status of the call, must be:

     *                - NONE if successful

     *                - DEVICE_UNAVAILABLE if driver is offline or busy

     *                - GENERAL_FAILURE if there is an unspecified error

     * @return capabilities Capabilities of the driver.

     */

    getCapabilities_1_3() generates (ErrorStatus status, Capabilities capabilities);



    /**

     * Gets the supported operations in a model.

     *

     * getSupportedOperations indicates which operations of a model are fully

     * supported by the vendor driver. If an operation may not be supported for

     * any reason, getSupportedOperations must return false for that operation.

     *

     * @param model A model whose operations--and their corresponding operands--

     *     are to be verified by the driver.

     * @return status Error status of the call, must be:

     *     - NONE if successful

     *     - DEVICE_UNAVAILABLE if driver is offline or busy

     *     - GENERAL_FAILURE if there is an unspecified error

     *     - INVALID_ARGUMENT if provided model is invalid

     * @return supportedOperations A list of supported operations, where true

     *     indicates the operation is supported and false indicates the

     *     operation is not supported. The index of "supported" corresponds with

     *     the index of the operation it is describing.

     */

    getSupportedOperations_1_3(Model model)

        generates (ErrorStatus status, vec<bool> supportedOperations);



    /**

     * Asynchronously creates a prepared model for execution and optionally

     * saves it into cache files.

     *

     * prepareModel is used to make any necessary transformations to or

     * alternative representations to a model for execution, possibly including

     * transformations on the constant data, optimization on the model's graph,

     * or compilation into the device's native binary format. The model itself

     * is not changed.

     *

     * Optionally, caching information may be provided for the driver to save

     * the prepared model to cache files for faster model compilation time when

     * the same model preparation is requested in the future. There are two

     * types of cache file handles provided to the driver: model cache and data

     * cache. For more information on the two types of cache handles, refer to

     * getNumberOfCacheFilesNeeded.

     *

     * The file descriptors must be opened with read and write permission. A

     * file may have any size, and the corresponding file descriptor may have

     * any offset. The driver must truncate a file to zero size before writing

     * to that file. The file descriptors may be closed by the client once the

     * asynchronous preparation has finished. The driver must dup a file

     * descriptor if it wants to get access to the cache file later.

     *

     * The model is prepared asynchronously with respect to the caller. The

     * prepareModel function must verify the inputs to the preparedModel

     * function related to preparing the model (as opposed to saving the

     * prepared model to cache) are correct. If there is an error, prepareModel

     * must immediately invoke the callback with the appropriate ErrorStatus

     * value and nullptr for the IPreparedModel, then return with the same

     * ErrorStatus. If the inputs to the prepareModel function that are related

     * to preparing the model are valid and there is no error, prepareModel must

     * launch an asynchronous task to prepare the model in the background, and

     * immediately return from prepareModel with ErrorStatus::NONE. If the

     * asynchronous task fails to launch, prepareModel must immediately invoke

     * the callback with ErrorStatus::GENERAL_FAILURE and nullptr for the

     * IPreparedModel, then return with ErrorStatus::GENERAL_FAILURE.

     *

     * When the asynchronous task has finished preparing the model, it must

     * immediately invoke the callback function provided as an input to

     * prepareModel. If the model was prepared successfully, the callback object

     * must be invoked with an error status of ErrorStatus::NONE and the

     * produced IPreparedModel object. If an error occurred preparing the model,

     * the callback object must be invoked with the appropriate ErrorStatus

     * value and nullptr for the IPreparedModel.

     *

     * Optionally, the driver may save the prepared model to cache during the

     * asynchronous preparation. Any error that occurs when saving to cache must

     * not affect the status of preparing the model. Even if the input arguments

     * related to the cache may be invalid, or the driver may fail to save to

     * cache, the prepareModel function must finish preparing the model. The

     * driver may choose not to save to cache even if the caching information is

     * provided and valid.

     *

     * The only information that may be unknown to the model at this stage is

     * the shape of the tensors, which may only be known at execution time. As

     * such, some driver services may return partially prepared models, where

     * the prepared model may only be finished when it is paired with a set of

     * inputs to the model. Note that the same prepared model object may be used

     * with different shapes of inputs on different (possibly concurrent)

     * executions.

     *

     * Multiple threads may call prepareModel on the same model concurrently.

     *

     * @param model The model to be prepared for execution.

     * @param preference Indicates the intended execution behavior of a prepared

     *     model.

     * @param modelCache A vector of handles with each entry holding exactly one

     *     cache file descriptor for the security-sensitive cache. The length of

     *     the vector must either be 0 indicating that caching information is

     *     not provided, or match the numModelCache returned from

     *     getNumberOfCacheFilesNeeded. The cache handles will be provided in

     *     the same order when retrieving the preparedModel from cache files

     *     with prepareModelFromCache.

     * @param dataCache A vector of handles with each entry holding exactly one

     *     cache file descriptor for the constants' cache. The length of the

     *     vector must either be 0 indicating that caching information is not

     *     provided, or match the numDataCache returned from

     *     getNumberOfCacheFilesNeeded. The cache handles will be provided in

     *     the same order when retrieving the preparedModel from cache files

     *     with prepareModelFromCache.

     * @param token A caching token of length Constant::BYTE_SIZE_OF_CACHE_TOKEN

     *     identifying the prepared model. The same token will be provided when

     *     retrieving the prepared model from the cache files with

     *     prepareModelFromCache.  Tokens should be chosen to have a low rate of

     *     collision for a particular application. The driver cannot detect a

     *     collision; a collision will result in a failed execution or in a

     *     successful execution that produces incorrect output values. If both

     *     modelCache and dataCache are empty indicating that caching

     *     information is not provided, this token must be ignored.

     * @param callback A callback object used to return the error status of

     *     preparing the model for execution and the prepared model if

     *     successful, nullptr otherwise. The callback object's notify function

     *     must be called exactly once, even if the model could not be prepared.

     * @return status Error status of launching a task which prepares the model

     *     in the background; must be:

     *     - NONE if preparation task is successfully launched

     *     - DEVICE_UNAVAILABLE if driver is offline or busy

     *     - GENERAL_FAILURE if there is an unspecified error

     *     - INVALID_ARGUMENT if one of the input arguments related to preparing

     *       the model is invalid

     */

    prepareModel_1_3(Model model, ExecutionPreference preference,

                     vec<handle> modelCache, vec<handle> dataCache,

                     uint8_t[Constant:BYTE_SIZE_OF_CACHE_TOKEN] token,

                     IPreparedModelCallback callback)

        generates (ErrorStatus status);

};