aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin May <kevin.may@arm.com>2020-05-06 15:28:49 +0100
committerKevin May <kevin.may@arm.com>2020-05-06 15:31:10 +0100
commit8a510e8e9ed22ec0bbd295b69a6700ad0ba7cfd8 (patch)
treeaed2228178b5d621388fcf8bcf2f63c6bf95b76b
parentb248ec1f47467d835b1baea1f5a3a726f8e585e2 (diff)
downloadandroid-nn-driver-8a510e8e9ed22ec0bbd295b69a6700ad0ba7cfd8.tar.gz
IVGCVSW-4673 Change ArmNN driver service name to arm-armnn
* Change service name from "armnn" to "arm-armnn" * Rename .rc files * Update Android.mk to use new service name * Update Integrator Guide Signed-off-by: Kevin May <kevin.may@arm.com> Change-Id: If2a4ac9756101472d30255afbf8c90859e29aabf
-rw-r--r--Android.mk24
-rw-r--r--android.hardware.neuralnetworks@1.0-service-arm-armnn.rc (renamed from android.hardware.neuralnetworks@1.0-service-armnn.rc)2
-rw-r--r--android.hardware.neuralnetworks@1.1-service-arm-armnn.rc (renamed from android.hardware.neuralnetworks@1.1-service-armnn.rc)2
-rw-r--r--android.hardware.neuralnetworks@1.2-service-arm-armnn.rc (renamed from android.hardware.neuralnetworks@1.2-service-armnn.rc)2
-rw-r--r--android.hardware.neuralnetworks@1.3-service-arm-armnn.rc (renamed from android.hardware.neuralnetworks@1.3-service-armnn.rc)2
-rw-r--r--docs/IntegratorGuide.md14
-rw-r--r--service.cpp2
7 files changed, 24 insertions, 24 deletions
diff --git a/Android.mk b/Android.mk
index bf8bc65..034495b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -546,12 +546,12 @@ include $(BUILD_STATIC_LIBRARY)
endif # PLATFORM_VERSION == R
#####################################################
-# android.hardware.neuralnetworks@1.0-service-armnn #
+# android.hardware.neuralnetworks@1.0-service-arm-armnn #
#####################################################
include $(CLEAR_VARS)
-LOCAL_MODULE := android.hardware.neuralnetworks@1.0-service-armnn
-LOCAL_INIT_RC := android.hardware.neuralnetworks@1.0-service-armnn.rc
+LOCAL_MODULE := android.hardware.neuralnetworks@1.0-service-arm-armnn
+LOCAL_INIT_RC := android.hardware.neuralnetworks@1.0-service-arm-armnn.rc
ifeq ($(Q_OR_LATER),1)
# "eng" is deprecated in Android Q
LOCAL_MODULE_TAGS := optional
@@ -650,12 +650,12 @@ ifeq ($(P_OR_LATER),1)
# The following target is available starting from Android P
#####################################################
-# android.hardware.neuralnetworks@1.1-service-armnn #
+# android.hardware.neuralnetworks@1.1-service-arm-armnn #
#####################################################
include $(CLEAR_VARS)
-LOCAL_MODULE := android.hardware.neuralnetworks@1.1-service-armnn
-LOCAL_INIT_RC := android.hardware.neuralnetworks@1.1-service-armnn.rc
+LOCAL_MODULE := android.hardware.neuralnetworks@1.1-service-arm-armnn
+LOCAL_INIT_RC := android.hardware.neuralnetworks@1.1-service-arm-armnn.rc
ifeq ($(Q_OR_LATER),1)
# "eng" is deprecated in Android Q
LOCAL_MODULE_TAGS := optional
@@ -751,12 +751,12 @@ ifeq ($(Q_OR_LATER),1)
# The following target is available starting from Android Q
#####################################################
-# android.hardware.neuralnetworks@1.2-service-armnn #
+# android.hardware.neuralnetworks@1.2-service-arm-armnn #
#####################################################
include $(CLEAR_VARS)
-LOCAL_MODULE := android.hardware.neuralnetworks@1.2-service-armnn
-LOCAL_INIT_RC := android.hardware.neuralnetworks@1.2-service-armnn.rc
+LOCAL_MODULE := android.hardware.neuralnetworks@1.2-service-arm-armnn
+LOCAL_INIT_RC := android.hardware.neuralnetworks@1.2-service-arm-armnn.rc
LOCAL_MODULE_TAGS := optional
LOCAL_ARM_MODE := arm
LOCAL_MODULE_RELATIVE_PATH := hw
@@ -839,12 +839,12 @@ ifeq ($(R_OR_LATER),1)
# The following target is available starting from Android R
#####################################################
-# android.hardware.neuralnetworks@1.3-service-armnn #
+# android.hardware.neuralnetworks@1.3-service-arm-armnn #
#####################################################
include $(CLEAR_VARS)
-LOCAL_MODULE := android.hardware.neuralnetworks@1.3-service-armnn
-LOCAL_INIT_RC := android.hardware.neuralnetworks@1.3-service-armnn.rc
+LOCAL_MODULE := android.hardware.neuralnetworks@1.3-service-arm-armnn
+LOCAL_INIT_RC := android.hardware.neuralnetworks@1.3-service-arm-armnn.rc
LOCAL_MODULE_TAGS := optional
LOCAL_ARM_MODE := arm
LOCAL_MODULE_RELATIVE_PATH := hw
diff --git a/android.hardware.neuralnetworks@1.0-service-armnn.rc b/android.hardware.neuralnetworks@1.0-service-arm-armnn.rc
index d720086..b8a2c9c 100644
--- a/android.hardware.neuralnetworks@1.0-service-armnn.rc
+++ b/android.hardware.neuralnetworks@1.0-service-arm-armnn.rc
@@ -1,4 +1,4 @@
-service neuralnetworks_hal_service_armnn /vendor/bin/hw/android.hardware.neuralnetworks@1.0-service-armnn
+service neuralnetworks_hal_service_armnn /vendor/bin/hw/android.hardware.neuralnetworks@1.0-service-arm-armnn
class hal
user system
group system
diff --git a/android.hardware.neuralnetworks@1.1-service-armnn.rc b/android.hardware.neuralnetworks@1.1-service-arm-armnn.rc
index 98efaf9..fad1905 100644
--- a/android.hardware.neuralnetworks@1.1-service-armnn.rc
+++ b/android.hardware.neuralnetworks@1.1-service-arm-armnn.rc
@@ -1,4 +1,4 @@
-service neuralnetworks_hal_service_armnn /vendor/bin/hw/android.hardware.neuralnetworks@1.1-service-armnn
+service neuralnetworks_hal_service_armnn /vendor/bin/hw/android.hardware.neuralnetworks@1.1-service-arm-armnn
class hal
user system
group system
diff --git a/android.hardware.neuralnetworks@1.2-service-armnn.rc b/android.hardware.neuralnetworks@1.2-service-arm-armnn.rc
index 5889446..81f6bc9 100644
--- a/android.hardware.neuralnetworks@1.2-service-armnn.rc
+++ b/android.hardware.neuralnetworks@1.2-service-arm-armnn.rc
@@ -1,4 +1,4 @@
-service neuralnetworks_hal_service_armnn /vendor/bin/hw/android.hardware.neuralnetworks@1.2-service-armnn
+service neuralnetworks_hal_service_armnn /vendor/bin/hw/android.hardware.neuralnetworks@1.2-service-arm-armnn
class hal
user system
group system
diff --git a/android.hardware.neuralnetworks@1.3-service-armnn.rc b/android.hardware.neuralnetworks@1.3-service-arm-armnn.rc
index 3f84d9c..25855d4 100644
--- a/android.hardware.neuralnetworks@1.3-service-armnn.rc
+++ b/android.hardware.neuralnetworks@1.3-service-arm-armnn.rc
@@ -1,4 +1,4 @@
-service neuralnetworks_hal_service_armnn /vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-armnn
+service neuralnetworks_hal_service_armnn /vendor/bin/hw/android.hardware.neuralnetworks@1.3-service-arm-armnn
class hal
user system
group system
diff --git a/docs/IntegratorGuide.md b/docs/IntegratorGuide.md
index 8200d81..d454f21 100644
--- a/docs/IntegratorGuide.md
+++ b/docs/IntegratorGuide.md
@@ -21,19 +21,19 @@ directory. This file is normally called `device.mk`:
For Android P or Q, using NN API version (1.0), the following should be added to `device.mk`:
<pre>
-PRODUCT_PACKAGES += android.hardware.neuralnetworks@1.0-service-armnn
+PRODUCT_PACKAGES += android.hardware.neuralnetworks@1.0-service-arm-armnn
</pre>
For Android P or Q, a new version of the NN API is available (1.1),
thus the following should be added to `device.mk` instead:
<pre>
-PRODUCT_PACKAGES += android.hardware.neuralnetworks@1.1-service-armnn
+PRODUCT_PACKAGES += android.hardware.neuralnetworks@1.1-service-arm-armnn
</pre> `Android.mk` contains the module definition of both versions of the ArmNN driver.
For Android Q, a new version of the NN API is available (1.2),
thus the following should be added to `device.mk` instead:
<pre>
-PRODUCT_PACKAGES += android.hardware.neuralnetworks@1.2-service-armnn
+PRODUCT_PACKAGES += android.hardware.neuralnetworks@1.2-service-arm-armnn
</pre> `Android.mk` contains the module definition of all three versions (1.0, 1.1 and 1.2) of the ArmNN driver.
Similarly, the Neon, CL or reference backend can be enabled/disabled by setting ARMNN_COMPUTE_CL_ENABLE,
@@ -66,7 +66,7 @@ Android P
</pre>
For example, if the ArmNN driver has been built with the NN API 1.0, check for the following file:
<pre>
-<ANDROID_ROOT>/out/target/product/<product>/system/vendor/bin/hw/android.hardware.neuralnetworks@1.0-service-armnn
+<ANDROID_ROOT>/out/target/product/<product>/system/vendor/bin/hw/android.hardware.neuralnetworks@1.0-service-arm-armnn
</pre>
Android Q has a different path:
@@ -79,7 +79,7 @@ Android Q has a different path:
1. Run the ArmNN driver service executable in the background.
The following examples assume that the 1.0 version of the driver is being used:
<pre>
-adb shell /system/vendor/bin/hw/android.hardware.neuralnetworks@1.0-service-armnn &
+adb shell /system/vendor/bin/hw/android.hardware.neuralnetworks@1.0-service-arm-armnn &
</pre>
2. Run some code that exercises the Android Neural Networks API, for example Android's
`NeuralNetworksTest` unit tests (note this is an optional component that must be built).
@@ -101,12 +101,12 @@ The recommended way of using it with ArmNN is to generate the tuning data during
1. Run the ArmNN driver service executable in tuning mode. The path to the tuning data must be writable by the service.
The following examples assume that the 1.0 version of the driver is being used:
<pre>
-adb shell /system/vendor/bin/hw/android.hardware.neuralnetworks@1.0-service-armnn --cl-tuned-parameters-file &lt;PATH_TO_TUNING_DATA&gt; --cl-tuned-parameters-mode UpdateTunedParameters --cl-tuning-level exhaustive &
+adb shell /system/vendor/bin/hw/android.hardware.neuralnetworks@1.0-service-arm-armnn --cl-tuned-parameters-file &lt;PATH_TO_TUNING_DATA&gt; --cl-tuned-parameters-mode UpdateTunedParameters --cl-tuning-level exhaustive &
</pre>
2. Run a representative set of Android NNAPI testing loads. In this mode of operation, each NNAPI workload will be slow the first time it is executed, as the tuning parameters are being selected. Subsequent executions will use the tuning data which has been generated.
3. Stop the service.
4. Deploy the tuned parameters file to a location readable by the ArmNN driver service (for example, to a location within /vendor/etc).
5. During normal operation, pass the location of the tuning data to the driver service (this would normally be done by passing arguments via Android init in the service .rc definition):
<pre>
-adb shell /system/vendor/bin/hw/android.hardware.neuralnetworks@1.0-service-armnn --cl-tuned-parameters-file &lt;PATH_TO_TUNING_DATA&gt; &
+adb shell /system/vendor/bin/hw/android.hardware.neuralnetworks@1.0-service-arm-armnn --cl-tuned-parameters-file &lt;PATH_TO_TUNING_DATA&gt; &
</pre>
diff --git a/service.cpp b/service.cpp
index 81c1191..740198a 100644
--- a/service.cpp
+++ b/service.cpp
@@ -32,7 +32,7 @@ int main(int argc, char** argv)
android::status_t status = android::UNKNOWN_ERROR;
try
{
- status = driver->registerAsService("armnn");
+ status = driver->registerAsService("arm-armnn");
}
catch (const std::exception& e)
{