Remove Artpec-7

Author: Angelo DelliSanti

.github/workflows/hello-world-python.yml

@@ -14,11 +14,6 @@ jobs:
     env:
       EXREPO: acap-computer-vision-examples
       EXNAME: hello-world-python
-    strategy:
-      matrix:
-        include:
-          - arch: armv7hf
-          - arch: aarch64
     steps:
       - uses: actions/checkout@v2
       - uses: docker/setup-buildx-action@v2
@@ -30,4 +25,4 @@ jobs:
           imagetag: ${{ env.EXREPO }}_${{ env.EXNAME }}:1.0
         run: |
           cd $EXNAME
-          docker build --no-cache --build-arg ARCH=${{ matrix.arch }} --tag $imagetag .
+          docker build --no-cache --tag $imagetag .

.github/workflows/minimal-ml-inference.yml

@@ -17,12 +17,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - arch: armv7hf
-            chip: cpu
-          - arch: armv7hf
-            chip: edgetpu
-          - arch: aarch64
-            chip: artpec8
+          - chip: cpu
+          - chip: artpec8
     steps:
       - uses: actions/checkout@v2
       - uses: docker/setup-buildx-action@v2
@@ -36,5 +32,5 @@ jobs:
         run: |
           cd $EXNAME
           docker run --rm --privileged multiarch/qemu-user-static --credential yes --persistent yes
-          docker build --no-cache --build-arg CHIP=${{ matrix.chip }} --build-arg ARCH=${{ matrix.arch }} --tag $imagetag .
-          docker build --file Dockerfile.model --tag $modeltag --build-arg ARCH=${{ matrix.arch }} .
+          docker build --no-cache --build-arg CHIP=${{ matrix.chip }} --tag $imagetag .
+          docker build --file Dockerfile.model --tag $modeltag  .

.github/workflows/object-detector-python.yml

@@ -14,12 +14,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - arch: armv7hf
-            chip: cpu
-          - arch: armv7hf
-            chip: edgetpu
-          - arch: aarch64
-            chip: artpec8
+          - chip: cpu
+          - chip: artpec8
     env:
       EXREPO: acap-computer-vision-examples
       EXNAME: object-detector-python
@@ -35,5 +31,5 @@ jobs:
           modeltag: ${{ env.EXREPO }}_${{ env.EXNAME }}-${{ matrix.chip }}-model:1.0
         run: |
           cd $EXNAME
-          docker build --no-cache --build-arg CHIP=${{ matrix.chip }} --build-arg ARCH=${{ matrix.arch }} --tag $imagetag .
-          docker build --file Dockerfile.model --tag $modeltag --build-arg ARCH=${{ matrix.arch }} .
+          docker build --no-cache --build-arg CHIP=${{ matrix.chip }} --tag $imagetag .
+          docker build --file Dockerfile.model --tag $modeltag  .

.github/workflows/opencv-qr-decoder-python.yml

@@ -14,11 +14,6 @@ jobs:
     env:
       EXREPO: acap-computer-vision-examples
       EXNAME: opencv-qr-decoder-python
-    strategy:
-      matrix:
-        include:
-          - arch: armv7hf
-          - arch: aarch64
     steps:
       - uses: actions/checkout@v2
       - uses: docker/setup-buildx-action@v2
@@ -30,4 +25,4 @@ jobs:
           imagetag: ${{ env.EXREPO }}_${{ env.EXNAME }}:1.0
         run: |
           cd $EXNAME
-          docker build --no-cache --build-arg ARCH=${{ matrix.arch }} --tag $imagetag .
+          docker build --no-cache --tag $imagetag .

.github/workflows/parameter-api-python.yml

@@ -14,11 +14,6 @@ jobs:
     env:
       EXREPO: acap-computer-vision-examples
       EXNAME: parameter-api-python
-    strategy:
-      matrix:
-        include:
-          - arch: armv7hf
-          - arch: aarch64
     steps:
       - uses: actions/checkout@v2
       - uses: docker/setup-buildx-action@v2
@@ -30,4 +25,4 @@ jobs:
           imagetag: ${{ env.EXREPO }}_${{ env.EXNAME }}:1.0
         run: |
           cd $EXNAME
-          docker build --no-cache --build-arg ARCH=${{ matrix.arch }} --tag $imagetag .
+          docker build --no-cache --tag $imagetag .

.github/workflows/pose-estimator-with-flask.yml

