From c307adaf1a50311badb21276580bce7ea71c7913 Mon Sep 17 00:00:00 2001 From: David Packwood Date: Thu, 19 Jun 2025 11:29:18 +0000 Subject: [PATCH 01/26] Update CI to use gitlab docker registry --- .gitlab-ci.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ccde57d..458963e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ stages: .common: variables: - DOCKER_IMAGE: cme-hero-public + DOCKER_IMAGE: registry.gitlab.arm.com/kleidi/kleidi-examples/ai-camera-pipelines build_base_docker: variables: @@ -21,8 +21,6 @@ build_base_docker: - .common script: - cd docker - - docker login -u acv-ci@arm.com -p ${ARTIFACTORY_DOCKER_TOKEN} ${ARTIFACTORY_DOCKER_REGISTRY} - - export DOCKER_IMAGE=${ARTIFACTORY_DOCKER_REGISTRY}/${DOCKER_IMAGE} - docker build --build-arg DOCKERHUB_MIRROR=${DOCKERHUB_MIRROR} --pull --cache-from $DOCKER_IMAGE -t $DOCKER_IMAGE --push . stage: build_docker tags: @@ -32,7 +30,7 @@ build_arm_nn: extends: - .common stage: build_and_run - image: $ARTIFACTORY_DOCKER_REGISTRY/$DOCKER_IMAGE + image: $DOCKER_IMAGE script: - git clone https://github.com/ARM-software/armnn.git - cd armnn @@ -71,7 +69,7 @@ build_tflite: extends: - .common stage: build_and_run - image: $ARTIFACTORY_DOCKER_REGISTRY/$DOCKER_IMAGE + image: $DOCKER_IMAGE script: - git clone https://github.com/google/flatbuffers.git - cd flatbuffers -- GitLab From e1fd2bd23d7b8e70f5ff3bd4508a041616657ed0 Mon Sep 17 00:00:00 2001 From: David Packwood Date: Thu, 19 Jun 2025 11:40:30 +0000 Subject: [PATCH 02/26] use docker build cache only if it exists --- .gitlab-ci.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 458963e..58170c3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,7 +21,14 @@ build_base_docker: - .common script: - cd docker - - docker build --build-arg DOCKERHUB_MIRROR=${DOCKERHUB_MIRROR} --pull --cache-from $DOCKER_IMAGE -t $DOCKER_IMAGE --push . + - | + if docker pull "$DOCKER_IMAGE":latest; then + CACHE_FROM="--cache-from $DOCKER_IMAGE:latest" + else + echo "No cache image found, building fresh." + CACHE_FROM="" + fi + - docker build --build-arg DOCKERHUB_MIRROR=${DOCKERHUB_MIRROR} --pull $CACHE_FROM -t $DOCKER_IMAGE --push . stage: build_docker tags: - m7g.medium -- GitLab From 87b2e03dae8b48a01d94a57713a7178306c11ef2 Mon Sep 17 00:00:00 2001 From: David Packwood Date: Thu, 19 Jun 2025 11:46:39 +0000 Subject: [PATCH 03/26] add login to docker registry --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 58170c3..b594b90 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,6 +19,8 @@ build_base_docker: command: ["--tls=false"] extends: - .common + before_script: + - echo "$CI_REGISTRY_PASSWORD" | docker login "$CI_REGISTRY" --username "$CI_REGISTRY_USER" --password-stdin script: - cd docker - | -- GitLab From a1d77beaec2846d179993ad62342a65e40637ce8 Mon Sep 17 00:00:00 2001 From: David Packwood Date: Thu, 19 Jun 2025 11:50:42 +0000 Subject: [PATCH 04/26] build and run on m7g medium machines --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b594b90..1d7938d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -66,7 +66,7 @@ build_arm_nn: - ./bin/low_light_image_enhancement resources/test_input2.ppm test_output2_lime.ppm resources/HDRNetLIME_lr_coeffs_v1_1_0_mixed_low_light_perceptual_l2_loss_int8_only_ptq.tflite - ./bin/low_light_image_enhancement_benchmark 10 resources/HDRNetLIME_lr_coeffs_v1_1_0_mixed_low_light_perceptual_l2_loss_int8_only_ptq.tflite tags: - - m7g.8xlarge + - m7g.medium parallel: matrix: - ENABLE_SME2: ["0", "1"] @@ -100,7 +100,7 @@ build_tflite: - ./bin/low_light_image_enhancement resources/test_input2.ppm test_output2_lime.ppm resources/HDRNetLIME_lr_coeffs_v1_1_0_mixed_low_light_perceptual_l2_loss_int8_only_ptq.tflite - ./bin/low_light_image_enhancement_benchmark 10 resources/HDRNetLIME_lr_coeffs_v1_1_0_mixed_low_light_perceptual_l2_loss_int8_only_ptq.tflite tags: - - m7g.8xlarge + - m7g.medium parallel: matrix: - ENABLE_SME2: ["0", "1"] -- GitLab From b09959a5c779e8922b25f7c6d19eb6a36aa7aa2b Mon Sep 17 00:00:00 2001 From: David Packwood Date: Thu, 19 Jun 2025 12:20:26 +0000 Subject: [PATCH 05/26] update cmake compatibility for tflite builds --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1d7938d..6a8b55b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -91,7 +91,7 @@ build_tflite: - cd ../.. - mkdir build - cd build - - cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../install -DARMNN_TFLITE_PARSER=0 -DTENSORFLOW_GIT_TAG=$TENSORFLOW_GIT_TAG -DTFLITE_HOST_TOOLS_DIR=../flatbuffers/install/bin -DENABLE_SME2=$ENABLE_SME2 -DCMAKE_TOOLCHAIN_FILE=toolchain.cmake .. + - cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../install -DARMNN_TFLITE_PARSER=0 -DTENSORFLOW_GIT_TAG=$TENSORFLOW_GIT_TAG -DTFLITE_HOST_TOOLS_DIR=../flatbuffers/install/bin -DENABLE_SME2=$ENABLE_SME2 -DCMAKE_TOOLCHAIN_FILE=toolchain.cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 .. - cmake --build . - cmake --install . - cd ../install -- GitLab From 0e511821ef626ce79064c633d9544ddf216784af Mon Sep 17 00:00:00 2001 From: David Packwood Date: Thu, 19 Jun 2025 13:31:18 +0000 Subject: [PATCH 06/26] set build jobs to 4xlarge flavour --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a8b55b..3cf1835 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -66,7 +66,7 @@ build_arm_nn: - ./bin/low_light_image_enhancement resources/test_input2.ppm test_output2_lime.ppm resources/HDRNetLIME_lr_coeffs_v1_1_0_mixed_low_light_perceptual_l2_loss_int8_only_ptq.tflite - ./bin/low_light_image_enhancement_benchmark 10 resources/HDRNetLIME_lr_coeffs_v1_1_0_mixed_low_light_perceptual_l2_loss_int8_only_ptq.tflite tags: - - m7g.medium + - m7g.4xlarge parallel: matrix: - ENABLE_SME2: ["0", "1"] @@ -100,7 +100,7 @@ build_tflite: - ./bin/low_light_image_enhancement resources/test_input2.ppm test_output2_lime.ppm resources/HDRNetLIME_lr_coeffs_v1_1_0_mixed_low_light_perceptual_l2_loss_int8_only_ptq.tflite - ./bin/low_light_image_enhancement_benchmark 10 resources/HDRNetLIME_lr_coeffs_v1_1_0_mixed_low_light_perceptual_l2_loss_int8_only_ptq.tflite tags: - - m7g.medium + - m7g.4xlarge parallel: matrix: - ENABLE_SME2: ["0", "1"] -- GitLab From 6e5932a138383442c5858f990265d435f7745e09 Mon Sep 17 00:00:00 2001 From: David Packwood Date: Thu, 19 Jun 2025 13:35:32 +0000 Subject: [PATCH 07/26] update tensorflow versions to just 2.19 --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3cf1835..092cac5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,7 +69,7 @@ build_arm_nn: - m7g.4xlarge parallel: matrix: - - ENABLE_SME2: ["0", "1"] + - ENABLE_SME2: ["1"] artifacts: paths: - install @@ -103,8 +103,8 @@ build_tflite: - m7g.4xlarge parallel: matrix: - - ENABLE_SME2: ["0", "1"] - TENSORFLOW_GIT_TAG: ["v2.18.0", "ddceb963c1599f803b5c4beca42b802de5134b44"] + - ENABLE_SME2: ["1"] + TENSORFLOW_GIT_TAG: ["v2.19.0"] artifacts: paths: - install -- GitLab From ab0cd7af29f76d0308c1e62a4588bc169cbfa1d0 Mon Sep 17 00:00:00 2001 From: David Packwood Date: Thu, 19 Jun 2025 13:56:35 +0000 Subject: [PATCH 08/26] taskset for single thread performance --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 092cac5..3682566 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,9 +62,9 @@ build_arm_nn: - cmake --install . - cd ../install - ./bin/cinematic_mode ./resources/test_input2.ppm test_output2_cinematic.ppm resources/depth_and_saliency_v3_2_assortedv2_w_augment_mobilenetv2_int8_only_ptq.tflite - - ./bin/cinematic_mode_benchmark 10 resources/depth_and_saliency_v3_2_assortedv2_w_augment_mobilenetv2_int8_only_ptq.tflite + - taskset -c 0 ./bin/cinematic_mode_benchmark 10 resources/depth_and_saliency_v3_2_assortedv2_w_augment_mobilenetv2_int8_only_ptq.tflite - ./bin/low_light_image_enhancement resources/test_input2.ppm test_output2_lime.ppm resources/HDRNetLIME_lr_coeffs_v1_1_0_mixed_low_light_perceptual_l2_loss_int8_only_ptq.tflite - - ./bin/low_light_image_enhancement_benchmark 10 resources/HDRNetLIME_lr_coeffs_v1_1_0_mixed_low_light_perceptual_l2_loss_int8_only_ptq.tflite + - taskset -c 0 ./bin/low_light_image_enhancement_benchmark 10 resources/HDRNetLIME_lr_coeffs_v1_1_0_mixed_low_light_perceptual_l2_loss_int8_only_ptq.tflite tags: - m7g.4xlarge parallel: @@ -96,9 +96,9 @@ build_tflite: - cmake --install . - cd ../install - ./bin/cinematic_mode ./resources/test_input2.ppm test_output2.ppm resources/depth_and_saliency_v3_2_assortedv2_w_augment_mobilenetv2_int8_only_ptq.tflite - - ./bin/cinematic_mode_benchmark 10 resources/depth_and_saliency_v3_2_assortedv2_w_augment_mobilenetv2_int8_only_ptq.tflite + - taskset -c 0./bin/cinematic_mode_benchmark 10 resources/depth_and_saliency_v3_2_assortedv2_w_augment_mobilenetv2_int8_only_ptq.tflite - ./bin/low_light_image_enhancement resources/test_input2.ppm test_output2_lime.ppm resources/HDRNetLIME_lr_coeffs_v1_1_0_mixed_low_light_perceptual_l2_loss_int8_only_ptq.tflite - - ./bin/low_light_image_enhancement_benchmark 10 resources/HDRNetLIME_lr_coeffs_v1_1_0_mixed_low_light_perceptual_l2_loss_int8_only_ptq.tflite + - taskset -c 0 ./bin/low_light_image_enhancement_benchmark 10 resources/HDRNetLIME_lr_coeffs_v1_1_0_mixed_low_light_perceptual_l2_loss_int8_only_ptq.tflite tags: - m7g.4xlarge parallel: -- GitLab From 987b91a4b39f5c0600dda3e829db43ed0d0d6941 Mon Sep 17 00:00:00 2001 From: David Packwood Date: Thu, 19 Jun 2025 13:59:16 +0000 Subject: [PATCH 09/26] jiggle armnn build --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3682566..6b87a03 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,11 +48,11 @@ build_arm_nn: - ./setup-armnn.sh --target-arch=aarch64 --all 1> /dev/null - | if [ "$ENABLE_SME2" -eq 1 ]; then - ARMNN_ACL_OPTION='--acl-scons-params="arch=armv8.6-a-sve2-sme2"' + export ARMNN_ACL_OPTION='--acl-scons-params="arch=armv8.6-a-sve2-sme2"' else - ARMNN_ACL_OPTION='' + export ARMNN_ACL_OPTION='' fi - ./build-armnn.sh --target-arch=aarch64 --all --neon-backend $ARMNN_ACL_OPTION 1> /dev/null + - ./build-armnn.sh --target-arch=aarch64 --all --neon-backend $ARMNN_ACL_OPTION 1> /dev/null - tar -xzf armnn_aarch64.tar.gz - cd ../../../ - mkdir build -- GitLab From 13bb3a2076fc6c209a17254d0e332142edfacbea Mon Sep 17 00:00:00 2001 From: David Packwood Date: Thu, 19 Jun 2025 14:21:20 +0000 Subject: [PATCH 10/26] jiggle armnn build --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b87a03..59a6304 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ build_arm_nn: script: - git clone https://github.com/ARM-software/armnn.git - cd armnn - - git checkout v24.11 + - git checkout $ARMNN_GIT_TAG - cd build-tool/scripts/ - ./setup-armnn.sh --target-arch=aarch64 --all 1> /dev/null - | @@ -70,6 +70,7 @@ build_arm_nn: parallel: matrix: - ENABLE_SME2: ["1"] + - ARMNN_GIT_TAG : ["v25.02"] artifacts: paths: - install -- GitLab From fde8b0fa9e7d51ff3d1bedd3a6c120449ed70866 Mon Sep 17 00:00:00 2001 From: David Packwood Date: Thu, 19 Jun 2025 14:21:50 +0000 Subject: [PATCH 11/26] jiggle armnn build --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 59a6304..5f4d9c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -97,7 +97,7 @@ build_tflite: - cmake --install . - cd ../install - ./bin/cinematic_mode ./resources/test_input2.ppm test_output2.ppm resources/depth_and_saliency_v3_2_assortedv2_w_augment_mobilenetv2_int8_only_ptq.tflite - - taskset -c 0./bin/cinematic_mode_benchmark 10 resources/depth_and_saliency_v3_2_assortedv2_w_augment_mobilenetv2_int8_only_ptq.tflite + - taskset -c 0 ./bin/cinematic_mode_benchmark 10 resources/depth_and_saliency_v3_2_assortedv2_w_augment_mobilenetv2_int8_only_ptq.tflite - ./bin/low_light_image_enhancement resources/test_input2.ppm test_output2_lime.ppm resources/HDRNetLIME_lr_coeffs_v1_1_0_mixed_low_light_perceptual_l2_loss_int8_only_ptq.tflite - taskset -c 0 ./bin/low_light_image_enhancement_benchmark 10 resources/HDRNetLIME_lr_coeffs_v1_1_0_mixed_low_light_perceptual_l2_loss_int8_only_ptq.tflite tags: -- GitLab From 994a7f8a4fc59e70267c08191943d8f1d8922259 Mon Sep 17 00:00:00 2001 From: David Packwood Date: Thu, 19 Jun 2025 14:26:31 +0000 Subject: [PATCH 12/26] jiggle armnn build --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5f4d9c7..2b722a5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -70,7 +70,7 @@ build_arm_nn: parallel: matrix: - ENABLE_SME2: ["1"] - - ARMNN_GIT_TAG : ["v25.02"] + ARMNN_GIT_TAG : ["v25.02"] artifacts: paths: - install -- GitLab From 54c1885ca83fcdd30ac150b9abda569100621e5b Mon Sep 17 00:00:00 2001 From: David Packwood Date: Thu, 19 Jun 2025 19:02:23 +0000 Subject: [PATCH 13/26] turn off armnn build redirect temporarily --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b722a5..4e409e4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,7 +52,7 @@ build_arm_nn: else export ARMNN_ACL_OPTION='' fi - - ./build-armnn.sh --target-arch=aarch64 --all --neon-backend $ARMNN_ACL_OPTION 1> /dev/null + - ./build-armnn.sh --target-arch=aarch64 --all --neon-backend $ARMNN_ACL_OPTION # 1> /dev/null - tar -xzf armnn_aarch64.tar.gz - cd ../../../ - mkdir build -- GitLab From 3af76b5cf94f286855875e30c200e0eeb84dce47 Mon Sep 17 00:00:00 2001 From: David Packwood Date: Fri, 20 Jun 2025 07:33:16 +0000 Subject: [PATCH 14/26] minimal environment for armnn build --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4e409e4..905666e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,7 +52,11 @@ build_arm_nn: else export ARMNN_ACL_OPTION='' fi - - ./build-armnn.sh --target-arch=aarch64 --all --neon-backend $ARMNN_ACL_OPTION # 1> /dev/null + - env -i \ + PATH="$PATH" \ + HOME="$HOME" \ + ARMNN_ACL_OPTION="$ARMNN_ACL_OPTION" \ + ./build-armnn.sh --target-arch=aarch64 --all --neon-backend $ARMNN_ACL_OPTION - tar -xzf armnn_aarch64.tar.gz - cd ../../../ - mkdir build -- GitLab From 141860b80f68f2f2478c212a5d2c97ee94792e84 Mon Sep 17 00:00:00 2001 From: David Packwood Date: Fri, 20 Jun 2025 07:51:24 +0000 Subject: [PATCH 15/26] minimal environment for armnn build --- .gitlab-ci.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 905666e..b210680 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,16 +47,12 @@ build_arm_nn: - cd build-tool/scripts/ - ./setup-armnn.sh --target-arch=aarch64 --all 1> /dev/null - | - if [ "$ENABLE_SME2" -eq 1 ]; then + if [ "$ENABLE_SME2" = "1" ]; export ARMNN_ACL_OPTION='--acl-scons-params="arch=armv8.6-a-sve2-sme2"' else export ARMNN_ACL_OPTION='' fi - - env -i \ - PATH="$PATH" \ - HOME="$HOME" \ - ARMNN_ACL_OPTION="$ARMNN_ACL_OPTION" \ - ./build-armnn.sh --target-arch=aarch64 --all --neon-backend $ARMNN_ACL_OPTION + - env -i PATH="$PATH" HOME="$HOME" ARMNN_ACL_OPTION="$ARMNN_ACL_OPTION" -- ./build-armnn.sh --target-arch=aarch64 --all --neon-backend $ARMNN_ACL_OPTION - tar -xzf armnn_aarch64.tar.gz - cd ../../../ - mkdir build -- GitLab From a856f647a0cc874530cea92b08f357a769225260 Mon Sep 17 00:00:00 2001 From: David Packwood Date: Fri, 20 Jun 2025 08:08:08 +0000 Subject: [PATCH 16/26] minimal environment for armnn build --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b210680..3a50c74 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,7 +47,7 @@ build_arm_nn: - cd build-tool/scripts/ - ./setup-armnn.sh --target-arch=aarch64 --all 1> /dev/null - | - if [ "$ENABLE_SME2" = "1" ]; + if [ "$ENABLE_SME2" = "1" ]; then export ARMNN_ACL_OPTION='--acl-scons-params="arch=armv8.6-a-sve2-sme2"' else export ARMNN_ACL_OPTION='' -- GitLab From f6bf93a0317d158f7ee8f75fc982fe477a1dca5d Mon Sep 17 00:00:00 2001 From: David Packwood Date: Fri, 20 Jun 2025 08:20:58 +0000 Subject: [PATCH 17/26] minimal environment for armnn build --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a50c74..d62e56a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,7 +52,7 @@ build_arm_nn: else export ARMNN_ACL_OPTION='' fi - - env -i PATH="$PATH" HOME="$HOME" ARMNN_ACL_OPTION="$ARMNN_ACL_OPTION" -- ./build-armnn.sh --target-arch=aarch64 --all --neon-backend $ARMNN_ACL_OPTION + - env -i PATH="$PATH" HOME="$HOME" ARMNN_ACL_OPTION="$ARMNN_ACL_OPTION" ./build-armnn.sh --target-arch=aarch64 --all --neon-backend $ARMNN_ACL_OPTION - tar -xzf armnn_aarch64.tar.gz - cd ../../../ - mkdir build -- GitLab From 9d8a482d8e652de6ed5248c94e8a64112ced977e Mon Sep 17 00:00:00 2001 From: David Packwood Date: Fri, 20 Jun 2025 09:39:17 +0000 Subject: [PATCH 18/26] try to build armnn in a folder nearer to root --- .gitlab-ci.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d62e56a..fea635f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,7 +40,11 @@ build_arm_nn: - .common stage: build_and_run image: $DOCKER_IMAGE + variables: + ARMNN_BUILD_DIR: "/armnn" script: + - mkdir -p "$ARMNN_BUILD_DIR" + - pushd $ARMNN_BUILD_DIR - git clone https://github.com/ARM-software/armnn.git - cd armnn - git checkout $ARMNN_GIT_TAG @@ -52,12 +56,12 @@ build_arm_nn: else export ARMNN_ACL_OPTION='' fi - - env -i PATH="$PATH" HOME="$HOME" ARMNN_ACL_OPTION="$ARMNN_ACL_OPTION" ./build-armnn.sh --target-arch=aarch64 --all --neon-backend $ARMNN_ACL_OPTION + - ./build-armnn.sh --target-arch=aarch64 --all --neon-backend $ARMNN_ACL_OPTION - tar -xzf armnn_aarch64.tar.gz - - cd ../../../ + - popd - mkdir build - cd build - - cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../install -DARMNN_BUILD_DIR=$PWD/../armnn/build-tool/scripts/aarch64_build -DENABLE_SME2=$ENABLE_SME2 -DCMAKE_TOOLCHAIN_FILE=toolchain.cmake .. + - cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../install -DARMNN_BUILD_DIR=$ARMNN_BUILD_DIR/armnn/build-tool/scripts/aarch64_build -DENABLE_SME2=$ENABLE_SME2 -DCMAKE_TOOLCHAIN_FILE=toolchain.cmake .. - cmake --build . - cmake --install . - cd ../install -- GitLab From 98489c158c8ab4dafbde7a72a7e200392a8f0f9a Mon Sep 17 00:00:00 2001 From: David Packwood Date: Fri, 20 Jun 2025 09:59:19 +0000 Subject: [PATCH 19/26] try to build armnn in a folder nearer to root --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fea635f..debf0b3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ build_arm_nn: variables: ARMNN_BUILD_DIR: "/armnn" script: - - mkdir -p "$ARMNN_BUILD_DIR" + - sudo mkdir -p "$ARMNN_BUILD_DIR" - pushd $ARMNN_BUILD_DIR - git clone https://github.com/ARM-software/armnn.git - cd armnn -- GitLab From c26ffc0859fb4b34363bd6e3dd20164cbdbfab09 Mon Sep 17 00:00:00 2001 From: David Packwood Date: Fri, 20 Jun 2025 10:39:34 +0000 Subject: [PATCH 20/26] build armnn in tmp dir --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index debf0b3..18db02a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,9 +41,9 @@ build_arm_nn: stage: build_and_run image: $DOCKER_IMAGE variables: - ARMNN_BUILD_DIR: "/armnn" + ARMNN_BUILD_DIR: "/tmp/a" script: - - sudo mkdir -p "$ARMNN_BUILD_DIR" + - mkdir -p "$ARMNN_BUILD_DIR" - pushd $ARMNN_BUILD_DIR - git clone https://github.com/ARM-software/armnn.git - cd armnn -- GitLab From 0142c747f48a306ff2140c12c785c7558e5c833e Mon Sep 17 00:00:00 2001 From: David Packwood Date: Fri, 20 Jun 2025 10:56:15 +0000 Subject: [PATCH 21/26] redirect armnn build to null --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 18db02a..4cb2f60 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,7 +56,7 @@ build_arm_nn: else export ARMNN_ACL_OPTION='' fi - - ./build-armnn.sh --target-arch=aarch64 --all --neon-backend $ARMNN_ACL_OPTION + - ./build-armnn.sh --target-arch=aarch64 --all --neon-backend $ARMNN_ACL_OPTION 1> /dev/null - tar -xzf armnn_aarch64.tar.gz - popd - mkdir build -- GitLab From d6fffc5328b346d4b33ec07f127ce1eb73097853 Mon Sep 17 00:00:00 2001 From: David Packwood Date: Fri, 20 Jun 2025 12:01:43 +0000 Subject: [PATCH 22/26] updated tarball name for armnn build --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4cb2f60..bf16865 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -57,7 +57,7 @@ build_arm_nn: export ARMNN_ACL_OPTION='' fi - ./build-armnn.sh --target-arch=aarch64 --all --neon-backend $ARMNN_ACL_OPTION 1> /dev/null - - tar -xzf armnn_aarch64.tar.gz + - tar -xzf armnn_aarch64_build.tar.gz - popd - mkdir build - cd build -- GitLab From c6b79d325e996aed3181c6f7ccd5f8eff526a288 Mon Sep 17 00:00:00 2001 From: David Packwood Date: Fri, 20 Jun 2025 12:34:07 +0000 Subject: [PATCH 23/26] try armnn with sme off --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bf16865..12e2bf0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -73,7 +73,7 @@ build_arm_nn: - m7g.4xlarge parallel: matrix: - - ENABLE_SME2: ["1"] + - ENABLE_SME2: ["0", "1"] ARMNN_GIT_TAG : ["v25.02"] artifacts: paths: -- GitLab From 2b1e36f7afbdc9a66aec27da00cce3e368f354bb Mon Sep 17 00:00:00 2001 From: David Packwood Date: Fri, 20 Jun 2025 13:19:28 +0000 Subject: [PATCH 24/26] separate run jobs from build --- .gitlab-ci.yml | 45 ++++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 12e2bf0..0f1dc93 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ stages: - build_docker - - build_and_run + - build + - run .common: variables: @@ -35,10 +36,10 @@ build_base_docker: tags: - m7g.medium -build_arm_nn: +build_armnn: extends: - .common - stage: build_and_run + stage: build image: $DOCKER_IMAGE variables: ARMNN_BUILD_DIR: "/tmp/a" @@ -64,16 +65,11 @@ build_arm_nn: - cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../install -DARMNN_BUILD_DIR=$ARMNN_BUILD_DIR/armnn/build-tool/scripts/aarch64_build -DENABLE_SME2=$ENABLE_SME2 -DCMAKE_TOOLCHAIN_FILE=toolchain.cmake .. - cmake --build . - cmake --install . - - cd ../install - - ./bin/cinematic_mode ./resources/test_input2.ppm test_output2_cinematic.ppm resources/depth_and_saliency_v3_2_assortedv2_w_augment_mobilenetv2_int8_only_ptq.tflite - - taskset -c 0 ./bin/cinematic_mode_benchmark 10 resources/depth_and_saliency_v3_2_assortedv2_w_augment_mobilenetv2_int8_only_ptq.tflite - - ./bin/low_light_image_enhancement resources/test_input2.ppm test_output2_lime.ppm resources/HDRNetLIME_lr_coeffs_v1_1_0_mixed_low_light_perceptual_l2_loss_int8_only_ptq.tflite - - taskset -c 0 ./bin/low_light_image_enhancement_benchmark 10 resources/HDRNetLIME_lr_coeffs_v1_1_0_mixed_low_light_perceptual_l2_loss_int8_only_ptq.tflite tags: - m7g.4xlarge parallel: matrix: - - ENABLE_SME2: ["0", "1"] + - ENABLE_SME2: ["0"] ARMNN_GIT_TAG : ["v25.02"] artifacts: paths: @@ -82,7 +78,7 @@ build_arm_nn: build_tflite: extends: - .common - stage: build_and_run + stage: build image: $DOCKER_IMAGE script: - git clone https://github.com/google/flatbuffers.git @@ -99,11 +95,6 @@ build_tflite: - cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=../install -DARMNN_TFLITE_PARSER=0 -DTENSORFLOW_GIT_TAG=$TENSORFLOW_GIT_TAG -DTFLITE_HOST_TOOLS_DIR=../flatbuffers/install/bin -DENABLE_SME2=$ENABLE_SME2 -DCMAKE_TOOLCHAIN_FILE=toolchain.cmake -DCMAKE_POLICY_VERSION_MINIMUM=3.5 .. - cmake --build . - cmake --install . - - cd ../install - - ./bin/cinematic_mode ./resources/test_input2.ppm test_output2.ppm resources/depth_and_saliency_v3_2_assortedv2_w_augment_mobilenetv2_int8_only_ptq.tflite - - taskset -c 0 ./bin/cinematic_mode_benchmark 10 resources/depth_and_saliency_v3_2_assortedv2_w_augment_mobilenetv2_int8_only_ptq.tflite - - ./bin/low_light_image_enhancement resources/test_input2.ppm test_output2_lime.ppm resources/HDRNetLIME_lr_coeffs_v1_1_0_mixed_low_light_perceptual_l2_loss_int8_only_ptq.tflite - - taskset -c 0 ./bin/low_light_image_enhancement_benchmark 10 resources/HDRNetLIME_lr_coeffs_v1_1_0_mixed_low_light_perceptual_l2_loss_int8_only_ptq.tflite tags: - m7g.4xlarge parallel: @@ -113,3 +104,27 @@ build_tflite: artifacts: paths: - install + +.run: + extends: + - .common + stage: run + image: $DOCKER_IMAGE + script: + - cd ../install + - ./bin/cinematic_mode ./resources/test_input2.ppm test_output2.ppm resources/depth_and_saliency_v3_2_assortedv2_w_augment_mobilenetv2_int8_only_ptq.tflite + - taskset -c 0 ./bin/cinematic_mode_benchmark 10 resources/depth_and_saliency_v3_2_assortedv2_w_augment_mobilenetv2_int8_only_ptq.tflite + - ./bin/low_light_image_enhancement resources/test_input2.ppm test_output2_lime.ppm resources/HDRNetLIME_lr_coeffs_v1_1_0_mixed_low_light_perceptual_l2_loss_int8_only_ptq.tflite + - taskset -c 0 ./bin/low_light_image_enhancement_benchmark 10 resources/HDRNetLIME_lr_coeffs_v1_1_0_mixed_low_light_perceptual_l2_loss_int8_only_ptq.tflite + tags: + - m7g.medium + +run_tflite: + needs: + - job: build_tflite + artifacts: true + +run_armnn: + needs: + - job: build_armnn + artifacts: true \ No newline at end of file -- GitLab From 8215c0f81a5d784202990dbd1f90a9dc9913de7e Mon Sep 17 00:00:00 2001 From: David Packwood Date: Fri, 20 Jun 2025 13:36:12 +0000 Subject: [PATCH 25/26] separate run jobs from build --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0f1dc93..c47892a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -120,11 +120,15 @@ build_tflite: - m7g.medium run_tflite: + extends: + - .run needs: - job: build_tflite artifacts: true run_armnn: + extends: + - .run needs: - job: build_armnn artifacts: true \ No newline at end of file -- GitLab From 22df9150c5baf4c6dad7928bcbbdcabba4bfe30d Mon Sep 17 00:00:00 2001 From: David Packwood Date: Fri, 20 Jun 2025 13:53:04 +0000 Subject: [PATCH 26/26] fixup run job --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c47892a..80e3367 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -111,7 +111,7 @@ build_tflite: stage: run image: $DOCKER_IMAGE script: - - cd ../install + - cd install - ./bin/cinematic_mode ./resources/test_input2.ppm test_output2.ppm resources/depth_and_saliency_v3_2_assortedv2_w_augment_mobilenetv2_int8_only_ptq.tflite - taskset -c 0 ./bin/cinematic_mode_benchmark 10 resources/depth_and_saliency_v3_2_assortedv2_w_augment_mobilenetv2_int8_only_ptq.tflite - ./bin/low_light_image_enhancement resources/test_input2.ppm test_output2_lime.ppm resources/HDRNetLIME_lr_coeffs_v1_1_0_mixed_low_light_perceptual_l2_loss_int8_only_ptq.tflite -- GitLab