From 55261dda88a9a1af87d476524a07b2eb37e43d79 Mon Sep 17 00:00:00 2001 From: LeslieXMOS Date: Thu, 4 Dec 2025 14:19:38 +0000 Subject: [PATCH 1/8] bump version --- third_party/lib_nn | 2 +- third_party/lib_tflite_micro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/third_party/lib_nn b/third_party/lib_nn index d756600c9..b2e88580a 160000 --- a/third_party/lib_nn +++ b/third_party/lib_nn @@ -1 +1 @@ -Subproject commit d756600c966499ba67321f17e4f2d601fd29aa57 +Subproject commit b2e88580ae7093a821671aae4aecbf28a0dc0c62 diff --git a/third_party/lib_tflite_micro b/third_party/lib_tflite_micro index 642ac44e7..0b3d1c147 160000 --- a/third_party/lib_tflite_micro +++ b/third_party/lib_tflite_micro @@ -1 +1 @@ -Subproject commit 642ac44e7a61e657195c433610cbd443c74b98f7 +Subproject commit 0b3d1c147fd71dd31ac192685c68312f5c67351c From d14f8320253ebafa60665c5ae1edcc3dbb4c3465 Mon Sep 17 00:00:00 2001 From: LeslieXMOS Date: Thu, 4 Dec 2025 16:08:30 +0000 Subject: [PATCH 2/8] Change lib_tflite_micro to Leslie's repo to test if whole system working --- third_party/lib_tflite_micro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/lib_tflite_micro b/third_party/lib_tflite_micro index 0b3d1c147..6f7e3a627 160000 --- a/third_party/lib_tflite_micro +++ b/third_party/lib_tflite_micro @@ -1 +1 @@ -Subproject commit 0b3d1c147fd71dd31ac192685c68312f5c67351c +Subproject commit 6f7e3a62792e56ad31c61987645962968bb5bab0 From 1e7145e7799b6e82f1b44ab73a6481c4b020ab5c Mon Sep 17 00:00:00 2001 From: LeslieXMOS Date: Thu, 4 Dec 2025 16:11:36 +0000 Subject: [PATCH 3/8] Update build.sh such that the build with vx4b toolchain --- build.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 9a09bbefb..8b56fbafd 100755 --- a/build.sh +++ b/build.sh @@ -131,7 +131,11 @@ create_zip() { mkdir -p build cd build if [ "$1" = "xcore" ]; then - cmake .. --toolchain=../lib_tflite_micro/submodules/xmos_cmake_toolchain/xs3a.cmake + if xcc --version | grep -q 'XTC version: 99.99.99'; then + cmake .. --toolchain=$(which xcc)/../../build/xcommon_cmake/xcore_xs.cmake + else + cmake .. --toolchain=../lib_tflite_micro/submodules/xmos_cmake_toolchain/xs3a.cmake + fi else cmake .. -DLIB_NAME=x86tflitemicro fi From 36751b0b313ca5f8dbe09883ef964cac32c0a10e Mon Sep 17 00:00:00 2001 From: LeslieXMOS Date: Thu, 4 Dec 2025 16:22:17 +0000 Subject: [PATCH 4/8] Change lib_tflite_micro submodule to check if whole system workking --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 599603d55..b6fbd0293 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "third_party/lib_tflite_micro"] path = third_party/lib_tflite_micro - url = git@github.com:xmos/lib_tflite_micro.git + url = git@github.com:LeslieXMOS/lib_tflite_micro.git [submodule "third_party/lib_nn"] path = third_party/lib_nn url = git@github.com:xmos/lib_nn.git From 3fb775ad5e909e20d50a979969f1db4e8344d3b0 Mon Sep 17 00:00:00 2001 From: LeslieXMOS Date: Thu, 4 Dec 2025 16:28:37 +0000 Subject: [PATCH 5/8] Bump lib_tflite_micro version --- third_party/lib_tflite_micro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/lib_tflite_micro b/third_party/lib_tflite_micro index 6f7e3a627..80a97ad32 160000 --- a/third_party/lib_tflite_micro +++ b/third_party/lib_tflite_micro @@ -1 +1 @@ -Subproject commit 6f7e3a62792e56ad31c61987645962968bb5bab0 +Subproject commit 80a97ad32c3b1cc9ee1846a7180f3c0ac93e7048 From 7b836c86daa1d12e6056e3e73126b1d1c87f632c Mon Sep 17 00:00:00 2001 From: LeslieXMOS Date: Fri, 5 Dec 2025 16:40:19 +0000 Subject: [PATCH 6/8] Change lib_tflite_micro back to xmos version and bump to version to latest --- .gitmodules | 2 +- third_party/lib_tflite_micro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index b6fbd0293..599603d55 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "third_party/lib_tflite_micro"] path = third_party/lib_tflite_micro - url = git@github.com:LeslieXMOS/lib_tflite_micro.git + url = git@github.com:xmos/lib_tflite_micro.git [submodule "third_party/lib_nn"] path = third_party/lib_nn url = git@github.com:xmos/lib_nn.git diff --git a/third_party/lib_tflite_micro b/third_party/lib_tflite_micro index 80a97ad32..7cd46fd83 160000 --- a/third_party/lib_tflite_micro +++ b/third_party/lib_tflite_micro @@ -1 +1 @@ -Subproject commit 80a97ad32c3b1cc9ee1846a7180f3c0ac93e7048 +Subproject commit 7cd46fd83d12c3603c40902521b9d8ad189d32b7 From e3e9ef714b46f300a1d45c7cf8579979cbfa3dee Mon Sep 17 00:00:00 2001 From: LeslieXMOS Date: Mon, 8 Dec 2025 15:11:45 +0800 Subject: [PATCH 7/8] Update Bazel cache URL in Jenkinsfile https://github.com/xmos/ai_tools/pull/974 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 855478400..68714d709 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -128,7 +128,7 @@ pipeline { agent none environment { REPO = 'ai_tools' - BAZEL_CACHE_URL = 'http://srv-bri-bld-cache.xmos.local:8080' + BAZEL_CACHE_URL = 'http://srv-bri-bld-cache.xmos.local:8085' BAZEL_USER_ROOT = "${WORKSPACE}/.bazel/" } parameters { // Available to modify on the job page within Jenkins if starting a build From 956ff49f4fa796ae4b3893b1c409e3bef8e1dd53 Mon Sep 17 00:00:00 2001 From: LeslieXMOS Date: Mon, 8 Dec 2025 20:16:49 +0800 Subject: [PATCH 8/8] Update Bazel cache URL and cleanup commands Updated the Bazel cache URL and added cleanup commands to remove installation files from the temporary directory. --- Jenkinsfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 68714d709..2b856959b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -128,7 +128,7 @@ pipeline { agent none environment { REPO = 'ai_tools' - BAZEL_CACHE_URL = 'http://srv-bri-bld-cache.xmos.local:8085' + BAZEL_CACHE_URL = 'http://srv-bri-bld-cache.xmos.local:8080' BAZEL_USER_ROOT = "${WORKSPACE}/.bazel/" } parameters { // Available to modify on the job page within Jenkins if starting a build @@ -186,6 +186,7 @@ pipeline { sh 'curl -LO https://github.com/bazelbuild/bazelisk/releases/download/v1.19.0/bazelisk-linux-amd64' sh 'chmod +x bazelisk-linux-amd64' sh """ + rm -rf /var/tmp/_bazel_jenkins/install/* ./bazelisk-linux-amd64 build //:xcore-opt \\ --verbose_failures \\ --linkopt=-lrt \\ @@ -196,6 +197,7 @@ pipeline { --define SETUPTOOLS_SCM_VERSION=\$(python -m setuptools_scm -c ../python/pyproject.toml) """ sh ''' + rm -rf /var/tmp/_bazel_jenkins/install/* ./bazelisk-linux-amd64 test //Test:all \\ --verbose_failures \\ --test_output=errors \\ @@ -289,7 +291,8 @@ pipeline { def cpuFlag = arch == 'arm64' ? 'darwin_arm64' : 'darwin_x86_64' def outputName = "xcore-opt-${arch}" sh """ - ./bazelisk-darwin-arm64 build //:xcore-opt \\ + rm -rf /var/tmp/_bazel_jenkins/install/* + ./bazelisk-darwin-arm64 build //:xcore-opt \\ --cpu=${cpuFlag} \\ --remote_cache=${env.BAZEL_CACHE_URL} \\ --copt=-fvisibility=hidden \\