Evolution-X-Tensor/device_google_gs101
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove settings for old ArmNN HIDL backend

Browse source 
Compile ArmNN shim over the support library.

Remove settings for the old HIDL backend.
The new ones will be in the gs-common folder.

Test: Local run of CtsNNAPITestCases
Test: Local run of VtsHalNeuralnetworksTargetTest
Test: Local run of MLTS Benchmark
Bug: 283724775
Change-Id: I009f72cee5961769159e68ea2e670e64932c3f13
This commit is contained in:
Renato Grottesi 2023-06-23 13:16:25 +00:00
parent 3dddbe8994
commit d97e70b339
3 changed files with 0 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
BoardConfig-common.mk
View file

@ -321,16 +321,6 @@ BOARD_VNDK_VERSION := current
# H/W align restriction of MM IPs # H/W align restriction of MM IPs
BOARD_EXYNOS_S10B_FORMAT_ALIGN := 64 BOARD_EXYNOS_S10B_FORMAT_ALIGN := 64
# NeuralNetworks
GPU_SOURCE_PRESENT := $(wildcard vendor/arm/mali/valhall)
GPU_PREBUILD_PRESENT := $(wildcard vendor/google_devices/gs101/prebuilts/gpu/libs)
ifneq (,$(strip $(GPU_SOURCE_PRESENT) $(GPU_PREBUILD_PRESENT)))
ARMNN_COMPUTE_CL_ENABLE := 1
else
ARMNN_COMPUTE_CL_ENABLE := 0
endif
ARMNN_COMPUTE_NEON_ENABLE := 1
# Boot.img # Boot.img
BOARD_RAMDISK_USE_LZ4 := true BOARD_RAMDISK_USE_LZ4 := true
#BOARD_KERNEL_BASE := 0x80000000 #BOARD_KERNEL_BASE := 0x80000000

5
device.mk
View file

@ -199,8 +199,6 @@ PRODUCT_SOONG_NAMESPACES += \
$(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM)) $(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM))
include device/google/gs101/neuralnetwork/neuralnetwork.mk
include device/google/gs-common/gpu/gpu.mk include device/google/gs-common/gpu/gpu.mk
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
libGLES_mali \ libGLES_mali \
@ -966,9 +964,6 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/gs101/radio/gnss_blanking.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/gnss_blanking.csv device/google/gs101/radio/gnss_blanking.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/gnss_blanking.csv
# ARM NN files
ARMNN_COMPUTE_CL_ENABLE := 1
# Vibrator Diag # Vibrator Diag
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_DEBUG += \
diag-vibrator \ diag-vibrator \

2
neuralnetwork/neuralnetwork.mk
View file

@ -1,2 +0,0 @@
PRODUCT_PACKAGES += android.hardware.neuralnetworks@1.3-service-armnn
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs101-sepolicy/neuralnetworks/