diff options
| author | Sadik Armagan <sadik.armagan@arm.com> | 2019-05-22 18:00:30 +0100 |
|---|---|---|
| committer | Sadik Armagan <sadik.armagan@arm.com> | 2019-05-22 18:00:30 +0100 |
| commit | d6539c58519962acd8967e93ceb2da049631c832 (patch) | |
| tree | fc1a324e5b2a757d6b9e26a721db362988c93dfe /test/1.1 | |
| parent | ef08a1179a707f4d93616403c2c6e0d143f71351 (diff) | |
| download | android-nn-driver-d6539c58519962acd8967e93ceb2da049631c832.tar.gz | |
IVGCVSW-2911 Add Android Q support to android-nn-driver infrastructure
* Updated Android.mk to build Android Q
* Added androidnn.go to inject cpp flags for Q
* Create Runtime when ACL is not enabled
Change-Id: Ia3e7a8e484fc81ce63998a65e29753cbf941173c
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Signed-off-by: Kevin May <kevin.may@arm.com>
Diffstat (limited to 'test/1.1')
| -rw-r--r-- | test/1.1/Mean.cpp | 4 | ||||
| -rw-r--r-- | test/1.1/Transpose.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/1.1/Mean.cpp b/test/1.1/Mean.cpp index 4ebb8cfa..7d482433 100644 --- a/test/1.1/Mean.cpp +++ b/test/1.1/Mean.cpp @@ -32,7 +32,7 @@ void MeanTestImpl(const TestTensor& input, V1_1::Model model = {}; AddInputOperand (model, input.GetDimensions()); - AddTensorOperand(model, axisDimensions, const_cast<int32_t*>(axisValues), OperandType::TENSOR_INT32); + AddTensorOperand(model, axisDimensions, const_cast<int32_t*>(axisValues), V1_0::OperandType::TENSOR_INT32); AddIntOperand (model, keepDims); AddOutputOperand(model, expectedOutput.GetDimensions()); @@ -42,7 +42,7 @@ void MeanTestImpl(const TestTensor& input, model.operations[0].outputs = hidl_vec<uint32_t>{ 3 }; model.relaxComputationFloat32toFloat16 = fp16Enabled; - android::sp<IPreparedModel> preparedModel = PrepareModel(model, *driver); + android::sp<V1_0::IPreparedModel> preparedModel = PrepareModel(model, *driver); // The request's memory pools will follow the same order as the inputs DataLocation inLoc = {}; diff --git a/test/1.1/Transpose.cpp b/test/1.1/Transpose.cpp index a0521436..6dc3e0ee 100644 --- a/test/1.1/Transpose.cpp +++ b/test/1.1/Transpose.cpp @@ -30,7 +30,7 @@ void TransposeTestImpl(const TestTensor & inputs, int32_t perm[], V1_1::Model model = {}; AddInputOperand(model,inputs.GetDimensions()); - AddTensorOperand(model, hidl_vec<uint32_t>{4}, perm, OperandType::TENSOR_INT32); + AddTensorOperand(model, hidl_vec<uint32_t>{4}, perm, V1_0::OperandType::TENSOR_INT32); AddOutputOperand(model, expectedOutputTensor.GetDimensions()); model.operations.resize(1); @@ -38,7 +38,7 @@ void TransposeTestImpl(const TestTensor & inputs, int32_t perm[], model.operations[0].inputs = hidl_vec<uint32_t>{0, 1}; model.operations[0].outputs = hidl_vec<uint32_t>{2}; - android::sp<IPreparedModel> preparedModel = PrepareModel(model, *driver); + android::sp<V1_0::IPreparedModel> preparedModel = PrepareModel(model, *driver); // the request's memory pools will follow the same order as // the inputs |