diff options
author | Lev Proleev <levp@google.com> | 2019-09-11 11:21:46 +0100 |
---|---|---|
committer | Lev Proleev <levp@google.com> | 2019-10-09 14:15:22 +0100 |
commit | af88effce1b911743d562f5490af2300c54f2349 (patch) | |
tree | 0336921e6689dcc5cc2f0474e5b56b27344496bf /nn/runtime/test/fibonacci_extension | |
parent | d23d5645dac1695c28baa943592879b9cf5f71b0 (diff) | |
download | ml-af88effce1b911743d562f5490af2300c54f2349.tar.gz |
Add HAL version 1.3 and add TENSOR_QUANT8_ASYMM_SIGNED OperandType
Bug: 139120468
Bug: 137828494
Test: NeuralNetworksTest_static and VtsHalNeuralnetworksV1_2TargetTest
Change-Id: Iefcaf09145753facb2dc58bbc48e1e597c658b7c
Merged-In: Iefcaf09145753facb2dc58bbc48e1e597c658b7c
(cherry picked from commit 61c871c81b610a240d33ed84a30c14d13b470935)
Diffstat (limited to 'nn/runtime/test/fibonacci_extension')
-rw-r--r-- | nn/runtime/test/fibonacci_extension/FibonacciDriver.cpp | 20 | ||||
-rw-r--r-- | nn/runtime/test/fibonacci_extension/FibonacciDriver.h | 6 |
2 files changed, 13 insertions, 13 deletions
diff --git a/nn/runtime/test/fibonacci_extension/FibonacciDriver.cpp b/nn/runtime/test/fibonacci_extension/FibonacciDriver.cpp index cd1edb618..36d255224 100644 --- a/nn/runtime/test/fibonacci_extension/FibonacciDriver.cpp +++ b/nn/runtime/test/fibonacci_extension/FibonacciDriver.cpp @@ -18,6 +18,9 @@ #include "FibonacciDriver.h" +#include <vector> + +#include "FibonacciExtension.h" #include "HalInterfaces.h" #include "NeuralNetworksExtensions.h" #include "OperationResolver.h" @@ -25,10 +28,6 @@ #include "Utils.h" #include "ValidateHal.h" -#include "FibonacciExtension.h" - -#include <vector> - namespace android { namespace nn { namespace sample_driver { @@ -173,19 +172,20 @@ Return<void> FibonacciDriver::getSupportedExtensions(getSupportedExtensions_cb c return Void(); } -Return<void> FibonacciDriver::getCapabilities_1_2(getCapabilities_1_2_cb cb) { +Return<void> FibonacciDriver::getCapabilities_1_3(getCapabilities_1_3_cb cb) { android::nn::initVLogMask(); VLOG(DRIVER) << "getCapabilities()"; static const PerformanceInfo kPerf = {.execTime = 1.0f, .powerUsage = 1.0f}; - Capabilities capabilities = {.relaxedFloat32toFloat16PerformanceScalar = kPerf, - .relaxedFloat32toFloat16PerformanceTensor = kPerf, - .operandPerformance = nonExtensionOperandPerformance(kPerf)}; + Capabilities capabilities = { + .relaxedFloat32toFloat16PerformanceScalar = kPerf, + .relaxedFloat32toFloat16PerformanceTensor = kPerf, + .operandPerformance = nonExtensionOperandPerformance<HalVersion::V1_3>(kPerf)}; cb(ErrorStatus::NONE, capabilities); return Void(); } -Return<void> FibonacciDriver::getSupportedOperations_1_2(const V1_2::Model& model, - getSupportedOperations_1_2_cb cb) { +Return<void> FibonacciDriver::getSupportedOperations_1_3(const V1_3::Model& model, + getSupportedOperations_1_3_cb cb) { VLOG(DRIVER) << "getSupportedOperations()"; if (!validateModel(model)) { cb(ErrorStatus::INVALID_ARGUMENT, {}); diff --git a/nn/runtime/test/fibonacci_extension/FibonacciDriver.h b/nn/runtime/test/fibonacci_extension/FibonacciDriver.h index 2ae6da0ea..303edd809 100644 --- a/nn/runtime/test/fibonacci_extension/FibonacciDriver.h +++ b/nn/runtime/test/fibonacci_extension/FibonacciDriver.h @@ -46,9 +46,9 @@ class FibonacciDriver : public SampleDriver { public: FibonacciDriver() : SampleDriver(kDriverName, FibonacciOperationResolver::get()) {} hal::Return<void> getSupportedExtensions(getSupportedExtensions_cb cb) override; - hal::Return<void> getCapabilities_1_2(getCapabilities_1_2_cb cb) override; - hal::Return<void> getSupportedOperations_1_2(const hal::V1_2::Model& model, - getSupportedOperations_1_2_cb cb) override; + hal::Return<void> getCapabilities_1_3(getCapabilities_1_3_cb cb) override; + hal::Return<void> getSupportedOperations_1_3(const hal::V1_3::Model& model, + getSupportedOperations_1_3_cb cb) override; static constexpr char kDriverName[] = "sample-driver-fibonacci-extension"; }; |