misc: Fix build.

openmv · Jul 14, 2024 · 3259f5f · 3259f5f
1 parent a9c444f
commit 3259f5f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/.github/workflows/tflm.yml b/.github/workflows/tflm.yml
@@ -53,8 +53,7 @@ jobs:
 
     - name: '🩹 Apply patches'
       run: |
-        cd tflite-micro
-        git apply --verbose ${GITHUB_WORKSPACE}/patches/tflite_micro.patch
+        git apply --verbose --directory=tflite-micro ${GITHUB_WORKSPACE}/patches/tflite_micro.patch
 
     - name: '♻ Caching dependencies'
       uses: actions/[email protected]

diff --git a/tools/ci.sh b/tools/ci.sh
@@ -39,13 +39,19 @@ ci_build_target() {
     ETHOSU_CONFIG="-DNPU_QCONFIG=0 -DNPU_REGIONCFG_0=0 -DAXI_LIMIT0_MAX_BEATS_BYTES=1 -DAXI_LIMIT0_MEM_TYPE=2 -DAXI_LIMIT1_MAX_BEATS_BYTES=1 -DAXI_LIMIT1_MEM_TYPE=2 -DAXI_LIMIT2_MAX_BEATS_BYTES=1 -DAXI_LIMIT2_MEM_TYPE=2 -DAXI_LIMIT3_MAX_BEATS_BYTES=1 -DAXI_LIMIT3_MEM_TYPE=2"
 
     pushd ${TFLM_REPO_PATH}
-    make -j$(nproc) -f tensorflow/lite/micro/tools/make/Makefile \
-                       TARGET=cortex_m_generic TARGET_ARCH=${TARGET_ARCH} \
-                       CO_PROCESSOR=${TARGET_COPROC} ${TARGET_ARGS} ETHOSU_EXTRA_CFLAGS="${ETHOSU_CONFIG}" \
-                       OPTIMIZED_KERNEL_DIR=${TARGET_KERNEL} CORE_OPTIMIZATION_LEVEL=-O2 \
-                       KERNEL_OPTIMIZATION_LEVEL=-O2 THIRD_PARTY_KERNEL_OPTIMIZATION_LEVEL=-O2 \
-                       TARGET_TOOLCHAIN_ROOT=${TOOLCHAIN_PATH}/bin/ TARGET_TOOLCHAIN_PREFIX=arm-none-eabi- \
-                       BUILD_TYPE=${TARGET_BUILD} MICROLITE_LIB_NAME=libtflm.a microlite
+echo "make -j$(nproc) -f tensorflow/lite/micro/tools/make/Makefile \
+TARGET=cortex_m_generic TARGET_ARCH=${TARGET_ARCH} CO_PROCESSOR=${TARGET_COPROC} \
+${TARGET_ARGS} OPTIMIZED_KERNEL_DIR=${TARGET_KERNEL} CORE_OPTIMIZATION_LEVEL=-O2 \
+KERNEL_OPTIMIZATION_LEVEL=-O2 THIRD_PARTY_KERNEL_OPTIMIZATION_LEVEL=-O2 \
+TARGET_TOOLCHAIN_ROOT=${TOOLCHAIN_PATH}/bin/ TARGET_TOOLCHAIN_PREFIX=arm-none-eabi- \
+ETHOSU_EXTRA_CFLAGS=${ETHOSU_CONFIG} BUILD_TYPE=${TARGET_BUILD} MICROLITE_LIB_NAME=libtflm.a microlite"
+
+    make -f tensorflow/lite/micro/tools/make/Makefile \
+         TARGET=cortex_m_generic TARGET_ARCH=${TARGET_ARCH} CO_PROCESSOR=${TARGET_COPROC} \
+         ${TARGET_ARGS} OPTIMIZED_KERNEL_DIR=${TARGET_KERNEL} CORE_OPTIMIZATION_LEVEL=-O2 \
+         KERNEL_OPTIMIZATION_LEVEL=-O2 THIRD_PARTY_KERNEL_OPTIMIZATION_LEVEL=-O2 \
+         TARGET_TOOLCHAIN_ROOT=${TOOLCHAIN_PATH}/bin/ TARGET_TOOLCHAIN_PREFIX=arm-none-eabi- \
+         ETHOSU_EXTRA_CFLAGS="${ETHOSU_CONFIG}" BUILD_TYPE=${TARGET_BUILD} MICROLITE_LIB_NAME=libtflm.a microlite
     popd
     mv ${TFLM_REPO_PATH}/gen/*/lib/libtflm.a libtflm-${TARGET_NAME}-${TARGET_BUILD}.a
 }