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

Commit 07c5cfcf authored by Michael Butler's avatar Michael Butler Committed by Gerrit Code Review
Browse files

Merge changes from topic "nnapi-aosp-sync" 

* changes:
  NNAPI: Add execution preference to prepareModel (HAL)
  Sync NNAPI Operand and Operation documentation fixes
  Fix the spec for TENSOR_QUANT8_ASYMM to match our validation.
  Fix the NNAPI HAL documentation about ADD and MUL
  NN validation tests
  Add validation tests for consistency of model inputs and outputs.
  Disable arm32 asan for VtsHalNeuralnetworksV1_1TargetTest
parents 031a6a87 f02692d8

current.txt

+3 −2
Original line number Diff line number Diff line
@@ -238,15 +238,16 @@ a432d6d9200248dc2126827bcd6cdea31dd65eff39b939f64585d27d915a5857 android.hardwar 
619600109232ed64b827c8a11beed8070b1827ae464547d7aa146cf0473b4bca android.hardware.cas.native@1.0::IDescrambler

0a159f81359cd4f71bbe00972ee8403ea79351fb7c0cd48be72ebb3e424dbaef android.hardware.radio@1.0::types

09342041e17c429fce0034b9096d17849122111436a5f0053e7e59500e1cb89c android.hardware.media.omx@1.0::IOmxStore

246a56d37d57a47224562c9d077b4a2886ce6242b9311bd98a17325944c280d7 android.hardware.neuralnetworks@1.0::types

93eb3757ceaf21590fa4cd1d4a7dfe3b3794af5396100a6d25630879352abce9 android.hardware.neuralnetworks@1.0::IDevice

f66f9a38541bf92001d3adcce678cd7e3da2262124befb460b1c9aea9492813b android.hardware.neuralnetworks@1.0::IExecutionCallback

953607822954435874f4b81686440a604e2a88cdd2d9164c6293f3d5772510d7 android.hardware.neuralnetworks@1.0::IPreparedModel

73e03573494ba96f0e711ab7f1956c5b2d54c3da690cd7ecf4d6d0f287447730 android.hardware.neuralnetworks@1.0::IPreparedModelCallback

246a56d37d57a47224562c9d077b4a2886ce6242b9311bd98a17325944c280d7 android.hardware.neuralnetworks@1.0::types

f4945e397b5dea41bb64518dfde59be71245d8a125fd1e0acffeb57ac7b08fed android.hardware.thermal@1.1::IThermal

c8bc853546dd55584611def2a9fa1d99f657e3366c976d2f60fe6b8aa6d2cb87 android.hardware.thermal@1.1::IThermalCallback



# Future changes to HALs

5804ca86611d72e5481f022b3a0c1b334217f2e4988dad25730c42af2d1f4d1c android.hardware.neuralnetworks@1.0::IDevice

088b30a9c9ce27bc955b08a03c38c208f8f65b51133053c7656c875479801b99 android.hardware.neuralnetworks@1.0::types

12e8dca4ab7d8aadd0ef8f1b438021938e2396139e85db2ed65783b08800aa52 android.hardware.neuralnetworks@1.0::IExecutionCallback

702f9a4cd3b7486a4b04f7155b737757ac2ca4b3548976d5782ad3cae9ff9780 android.hardware.neuralnetworks@1.0::types

neuralnetworks/1.0/IExecutionCallback.hal

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ interface IExecutionCallback { 
     * ErrorStatus resulting from the execution. If the asynchronous task

     * is not launched, notify must be invoked with the appropriate error.

     *

     * @return param Error status returned from launching the asynchronous task

     * @param status Error status returned from launching the asynchronous task

     *               (if the launch fails) or from the asynchronous task itself

     *               (if the launch succeeds). Must be:

     *               - NONE if the asynchronous execution was successful

neuralnetworks/1.0/types.hal

+633 −355

File changed.

Preview size limit exceeded, changes collapsed.

neuralnetworks/1.0/vts/functional/Android.bp

+7 −5
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ cc_library_static { 
    name: "VtsHalNeuralnetworksTest_utils",

    srcs: [

        "Callbacks.cpp",

        "Models.cpp",

        "GeneratedTestHarness.cpp",

    ],

    defaults: ["VtsHalTargetTestDefaults"],
@@ -41,14 +40,17 @@ cc_library_static { 
cc_test {

    name: "VtsHalNeuralnetworksV1_0TargetTest",

    srcs: [

        "VtsHalNeuralnetworksV1_0.cpp",

        "VtsHalNeuralnetworksV1_0BasicTest.cpp",

        "VtsHalNeuralnetworksV1_0GeneratedTest.cpp",

        "BasicTests.cpp",

        "GeneratedTests.cpp",

        "ValidateModel.cpp",

        "ValidateRequest.cpp",

        "ValidationTests.cpp",

        "VtsHalNeuralnetworks.cpp",

    ],

    defaults: ["VtsHalTargetTestDefaults"],

    static_libs: [

        "android.hardware.neuralnetworks@1.0",

        "android.hardware.neuralnetworks@1.1",

        "android.hardware.neuralnetworks@1.0",

        "android.hidl.allocator@1.0",

        "android.hidl.memory@1.0",

        "libhidlmemory",

neuralnetworks/1.0/vts/functional/BasicTests.cpp

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

 * Copyright (C) 2018 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.

 */



#define LOG_TAG "neuralnetworks_hidl_hal_test"



#include "VtsHalNeuralnetworks.h"



namespace android {

namespace hardware {

namespace neuralnetworks {

namespace V1_0 {

namespace vts {

namespace functional {



// create device test

TEST_F(NeuralnetworksHidlTest, CreateDevice) {}



// status test

TEST_F(NeuralnetworksHidlTest, StatusTest) {

    Return<DeviceStatus> status = device->getStatus();

    ASSERT_TRUE(status.isOk());

    EXPECT_EQ(DeviceStatus::AVAILABLE, static_cast<DeviceStatus>(status));

}



// initialization

TEST_F(NeuralnetworksHidlTest, GetCapabilitiesTest) {

    Return<void> ret =

        device->getCapabilities([](ErrorStatus status, const Capabilities& capabilities) {

            EXPECT_EQ(ErrorStatus::NONE, status);

            EXPECT_LT(0.0f, capabilities.float32Performance.execTime);

            EXPECT_LT(0.0f, capabilities.float32Performance.powerUsage);

            EXPECT_LT(0.0f, capabilities.quantized8Performance.execTime);

            EXPECT_LT(0.0f, capabilities.quantized8Performance.powerUsage);

        });

    EXPECT_TRUE(ret.isOk());

}



}  // namespace functional

}  // namespace vts

}  // namespace V1_0

}  // namespace neuralnetworks

}  // namespace hardware

}  // namespace android