IVGCVSW-2911 Work towards compatibility with Q
Explicitly use HAL V1_0 Operand, OperandType, and IPreparedModelCallback
Change-Id: If6aa6e9dc1bd0b7673ec247ac3560e7f072ef699
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
diff --git a/1.0/ArmnnDriver.hpp b/1.0/ArmnnDriver.hpp
index 52c34c4..035d448 100644
--- a/1.0/ArmnnDriver.hpp
+++ b/1.0/ArmnnDriver.hpp
@@ -47,7 +47,7 @@
}
Return<ErrorStatus> prepareModel(const V1_0::Model& model,
- const android::sp<IPreparedModelCallback>& cb) override
+ const android::sp<V1_0::IPreparedModelCallback>& cb) override
{
ALOGV("hal_1_0::ArmnnDriver::prepareModel()");
diff --git a/1.0/HalPolicy.hpp b/1.0/HalPolicy.hpp
index 484a99b..bbdf630 100644
--- a/1.0/HalPolicy.hpp
+++ b/1.0/HalPolicy.hpp
@@ -20,6 +20,8 @@
{
public:
using Model = V1_0::Model;
+ using Operand = V1_0::Operand;
+ using OperandType = V1_0::OperandType;
using Operation = V1_0::Operation;
using OperationType = V1_0::OperationType;
using getSupportedOperations_cb = V1_0::IDevice::getSupportedOperations_cb;
diff --git a/1.1/ArmnnDriver.hpp b/1.1/ArmnnDriver.hpp
index 2548c8a..baae635 100644
--- a/1.1/ArmnnDriver.hpp
+++ b/1.1/ArmnnDriver.hpp
@@ -52,7 +52,7 @@
}
Return<ErrorStatus> prepareModel(const V1_0::Model& model,
- const android::sp<IPreparedModelCallback>& cb) override
+ const android::sp<V1_0::IPreparedModelCallback>& cb) override
{
ALOGV("hal_1_1::ArmnnDriver::prepareModel()");
@@ -83,7 +83,7 @@
Return<ErrorStatus> prepareModel_1_1(const V1_1::Model& model,
V1_1::ExecutionPreference preference,
- const android::sp<IPreparedModelCallback>& cb) override
+ const android::sp<V1_0::IPreparedModelCallback>& cb) override
{
ALOGV("hal_1_1::ArmnnDriver::prepareModel_1_1()");
diff --git a/ArmnnDriverImpl.cpp b/ArmnnDriverImpl.cpp
index 40bd80a..cb77247 100644
--- a/ArmnnDriverImpl.cpp
+++ b/ArmnnDriverImpl.cpp
@@ -26,9 +26,9 @@
namespace
{
-void NotifyCallbackAndCheck(const sp<IPreparedModelCallback>& callback,
+void NotifyCallbackAndCheck(const sp<V1_0::IPreparedModelCallback>& callback,
ErrorStatus errorStatus,
- const sp<IPreparedModel>& preparedModelPtr)
+ const sp<V1_0::IPreparedModel>& preparedModelPtr)
{
Return<void> returned = callback->notify(errorStatus, preparedModelPtr);
// This check is required, if the callback fails and it isn't checked it will bring down the service
@@ -41,7 +41,7 @@
Return<ErrorStatus> FailPrepareModel(ErrorStatus error,
const string& message,
- const sp<IPreparedModelCallback>& callback)
+ const sp<V1_0::IPreparedModelCallback>& callback)
{
ALOGW("ArmnnDriverImpl::prepareModel: %s", message.c_str());
NotifyCallbackAndCheck(callback, error, nullptr);
@@ -107,7 +107,7 @@
const armnn::IGpuAccTunedParametersPtr& clTunedParameters,
const DriverOptions& options,
const HalModel& model,
- const sp<IPreparedModelCallback>& cb,
+ const sp<V1_0::IPreparedModelCallback>& cb,
bool float32ToFloat16)
{
ALOGV("ArmnnDriverImpl::prepareModel()");
diff --git a/ArmnnDriverImpl.hpp b/ArmnnDriverImpl.hpp
index 7f1c9b9..b2808eb 100644
--- a/ArmnnDriverImpl.hpp
+++ b/ArmnnDriverImpl.hpp
@@ -9,6 +9,8 @@
#include <HalInterfaces.h>
+namespace V1_0 = ::android::hardware::neuralnetworks::V1_0;
+
namespace armnn_driver
{
@@ -30,7 +32,7 @@
const armnn::IGpuAccTunedParametersPtr& clTunedParameters,
const DriverOptions& options,
const HalModel& model,
- const android::sp<IPreparedModelCallback>& cb,
+ const android::sp<V1_0::IPreparedModelCallback>& cb,
bool float32ToFloat16 = false);
static Return<DeviceStatus> getStatus();
diff --git a/ArmnnPreparedModel.hpp b/ArmnnPreparedModel.hpp
index f6008b8..7a65d52 100644
--- a/ArmnnPreparedModel.hpp
+++ b/ArmnnPreparedModel.hpp
@@ -19,7 +19,7 @@
{
template <typename HalVersion>
-class ArmnnPreparedModel : public IPreparedModel
+class ArmnnPreparedModel : public V1_0::IPreparedModel
{
public:
using HalModel = typename HalVersion::Model;
@@ -33,13 +33,13 @@
virtual ~ArmnnPreparedModel();
virtual Return<ErrorStatus> execute(const Request& request,
- const ::android::sp<IExecutionCallback>& callback) override;
+ const ::android::sp<V1_0::IExecutionCallback>& callback) override;
/// execute the graph prepared from the request
void ExecuteGraph(std::shared_ptr<std::vector<::android::nn::RunTimePoolInfo>>& pMemPools,
std::shared_ptr<armnn::InputTensors>& pInputTensors,
std::shared_ptr<armnn::OutputTensors>& pOutputTensors,
- const ::android::sp<IExecutionCallback>& callback);
+ const ::android::sp<V1_0::IExecutionCallback>& callback);
/// Executes this model with dummy inputs (e.g. all zeroes).
/// \return false on failure, otherwise true
diff --git a/ConversionUtils.hpp b/ConversionUtils.hpp
index 74e26f2..57c4616 100644
--- a/ConversionUtils.hpp
+++ b/ConversionUtils.hpp
@@ -159,16 +159,16 @@
return false;
}
-armnn::TensorShape GetTensorShapeForOperand(const Operand& operand)
+armnn::TensorShape GetTensorShapeForOperand(const V1_0::Operand& operand)
{
return armnn::TensorShape(operand.dimensions.size(), operand.dimensions.data());
}
-inline bool IsOperandTypeSupportedForTensors(OperandType type)
+inline bool IsOperandTypeSupportedForTensors(V1_0::OperandType type)
{
- return type == OperandType::TENSOR_FLOAT32 ||
- type == OperandType::TENSOR_QUANT8_ASYMM ||
- type == OperandType::TENSOR_INT32;
+ return type == V1_0::OperandType::TENSOR_FLOAT32 ||
+ type == V1_0::OperandType::TENSOR_QUANT8_ASYMM ||
+ type == V1_0::OperandType::TENSOR_INT32;
}
void BroadcastTensor(LayerInputHandle& input0, LayerInputHandle& input1, armnn::IConnectableLayer* startLayer,
@@ -233,10 +233,10 @@
outPadTail = boost::numeric_cast<uint32_t>(padTail);
}
-Shape GetOperandShape(const Operand& operand)
+Shape GetOperandShape(const V1_0::Operand& operand)
{
Shape shape;
- shape.type = operand.type;
+ shape.type = OperandType(operand.type);
shape.dimensions = operand.dimensions;
shape.scale = operand.scale;
shape.offset = operand.zeroPoint;
@@ -463,7 +463,7 @@
using namespace android::nn;
template<typename HalOperation, typename HalModel>
-const Operand* GetInputOperand(const HalOperation& operation, uint32_t inputIndex, const HalModel& model,
+const V1_0::Operand* GetInputOperand(const HalOperation& operation, uint32_t inputIndex, const HalModel& model,
bool failOnIndexOutOfBounds = true)
{
if (inputIndex >= operation.inputs.size())
@@ -480,7 +480,7 @@
}
template<typename HalOperation, typename HalModel>
-const Operand* GetOutputOperand(const HalOperation& operation, uint32_t outputIndex, const HalModel& model)
+const V1_0::Operand* GetOutputOperand(const HalOperation& operation, uint32_t outputIndex, const HalModel& model)
{
if (outputIndex >= operation.outputs.size())
{
@@ -495,7 +495,7 @@
}
template<typename HalModel>
-ConstTensorPin ConvertOperandToConstTensorPin(const Operand& operand,
+ConstTensorPin ConvertOperandToConstTensorPin(const V1_0::Operand& operand,
const HalModel& model,
const ConversionData& data,
const armnn::PermutationVector& dimensionMappings = g_DontPermute,
@@ -509,9 +509,9 @@
}
if (!optional &&
- operand.lifetime != OperandLifeTime::CONSTANT_COPY &&
- operand.lifetime != OperandLifeTime::CONSTANT_REFERENCE &&
- operand.lifetime != OperandLifeTime::NO_VALUE)
+ operand.lifetime !=V1_0::OperandLifeTime::CONSTANT_COPY &&
+ operand.lifetime !=V1_0::OperandLifeTime::CONSTANT_REFERENCE &&
+ operand.lifetime !=V1_0::OperandLifeTime::NO_VALUE)
{
Fail("%s: invalid operand lifetime: %s", __func__, toString(operand.lifetime).c_str());
return ConstTensorPin();
@@ -547,7 +547,7 @@
const armnn::TensorShape* overrideTensorShape = nullptr,
bool optional = false)
{
- const Operand* operand = GetInputOperand(operation, inputIndex, model);
+ const V1_0::Operand* operand = GetInputOperand(operation, inputIndex, model);
if (!operand)
{
Fail("%s: failed to get input operand: index=%u", __func__, inputIndex);
@@ -562,26 +562,28 @@
}
template<typename HalModel>
-const void* GetOperandValueReadOnlyAddress(const Operand& operand, const HalModel& model, const ConversionData& data,
+const void* GetOperandValueReadOnlyAddress(const V1_0::Operand& operand,
+ const HalModel& model,
+ const ConversionData& data,
bool optional = false)
{
const void* valueStart = nullptr;
switch (operand.lifetime)
{
- case OperandLifeTime::CONSTANT_COPY:
+ case V1_0::OperandLifeTime::CONSTANT_COPY:
{
// Constant found in model.operandValues
valueStart = &model.operandValues[operand.location.offset];
break;
}
- case OperandLifeTime::CONSTANT_REFERENCE:
+ case V1_0::OperandLifeTime::CONSTANT_REFERENCE:
{
// Constant specified via a Memory object
valueStart = GetMemoryFromPool(operand.location, data.m_MemPools);
break;
}
- case OperandLifeTime::NO_VALUE:
+ case V1_0::OperandLifeTime::NO_VALUE:
{
// An optional input tensor with no values is not an error so should not register as a fail
if (optional)
@@ -589,6 +591,7 @@
valueStart = nullptr;
break;
}
+ [[fallthrough]];
}
default:
{
@@ -605,12 +608,12 @@
template<typename HalOperation, typename HalModel, typename OutputType>
bool GetInputScalar(const HalOperation& operation,
uint32_t inputIndex,
- OperandType type,
+ V1_0::OperandType type,
OutputType& outValue,
const HalModel& model,
const ConversionData& data)
{
- const Operand* operand = GetInputOperand(operation, inputIndex, model);
+ const V1_0::Operand* operand = GetInputOperand(operation, inputIndex, model);
if (!operand)
{
return Fail("%s: invalid input operand at index %i", __func__, inputIndex);
@@ -645,7 +648,7 @@
const HalModel& model,
const ConversionData& data)
{
- return GetInputScalar(operation, inputIndex, OperandType::INT32, outValue, model, data);
+ return GetInputScalar(operation, inputIndex,V1_0::OperandType::INT32, outValue, model, data);
}
@@ -656,19 +659,19 @@
const HalModel& model,
const ConversionData& data)
{
- return GetInputScalar(operation, inputIndex, OperandType::FLOAT32, outValue, model, data);
+ return GetInputScalar(operation, inputIndex,V1_0::OperandType::FLOAT32, outValue, model, data);
}
template<typename HalOperation, typename HalModel>
bool GetInputActivationFunctionImpl(const HalOperation& operation,
uint32_t inputIndex,
- OperandType type,
+ V1_0::OperandType type,
ActivationFn& outActivationFunction,
const HalModel& model,
const ConversionData& data)
{
- if (type != OperandType::INT32 && type != OperandType::TENSOR_INT32)
+ if (type !=V1_0::OperandType::INT32 && type !=V1_0::OperandType::TENSOR_INT32)
{
return Fail("%s: unexpected operand type: %s (should be %s or %s)",
__func__,
@@ -696,7 +699,7 @@
{
return GetInputActivationFunctionImpl(operation,
inputIndex,
- OperandType::INT32,
+ V1_0::OperandType::INT32,
outActivationFunction,
model,
data);
@@ -712,7 +715,7 @@
// This only accepts a 1-D tensor of size 1
return GetInputActivationFunctionImpl(operation,
inputIndex,
- OperandType::INT32,
+ V1_0::OperandType::INT32,
outActivationFunction,
model,
data);
@@ -741,12 +744,12 @@
}
template<typename HalModel>
-bool GetTensorInt32Values(const Operand& operand,
+bool GetTensorInt32Values(const V1_0::Operand& operand,
std::vector<int32_t>& outValues,
const HalModel& model,
const ConversionData& data)
{
- if (operand.type != OperandType::TENSOR_INT32)
+ if (operand.type !=V1_0::OperandType::TENSOR_INT32)
{
return Fail("%s: invalid operand type: %s", __func__, toString(operand.type).c_str());
}
@@ -793,7 +796,7 @@
const HalModel& model,
ConversionData& data)
{
- const Operand* operand = GetInputOperand(operation, inputIndex, model);
+ const V1_0::Operand* operand = GetInputOperand(operation, inputIndex, model);
if (!operand)
{
Fail("%s: failed to get input operand %i", __func__, inputIndex);
@@ -810,9 +813,9 @@
switch (operand->lifetime)
{
- case OperandLifeTime::TEMPORARY_VARIABLE: // intentional fallthrough
- case OperandLifeTime::MODEL_INPUT:
- case OperandLifeTime::MODEL_OUTPUT:
+ case V1_0::OperandLifeTime::TEMPORARY_VARIABLE: // intentional fallthrough
+ case V1_0::OperandLifeTime::MODEL_INPUT:
+ case V1_0::OperandLifeTime::MODEL_OUTPUT:
{
// The tensor is either an operand internal to the model, or a model input.
// It can be associated with an ArmNN output slot for an existing layer.
@@ -822,8 +825,8 @@
return LayerInputHandle(true, data.m_OutputSlotForOperand[operandIndex], operandTensorInfo);
break;
}
- case OperandLifeTime::CONSTANT_COPY:
- case OperandLifeTime::CONSTANT_REFERENCE:
+ case V1_0::OperandLifeTime::CONSTANT_COPY:
+ case V1_0::OperandLifeTime::CONSTANT_REFERENCE:
{
// The tensor has an already known constant value, and can be converted into an ArmNN Constant layer.
ConstTensorPin tensorPin = ConvertOperandToConstTensorPin(*operand, model, data);
@@ -873,7 +876,7 @@
return Fail("%s: Input 0 is invalid", operationName);
}
- const Operand* outputOperand = GetOutputOperand(operation, 0, model);
+ const V1_0::Operand* outputOperand = GetOutputOperand(operation, 0, model);
if (!outputOperand)
{
return false;
@@ -904,7 +907,7 @@
const HalModel& model,
ConversionData& data)
{
- const Operand* outputOperand = GetOutputOperand(operation, operationOutputIndex, model);
+ const V1_0::Operand* outputOperand = GetOutputOperand(operation, operationOutputIndex, model);
if ((outputOperand == nullptr) || (operationOutputIndex >= layer.GetNumOutputSlots()))
{
return false;
@@ -943,7 +946,7 @@
return Fail("%s: Could not read input 0", operationName);
}
- const Operand* output = GetOutputOperand(operation, 0, model);
+ const V1_0::Operand* output = GetOutputOperand(operation, 0, model);
if (!output)
{
return Fail("%s: Could not read output 0", __func__);
@@ -964,10 +967,10 @@
// one input, 6 parameters (padding, stridex, stridey, width, height, activation type)
android::nn::PaddingScheme scheme;
if (!GetInputPaddingScheme(operation, 1, scheme, model, data)
- || !GetInputScalar(operation, 2, OperandType::INT32, desc.m_StrideX, model, data)
- || !GetInputScalar(operation, 3, OperandType::INT32, desc.m_StrideY, model, data)
- || !GetInputScalar(operation, 4, OperandType::INT32, desc.m_PoolWidth, model, data)
- || !GetInputScalar(operation, 5, OperandType::INT32, desc.m_PoolHeight, model, data)
+ || !GetInputScalar(operation, 2,V1_0::OperandType::INT32, desc.m_StrideX, model, data)
+ || !GetInputScalar(operation, 3,V1_0::OperandType::INT32, desc.m_StrideY, model, data)
+ || !GetInputScalar(operation, 4,V1_0::OperandType::INT32, desc.m_PoolWidth, model, data)
+ || !GetInputScalar(operation, 5,V1_0::OperandType::INT32, desc.m_PoolHeight, model, data)
|| !GetInputActivationFunction(operation, 6, activation, model, data))
{
return Fail("%s: Operation has invalid inputs", operationName);
@@ -982,14 +985,14 @@
else
{
// one input, 9 parameters (padding l r t b, stridex, stridey, width, height, activation type)
- if (!GetInputScalar(operation, 1, OperandType::INT32, desc.m_PadLeft, model, data)
- || !GetInputScalar(operation, 2, OperandType::INT32, desc.m_PadRight, model, data)
- || !GetInputScalar(operation, 3, OperandType::INT32, desc.m_PadTop, model, data)
- || !GetInputScalar(operation, 4, OperandType::INT32, desc.m_PadBottom, model, data)
- || !GetInputScalar(operation, 5, OperandType::INT32, desc.m_StrideX, model, data)
- || !GetInputScalar(operation, 6, OperandType::INT32, desc.m_StrideY, model, data)
- || !GetInputScalar(operation, 7, OperandType::INT32, desc.m_PoolWidth, model, data)
- || !GetInputScalar(operation, 8, OperandType::INT32, desc.m_PoolHeight, model, data)
+ if (!GetInputScalar(operation, 1,V1_0::OperandType::INT32, desc.m_PadLeft, model, data)
+ || !GetInputScalar(operation, 2,V1_0::OperandType::INT32, desc.m_PadRight, model, data)
+ || !GetInputScalar(operation, 3,V1_0::OperandType::INT32, desc.m_PadTop, model, data)
+ || !GetInputScalar(operation, 4,V1_0::OperandType::INT32, desc.m_PadBottom, model, data)
+ || !GetInputScalar(operation, 5,V1_0::OperandType::INT32, desc.m_StrideX, model, data)
+ || !GetInputScalar(operation, 6,V1_0::OperandType::INT32, desc.m_StrideY, model, data)
+ || !GetInputScalar(operation, 7,V1_0::OperandType::INT32, desc.m_PoolWidth, model, data)
+ || !GetInputScalar(operation, 8,V1_0::OperandType::INT32, desc.m_PoolHeight, model, data)
|| !GetInputActivationFunction(operation, 9, activation, model, data))
{
return Fail("%s: Operation has invalid inputs", operationName);
diff --git a/ModelToINetworkConverter.cpp b/ModelToINetworkConverter.cpp
index fccd759..2a79a27 100644
--- a/ModelToINetworkConverter.cpp
+++ b/ModelToINetworkConverter.cpp
@@ -68,7 +68,7 @@
{
// inputs in android nn are represented by operands
uint32_t inputIndex = m_Model.inputIndexes[i];
- const Operand& operand = m_Model.operands[inputIndex];
+ const V1_0::Operand& operand = m_Model.operands[inputIndex];
const armnn::TensorInfo& tensor = GetTensorInfoForOperand(operand);
armnn::IConnectableLayer* layer = m_Data.m_Network->AddInputLayer(i);
@@ -137,7 +137,7 @@
{
// outputs in android nn are represented by operands
uint32_t outputIndex = m_Model.outputIndexes[i];
- const Operand& operand = m_Model.operands[outputIndex];
+ const V1_0::Operand& operand = m_Model.operands[outputIndex];
const armnn::TensorInfo& tensor = GetTensorInfoForOperand(operand);
armnn::IConnectableLayer* layer = m_Data.m_Network->AddOutputLayer(i);
diff --git a/Utils.cpp b/Utils.cpp
index cd9e1b4..f5599f7 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -74,19 +74,19 @@
return memory;
}
-armnn::TensorInfo GetTensorInfoForOperand(const Operand& operand)
+armnn::TensorInfo GetTensorInfoForOperand(const V1_0::Operand& operand)
{
armnn::DataType type;
switch (operand.type)
{
- case OperandType::TENSOR_FLOAT32:
+ case V1_0::OperandType::TENSOR_FLOAT32:
type = armnn::DataType::Float32;
break;
- case OperandType::TENSOR_QUANT8_ASYMM:
+ case V1_0::OperandType::TENSOR_QUANT8_ASYMM:
type = armnn::DataType::QuantisedAsymm8;
break;
- case OperandType::TENSOR_INT32:
+ case V1_0::OperandType::TENSOR_INT32:
type = armnn::DataType::Signed32;
break;
default:
@@ -101,7 +101,7 @@
return ret;
}
-std::string GetOperandSummary(const Operand& operand)
+std::string GetOperandSummary(const V1_0::Operand& operand)
{
return android::hardware::details::arrayToString(operand.dimensions, operand.dimensions.size()) + " " +
toString(operand.type);
diff --git a/Utils.hpp b/Utils.hpp
index 812dfbd..e55d8f8 100644
--- a/Utils.hpp
+++ b/Utils.hpp
@@ -19,6 +19,8 @@
#include <fstream>
#include <iomanip>
+namespace V1_0 = ::android::hardware::neuralnetworks::V1_0;
+
namespace armnn_driver
{
@@ -44,9 +46,9 @@
const std::vector<android::nn::RunTimePoolInfo>& memPools);
/// Can throw UnsupportedOperand
-armnn::TensorInfo GetTensorInfoForOperand(const Operand& operand);
+armnn::TensorInfo GetTensorInfoForOperand(const V1_0::Operand& operand);
-std::string GetOperandSummary(const Operand& operand);
+std::string GetOperandSummary(const V1_0::Operand& operand);
template <typename HalModel>
std::string GetModelSummary(const HalModel& model)
@@ -130,4 +132,4 @@
}
}
-} // namespace armnn_driver
\ No newline at end of file
+} // namespace armnn_driver