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

Commit b6a7ed5d authored Dec 18, 2020 by Michael Butler

Introduce canonical IBurst object in NNAPI -- hal

A sibling change to this change introduces a canonical IBurst object and
a new method IPreparedModel::configureExecutionBurst. This CL performs
minimal changes to the NN hal utility code to make the code still
compile.

Bug: 177267324
Test: mma
Change-Id: I076067289dde7def5622a6cb25233619f80efa41

parent 9c1b7cac

neuralnetworks/1.0/utils/include/nnapi/hal/1.0/PreparedModel.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -56,6 +56,8 @@ class PreparedModel final : public nn::IPreparedModel {
	const nn::OptionalDuration& loopTimeoutDuration,		const nn::OptionalDuration& loopTimeoutDuration,
	const nn::OptionalDuration& timeoutDurationAfterFence) const override;		const nn::OptionalDuration& timeoutDurationAfterFence) const override;

			nn::GeneralResult<nn::SharedBurst> configureExecutionBurst() const override;

	std::any getUnderlyingResource() const override;		std::any getUnderlyingResource() const override;

	private:		private:

neuralnetworks/1.0/utils/src/PreparedModel.cpp

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -90,6 +90,10 @@ PreparedModel::executeFenced(const nn::Request& /request/,
	<< "IPreparedModel::executeFenced is not supported on 1.0 HAL service";		<< "IPreparedModel::executeFenced is not supported on 1.0 HAL service";
	}		}

			nn::GeneralResult<nn::SharedBurst> PreparedModel::configureExecutionBurst() const {
			return NN_ERROR(nn::ErrorStatus::GENERAL_FAILURE) << "Not yet implemented";
			}

	std::any PreparedModel::getUnderlyingResource() const {		std::any PreparedModel::getUnderlyingResource() const {
	sp<V1_0::IPreparedModel> resource = kPreparedModel;		sp<V1_0::IPreparedModel> resource = kPreparedModel;
	return resource;		return resource;

neuralnetworks/1.2/utils/include/nnapi/hal/1.2/PreparedModel.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -57,6 +57,8 @@ class PreparedModel final : public nn::IPreparedModel {
	const nn::OptionalDuration& loopTimeoutDuration,		const nn::OptionalDuration& loopTimeoutDuration,
	const nn::OptionalDuration& timeoutDurationAfterFence) const override;		const nn::OptionalDuration& timeoutDurationAfterFence) const override;

			nn::GeneralResult<nn::SharedBurst> configureExecutionBurst() const override;

	std::any getUnderlyingResource() const override;		std::any getUnderlyingResource() const override;

	private:		private:

neuralnetworks/1.2/utils/src/PreparedModel.cpp

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -117,6 +117,10 @@ PreparedModel::executeFenced(const nn::Request& /request/,
	<< "IPreparedModel::executeFenced is not supported on 1.2 HAL service";		<< "IPreparedModel::executeFenced is not supported on 1.2 HAL service";
	}		}

			nn::GeneralResult<nn::SharedBurst> PreparedModel::configureExecutionBurst() const {
			return NN_ERROR(nn::ErrorStatus::GENERAL_FAILURE) << "Not yet implemented";
			}

	std::any PreparedModel::getUnderlyingResource() const {		std::any PreparedModel::getUnderlyingResource() const {
	sp<V1_2::IPreparedModel> resource = kPreparedModel;		sp<V1_2::IPreparedModel> resource = kPreparedModel;
	return resource;		return resource;

neuralnetworks/1.3/utils/include/nnapi/hal/1.3/PreparedModel.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -56,6 +56,8 @@ class PreparedModel final : public nn::IPreparedModel {
	const nn::OptionalDuration& loopTimeoutDuration,		const nn::OptionalDuration& loopTimeoutDuration,
	const nn::OptionalDuration& timeoutDurationAfterFence) const override;		const nn::OptionalDuration& timeoutDurationAfterFence) const override;

			nn::GeneralResult<nn::SharedBurst> configureExecutionBurst() const override;

	std::any getUnderlyingResource() const override;		std::any getUnderlyingResource() const override;

	private:		private: