Merge pull request #88 from NobuoTsukamoto/clean_configure

Refactor configuration to enable XNNPACK for aarch64 and riscv32/riscv64.
NobuoTsukamoto · Jun 23, 2024 · 70a93d8 · 70a93d8
2 parents 1065e72 + 87c8dbf
commit 70a93d8
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 23 deletions.
diff --git a/recipes-examples/tensorflow-lite/tensorflow-lite-label-image_2.16.1.bb b/recipes-examples/tensorflow-lite/tensorflow-lite-label-image_2.16.1.bb
@@ -34,10 +34,7 @@ DEPENDS += "\
 OECMAKE_SOURCEPATH = "${S}/tensorflow/lite/examples/label_image"
 
 EXTRA_OECMAKE:append = " -DTFLITE_ENABLE_LABEL_IMAGE=ON"
-EXTRA_OECMAKE:append:raspberrypi0-2w-64 = "-DTFLITE_ENABLE_XNNPACK=ON"
-EXTRA_OECMAKE:append:raspberrypi3-64 = "-DTFLITE_ENABLE_XNNPACK=ON"
-EXTRA_OECMAKE:append:raspberrypi4-64 = "-DTFLITE_ENABLE_XNNPACK=ON"
-EXTRA_OECMAKE:append:raspberrypi5 = "-DTFLITE_ENABLE_XNNPACK=ON"
+EXTRA_OECMAKE:append:aarch64 = "-DTFLITE_ENABLE_XNNPACK=ON"
 EXTRA_OECMAKE:append:riscv32 = " -DTFLITE_ENABLE_XNNPACK=ON"
 EXTRA_OECMAKE:append:riscv64 = " -DTFLITE_ENABLE_XNNPACK=ON"
 

diff --git a/recipes-examples/tensorflow-lite/tensorflow-lite-minimal_2.16.1.bb b/recipes-examples/tensorflow-lite/tensorflow-lite-minimal_2.16.1.bb
@@ -30,8 +30,8 @@ DEPENDS += "\
 "
 
 EXTRA_OECMAKE:append:aarch64 = " -DTFLITE_ENABLE_XNNPACK=ON"
-EXTRA_OECMAKE:append:riscv = " -DTFLITE_ENABLE_XNNPACK=ON"
-EXTRA_OECMAKE:append:riscv = " -DTFLITE_ENABLE_XNNPACK=ON"
+EXTRA_OECMAKE:append:riscv32 = " -DTFLITE_ENABLE_XNNPACK=ON"
+EXTRA_OECMAKE:append:riscv64 = " -DTFLITE_ENABLE_XNNPACK=ON"
 
 OECMAKE_SOURCEPATH = "${S}/tensorflow/lite/examples/minimal"
 

diff --git a/recipes-framework/tensorflow-lite/libtensorflow-lite-c_2.16.1.bb b/recipes-framework/tensorflow-lite/libtensorflow-lite-c_2.16.1.bb
@@ -45,7 +45,8 @@ EXTRA_OECMAKE = " \
 # In the case of arm 32bit, it will be turned off because the build will be
 # an error depending on the combination of target CPUs.
 EXTRA_OECMAKE:append:aarch64 = " -DTFLITE_ENABLE_XNNPACK=ON"
-EXTRA_OECMAKE:append:riscv = " -DTFLITE_ENABLE_XNNPACK=ON"
+EXTRA_OECMAKE:append:riscv32 = " -DTFLITE_ENABLE_XNNPACK=ON"
+EXTRA_OECMAKE:append:riscv64 = " -DTFLITE_ENABLE_XNNPACK=ON"
 
 TENSORFLOW_TARGET_ARCH:raspberrypi = "armv6"
 TENSORFLOW_TARGET_ARCH:raspberrypi0 = "armv6"

diff --git a/recipes-framework/tensorflow-lite/libtensorflow-lite_2.16.1.bb b/recipes-framework/tensorflow-lite/libtensorflow-lite_2.16.1.bb
@@ -46,7 +46,8 @@ EXTRA_OECMAKE = " \
 # In the case of arm 32bit, it will be turned off because the build will be
 # an error depending on the combination of target CPUs.
 EXTRA_OECMAKE:append:aarch64 = " -DTFLITE_ENABLE_XNNPACK=ON"
-EXTRA_OECMAKE:append:riscv = " -DTFLITE_ENABLE_XNNPACK=ON"
+EXTRA_OECMAKE:append:riscv32 = " -DTFLITE_ENABLE_XNNPACK=ON"
+EXTRA_OECMAKE:append:riscv64 = " -DTFLITE_ENABLE_XNNPACK=ON"
 
 TENSORFLOW_TARGET_ARCH:raspberrypi = "armv6"
 TENSORFLOW_TARGET_ARCH:raspberrypi0 = "armv6"

diff --git a/recipes-framework/tensorflow-lite/python3-tensorflow-lite_2.16.1.bb b/recipes-framework/tensorflow-lite/python3-tensorflow-lite_2.16.1.bb
@@ -51,24 +51,18 @@ OECMAKE_SOURCEPATH = "${TENSORFLOW_LITE_DIR}"
 OECMAKE_TARGET_COMPILE= "_pywrap_tensorflow_interpreter_wrapper"
 OECMAKE_C_FLAGS += "-I${PYTHON_INCLUDE_DIR} -I${PYBIND11_IN} -I${NUMPY_INCLUDE}"
 OECMAKE_CXX_FLAGS += "-I${PYTHON_INCLUDE_DIR} -I${PYBIND11_INCLUDE} -I${NUMPY_INCLUDE}"
-CMAKE_VERBOSE = "VERBOSE=1"
+EXTRA_OECMAKE = " \
+  -DFETCHCONTENT_FULLY_DISCONNECTED=OFF \
+  -DTFLITE_ENABLE_XNNPACK=OFF \
+"
 
 # Note:
 # XNNPack is valid only on 64bit.
 # In the case of arm 32bit, it will be turned off because the build will be
 # an error depending on the combination of target CPUs.
-EXTRA_OECMAKE:append:raspberrypi0 = " -DTFLITE_ENABLE_XNNPACK=OFF"
-EXTRA_OECMAKE:append:raspberrypi0-wifi = " -DTFLITE_ENABLE_XNNPACK=OFF"
-EXTRA_OECMAKE:append:raspberrypi0-2w-64 = " -DTFLITE_ENABLE_XNNPACK=ON"
-EXTRA_OECMAKE:append:raspberrypi-cm = " -DTFLITE_ENABLE_XNNPACK=OFF"
-EXTRA_OECMAKE:append:raspberrypi-cm3 = " -DTFLITE_ENABLE_XNNPACK=OFF"
-EXTRA_OECMAKE:append:raspberrypi = " -DTFLITE_ENABLE_XNNPACK=OFF"
-EXTRA_OECMAKE:append:raspberrypi2 = " -DTFLITE_ENABLE_XNNPACK=OFF"
-EXTRA_OECMAKE:append:raspberrypi3 = " -DTFLITE_ENABLE_XNNPACK=OFF"
-EXTRA_OECMAKE:append:raspberrypi3-64 = " -DTFLITE_ENABLE_XNNPACK=ON"
-EXTRA_OECMAKE:append:raspberrypi4 = " -DTFLITE_ENABLE_XNNPACK=OFF"
-EXTRA_OECMAKE:append:raspberrypi4-64 = " -DTFLITE_ENABLE_XNNPACK=ON"
-EXTRA_OECMAKE:append:raspberrypi5 = " -DTFLITE_ENABLE_XNNPACK=ON"
+EXTRA_OECMAKE:append:aarch64 = " -DTFLITE_ENABLE_XNNPACK=ON"
+EXTRA_OECMAKE:append:riscv32 = " -DTFLITE_ENABLE_XNNPACK=ON"
+EXTRA_OECMAKE:append:riscv64 = " -DTFLITE_ENABLE_XNNPACK=ON"
 
 TENSORFLOW_TARGET_ARCH:raspberrypi = "armv6"
 TENSORFLOW_TARGET_ARCH:raspberrypi0 = "armv6"
@@ -89,7 +83,6 @@ TENSORFLOW_TARGET_ARCH:riscv64 = "riscv64"
 # Download the submodule using FetchContent_Populate.
 # Therefore, turn off FETCHCONTENT_FULLY_DISCONNECTED.
 EXTRA_OECMAKE:append = " \
-  -DFETCHCONTENT_FULLY_DISCONNECTED=OFF \
   -DTENSORFLOW_TARGET_ARCH=${TENSORFLOW_TARGET_ARCH} \
 "
 

diff --git a/recipes-tools/tensorflow-lite/tensorflow-lite-benchmark_2.16.1.bb b/recipes-tools/tensorflow-lite/tensorflow-lite-benchmark_2.16.1.bb
@@ -49,7 +49,8 @@ EXTRA_OECMAKE = " \
 # In the case of arm 32bit, it will be turned off because the build will be
 # an error depending on the combination of target CPUs.
 EXTRA_OECMAKE:append:aarch64 = " -DTFLITE_ENABLE_XNNPACK=ON"
-EXTRA_OECMAKE:append:riscv = " -DTFLITE_ENABLE_XNNPACK=ON"
+EXTRA_OECMAKE:append:riscv32 = " -DTFLITE_ENABLE_XNNPACK=ON"
+EXTRA_OECMAKE:append:riscv64 = " -DTFLITE_ENABLE_XNNPACK=ON"
 
 TENSORFLOW_TARGET_ARCH:raspberrypi = "armv6"
 TENSORFLOW_TARGET_ARCH:raspberrypi0 = "armv6"