@@ -17,12 +17,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - arch: armv7hf
-            chip: cpu
-          - arch: armv7hf
-            chip: edgetpu
-          - arch: aarch64
-            chip: artpec8
+          - chip: cpu
+          - chip: artpec8
 
     steps:
       - uses: actions/checkout@v2
@@ -37,5 +33,5 @@ jobs:
         run: |
           cd $EXNAME
           docker run --rm --privileged multiarch/qemu-user-static --credential yes --persistent yes
-          docker build --no-cache --build-arg CHIP=${{ matrix.chip }} --build-arg ARCH=${{ matrix.arch }} --tag $imagetag .
-          docker build --file Dockerfile.model --tag $modeltag --build-arg ARCH=${{ matrix.arch }} .
+          docker build --no-cache --build-arg CHIP=${{ matrix.chip }}  --tag $imagetag .
+          docker build --file Dockerfile.model --tag $modeltag .

.github/workflows/web-server.yml

@@ -14,11 +14,6 @@ jobs:
     env:
       EXREPO: acap-computer-vision-examples
       EXNAME: web-server
-    strategy:
-      matrix:
-        include:
-          - arch: armv7hf
-          - arch: aarch64
     steps:
       - uses: actions/checkout@v2
       - uses: docker/setup-buildx-action@v2
@@ -31,4 +26,4 @@ jobs:
         run: |
           cd $EXNAME
           docker run --rm --privileged multiarch/qemu-user-static --credential yes --persistent yes
-          docker build --no-cache --build-arg ARCH=${{ matrix.arch }} --tag $imagetag .
+          docker build --no-cache --tag $imagetag .

README.md

@@ -38,7 +38,6 @@ step-by-step instructions on how to run applications on the camera.
 
 The examples support the following architectures:
 
-* armv7hf
 * aarch64
 
 ### Example applications for video analytics

hello-world-python/Dockerfile

@@ -1,15 +1,13 @@
 # syntax=docker/dockerfile:1
 
-ARG ARCH=armv7hf
 ARG REPO=axisecp
 ARG SDK_VERSION=1.15
 ARG UBUNTU_VERSION=22.04
 
-FROM arm32v7/ubuntu:${UBUNTU_VERSION} as runtime-image-armv7hf
-FROM arm64v8/ubuntu:${UBUNTU_VERSION} as runtime-image-aarch64
 
-FROM ${REPO}/acap-computer-vision-sdk:${SDK_VERSION}-${ARCH} AS cv-sdk
-FROM runtime-image-${ARCH}
+FROM ${REPO}/acap-computer-vision-sdk:${SDK_VERSION}-aarch64 AS cv-sdk
+
+FROM arm64v8/ubuntu:${UBUNTU_VERSION}
 
 # Get the Python package from the CV SDK
 COPY --from=cv-sdk /axis/python /

hello-world-python/README.md

@@ -28,36 +28,23 @@ hello-world-python
 Meet the following requirements to ensure compatibility with the example:
 
 * Axis device
-  * Chip: ARTPEC-{7-8} DLPU devices (e.g., Q1615 MkIII)
-  * Firmware: 10.9 or higher
-  * [Docker ACAP](https://github.com/AxisCommunications/docker-acap#installing) installed and started, using TLS and SD card as storage
+  * Chip: ARTPEC-8 DLPU devices (e.g., Q1656)
+  * Firmware: 11.10 or higher
+  * [Docker ACAP](https://github.com/AxisCommunications/docker-acap#installing) version 3.0 installed and started, using TLS with TCP and IPC socket and SD card as storage
 * Computer
   * Either [Docker Desktop](https://docs.docker.com/desktop/) version 4.11.1 or higher,
   * or [Docker Engine](https://docs.docker.com/engine/) version 20.10.17 or higher with BuildKit enabled using Docker Compose version 1.29.2 or higher
 
 ## How to run the code
 
-### Export the environment variable for the architecture
-
-Export the `ARCH` variable depending on the architecture of your camera:
-
-```sh
-# For arm32
-export ARCH=armv7hf
-
-# For arm64
-export ARCH=aarch64
-```
-
 ### Build the Docker image
 
-With the architecture defined, the `hello-world-python` image can be built. The environment variables are supplied as build arguments such that they are made available to Docker during the build process:
+Define and export the application image name in `APP_NAME` for use in the Docker Compose file.
 
 ```sh
-# Define app name
 export APP_NAME=hello-world-python
 
-docker build --tag $APP_NAME --build-arg ARCH .
+docker build --tag $APP_NAME .
 ```
 
 ### Set your device IP address and clear Docker memory