Merge changes from topic "nnapisync_1.2" (96e08aa7) · Commits · e / os / android_hardware_interfaces

neuralnetworks/1.0/vts/functional/Android.bp

+3 −1

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ cc_library_static {
		static_libs: [
		"android.hardware.neuralnetworks@1.0",
		"android.hardware.neuralnetworks@1.1",
		"android.hardware.neuralnetworks@1.2",
		"android.hidl.allocator@1.0",
		"android.hidl.memory@1.0",
		"libhidlmemory",
		@@ -49,8 +50,9 @@ cc_test {
		],
		defaults: ["VtsHalTargetTestDefaults"],
		static_libs: [
		"android.hardware.neuralnetworks@1.1",
		"android.hardware.neuralnetworks@1.0",
		"android.hardware.neuralnetworks@1.1",
		"android.hardware.neuralnetworks@1.2",
		"android.hidl.allocator@1.0",
		"android.hidl.memory@1.0",
		"libhidlmemory",

neuralnetworks/1.0/vts/functional/GeneratedTestHarness.cpp

+52 −0

Original line number	Diff line number	Diff line
		@@ -275,6 +275,58 @@ void Execute(const sp<V1_1::IDevice>& device, std::function<V1_1::Model(void)> c
		EvaluatePreparedModel(preparedModel, is_ignored, examples, fpAtol, fpRtol);
		}

		// TODO: Reduce code duplication.
		void Execute(const sp<V1_2::IDevice>& device, std::function<V1_2::Model(void)> create_model,
		std::function<bool(int)> is_ignored,
		const std::vector<MixedTypedExampleType>& examples) {
		V1_2::Model model = create_model();

		// see if service can handle model
		bool fullySupportsModel = false;
		Return<void> supportedCall = device->getSupportedOperations_1_2(
		model, [&fullySupportsModel](ErrorStatus status, const hidl_vec<bool>& supported) {
		ASSERT_EQ(ErrorStatus::NONE, status);
		ASSERT_NE(0ul, supported.size());
		fullySupportsModel =
		std::all_of(supported.begin(), supported.end(), [](bool valid) { return valid; });
		});
		ASSERT_TRUE(supportedCall.isOk());

		// launch prepare model
		sp<PreparedModelCallback> preparedModelCallback = new PreparedModelCallback();
		ASSERT_NE(nullptr, preparedModelCallback.get());
		Return<ErrorStatus> prepareLaunchStatus = device->prepareModel_1_2(
		model, ExecutionPreference::FAST_SINGLE_ANSWER, preparedModelCallback);
		ASSERT_TRUE(prepareLaunchStatus.isOk());
		ASSERT_EQ(ErrorStatus::NONE, static_cast<ErrorStatus>(prepareLaunchStatus));

		// retrieve prepared model
		preparedModelCallback->wait();
		ErrorStatus prepareReturnStatus = preparedModelCallback->getStatus();
		sp<IPreparedModel> preparedModel = preparedModelCallback->getPreparedModel();

		// early termination if vendor service cannot fully prepare model
		if (!fullySupportsModel && prepareReturnStatus != ErrorStatus::NONE) {
		ASSERT_EQ(nullptr, preparedModel.get());
		LOG(INFO) << "NN VTS: Early termination of test because vendor service cannot "
		"prepare model that it does not support.";
		std::cout << "[ ] Early termination of test because vendor service cannot "
		"prepare model that it does not support."
		<< std::endl;
		return;
		}
		EXPECT_EQ(ErrorStatus::NONE, prepareReturnStatus);
		ASSERT_NE(nullptr, preparedModel.get());

		// TODO: Adjust the error limit based on testing.
		// If in relaxed mode, set the absolute tolerance to be 5ULP of FP16.
		float fpAtol = !model.relaxComputationFloat32toFloat16 ? 1e-5f : 5.0f * 0.0009765625f;
		// Set the relative tolerance to be 5ULP of the corresponding FP precision.
		float fpRtol = !model.relaxComputationFloat32toFloat16 ? 5.0f * 1.1920928955078125e-7f
		: 5.0f * 0.0009765625f;
		EvaluatePreparedModel(preparedModel, is_ignored, examples, fpAtol, fpRtol);
		}

		} // namespace generated_tests

		} // namespace neuralnetworks

neuralnetworks/1.1/vts/functional/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ cc_test {
		static_libs: [
		"android.hardware.neuralnetworks@1.0",
		"android.hardware.neuralnetworks@1.1",
		"android.hardware.neuralnetworks@1.2",
		"android.hidl.allocator@1.0",
		"android.hidl.memory@1.0",
		"libhidlmemory",

neuralnetworks/1.2/Android.bp

0 → 100644

+24 −0

Original line number	Diff line number	Diff line
		// This file is autogenerated by hidl-gen -Landroidbp.

		hidl_interface {
		name: "android.hardware.neuralnetworks@1.2",
		root: "android.hardware",
		vndk: {
		enabled: true,
		},
		srcs: [
		"types.hal",
		"IDevice.hal",
		],
		interfaces: [
		"android.hardware.neuralnetworks@1.0",
		"android.hardware.neuralnetworks@1.1",
		"android.hidl.base@1.0",
		],
		types: [
		"Model",
		"Operation",
		"OperationType",
		],
		gen_java: false,
		}

neuralnetworks/1.2/IDevice.hal

0 → 100644

+106 −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.
		*/

		package android.hardware.neuralnetworks@1.2;

		import @1.0::ErrorStatus;
		import @1.0::IPreparedModelCallback;
		import @1.1::ExecutionPreference;
		import @1.1::IDevice;

		/**
		* This interface represents a device driver.
		*/
		interface IDevice extends @1.1::IDevice {
		/**
		* Gets the supported operations in a model.
		*
		* getSupportedOperations indicates which operations of a model are fully
		* supported by the vendor driver. If an operation may not be supported for
		* any reason, getSupportedOperations must return false for that operation.
		*
		* @param model A model whose operations--and their corresponding operands--
		* are to be verified by the driver.
		* @return status Error status of the call, must be:
		* - NONE if successful
		* - DEVICE_UNAVAILABLE if driver is offline or busy
		* - GENERAL_FAILURE if there is an unspecified error
		* - INVALID_ARGUMENT if provided model is invalid
		* @return supportedOperations A list of supported operations, where true
		* indicates the operation is supported and false indicates the
		* operation is not supported. The index of "supported" corresponds with
		* the index of the operation it is describing.
		*/
		getSupportedOperations_1_2(Model model)
		generates (ErrorStatus status, vec<bool> supportedOperations);

		/**
		* Creates a prepared model for execution.
		*
		* prepareModel is used to make any necessary transformations or alternative
		* representations to a model for execution, possibly including
		* transformations on the constant data, optimization on the model's graph,
		* or compilation into the device's native binary format. The model itself
		* is not changed.
		*
		* The model is prepared asynchronously with respect to the caller. The
		* prepareModel function must verify the inputs to the prepareModel function
		* are correct. If there is an error, prepareModel must immediately invoke
		* the callback with the appropriate ErrorStatus value and nullptr for the
		* IPreparedModel, then return with the same ErrorStatus. If the inputs to
		* the prepareModel function are valid and there is no error, prepareModel
		* must launch an asynchronous task to prepare the model in the background,
		* and immediately return from prepareModel with ErrorStatus::NONE. If the
		* asynchronous task fails to launch, prepareModel must immediately invoke
		* the callback with ErrorStatus::GENERAL_FAILURE and nullptr for the
		* IPreparedModel, then return with ErrorStatus::GENERAL_FAILURE.
		*
		* When the asynchronous task has finished preparing the model, it must
		* immediately invoke the callback function provided as an input to
		* prepareModel. If the model was prepared successfully, the callback object
		* must be invoked with an error status of ErrorStatus::NONE and the
		* produced IPreparedModel object. If an error occurred preparing the model,
		* the callback object must be invoked with the appropriate ErrorStatus
		* value and nullptr for the IPreparedModel.
		*
		* The only information that may be unknown to the model at this stage is
		* the shape of the tensors, which may only be known at execution time. As
		* such, some driver services may return partially prepared models, where
		* the prepared model may only be finished when it is paired with a set of
		* inputs to the model. Note that the same prepared model object may be
		* used with different shapes of inputs on different (possibly concurrent)
		* executions.
		*
		* Multiple threads may call prepareModel on the same model concurrently.
		*
		* @param model The model to be prepared for execution.
		* @param preference Indicates the intended execution behavior of a prepared
		* model.
		* @param callback A callback object used to return the error status of
		* preparing the model for execution and the prepared model if
		* successful, nullptr otherwise. The callback object's notify function
		* must be called exactly once, even if the model could not be prepared.
		* @return status Error status of launching a task which prepares the model
		* in the background; must be:
		* - NONE if preparation task is successfully launched
		* - DEVICE_UNAVAILABLE if driver is offline or busy
		* - GENERAL_FAILURE if there is an unspecified error
		* - INVALID_ARGUMENT if one of the input arguments is invalid
		*/
		prepareModel_1_2(Model model, ExecutionPreference preference,
		IPreparedModelCallback callback)
		generates (ErrorStatus status);
		};