standardise to ARCH-OS-ABI

Author: cocoa-xu

.github/workflows/edgetpu_runtime.yml

@@ -22,15 +22,35 @@ jobs:
         run: DOCKER_TARGETS=libedgetpu make docker-build
       - name: Release
         run: |
-          mkdir -p edgetpu_runtime
-          mv out edgetpu_runtime/libedgetpu
-          cp ./tflite/public/edgetpu.h edgetpu_runtime/libedgetpu/
-          cp ./tflite/public/edgetpu_c.h edgetpu_runtime/libedgetpu/
-          cp ./debian/edgetpu-accelerator.rules edgetpu_runtime/libedgetpu/
-          cp ./LICENSE edgetpu_runtime/libedgetpu/
-          cp ./scripts/*.sh edgetpu_runtime/
-          export ZIP_FILENAME="edgetpu_runtime_$(date '+%Y%m%d')_linux"
-          zip -r -9 -y "${ZIP_FILENAME}" edgetpu_runtime
+          export PACK_DIR=edgetpu_runtime
+
+          export LIBEDGETPU_NAME=k8
+          export TRIPLET=x86_64-linux-gnu
+          bash scripts/pack.sh out "${LIBEDGETPU_NAME}" "${TRIPLET}" "${PACK_DIR}"
+          export ZIP_FILENAME="edgetpu_runtime_${TRIPLET}_$(date '+%Y%m%d')"
+          zip -r -9 -y "${ZIP_FILENAME}.zip" "${PACK_DIR}"
+          rm -rf "${PACK_DIR}"
+
+          export LIBEDGETPU_NAME=armv7a
+          export TRIPLET=armv7l-linux-gnueabihf
+          bash scripts/pack.sh out "${LIBEDGETPU_NAME}" "${TRIPLET}" "${PACK_DIR}"
+          export ZIP_FILENAME="edgetpu_runtime_${TRIPLET}_$(date '+%Y%m%d')"
+          zip -r -9 -y "${ZIP_FILENAME}.zip" "${PACK_DIR}"
+          rm -rf "${PACK_DIR}"
+
+          export LIBEDGETPU_NAME=aarch64
+          export TRIPLET=aarch64-linux-gnu
+          bash scripts/pack.sh out "${LIBEDGETPU_NAME}" "${TRIPLET}" "${PACK_DIR}"
+          export ZIP_FILENAME="edgetpu_runtime_${TRIPLET}_$(date '+%Y%m%d')"
+          zip -r -9 -y "${ZIP_FILENAME}.zip" "${PACK_DIR}"
+          rm -rf "${PACK_DIR}"
+
+          export LIBEDGETPU_NAME=riscv64
+          export TRIPLET=riscv64-linux-gnu
+          bash scripts/pack.sh out "${LIBEDGETPU_NAME}" "${TRIPLET}" "${PACK_DIR}"
+          export ZIP_FILENAME="edgetpu_runtime_${TRIPLET}_$(date '+%Y%m%d')"
+          zip -r -9 -y "${ZIP_FILENAME}.zip" "${PACK_DIR}"
+          rm -rf "${PACK_DIR}"
       - uses: softprops/action-gh-release@v1
         with:
           tag_name: grouper
@@ -74,41 +94,21 @@ jobs:
           fi
       - name: Release
         run: |
-          mkdir -p edgetpu_runtime
-          mv out edgetpu_runtime/libedgetpu
-          cp ./tflite/public/edgetpu.h edgetpu_runtime/libedgetpu/
-          cp ./tflite/public/edgetpu_c.h edgetpu_runtime/libedgetpu/
-          cp ./LICENSE edgetpu_runtime/libedgetpu/
-          cp ./scripts/*.sh edgetpu_runtime/
-          export ZIP_FILENAME="edgetpu_runtime_$(date '+%Y%m%d')_macos"
-          zip -r -9 -y "${ZIP_FILENAME}" edgetpu_runtime
-      - uses: softprops/action-gh-release@v1
-        with:
-          tag_name: grouper
-          files: "edgetpu_runtime_*.zip"
+          export PACK_DIR=edgetpu_runtime
 
-  build_windows:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Download official builds
-        run: |
-          # too much pain to acutally build this on windows
-          # I gave up... Just download official builds...
-          wget https://github.com/google-coral/libedgetpu/releases/download/release-grouper/edgetpu_runtime_20220308.zip
-          unzip edgetpu_runtime_20220308.zip
-          rm -f edgetpu_runtime_20220308.zip
-          mv edgetpu_runtime edgetpu_runtime_20220308
-          mkdir -p edgetpu_runtime/libedgetpu
-          cp -a ./edgetpu_runtime_20220308/*.bat edgetpu_runtime
-          cp -a ./edgetpu_runtime_20220308/third_party edgetpu_runtime/third_party
-          cp ./edgetpu_runtime_20220308/libedgetpu/edgetpu.h edgetpu_runtime/libedgetpu/
-          cp ./edgetpu_runtime_20220308/libedgetpu/edgetpu_c.h edgetpu_runtime/libedgetpu/
-          mkdir -p edgetpu_runtime/libedgetpu/throttled
-          cp -a ./edgetpu_runtime_20220308/libedgetpu/throttled/x64_windows edgetpu_runtime/libedgetpu/throttled/
-          mkdir -p edgetpu_runtime/libedgetpu/direct
-          cp -a ./edgetpu_runtime_20220308/libedgetpu/direct/x64_windows edgetpu_runtime/libedgetpu/direct/
-          export ZIP_FILENAME="edgetpu_runtime_$(date '+%Y%m%d')_windows"
-          zip -r -9 -y "${ZIP_FILENAME}" edgetpu_runtime
+          export LIBEDGETPU_NAME=darwin_arm64
+          export TRIPLET=arm64-apple-darwin
+          bash scripts/pack.sh out "${LIBEDGETPU_NAME}" "${TRIPLET}" "${PACK_DIR}"
+          export ZIP_FILENAME="edgetpu_runtime_${TRIPLET}_$(date '+%Y%m%d')"
+          zip -r -9 -y "${ZIP_FILENAME}.zip" "${PACK_DIR}"
+          rm -rf "${PACK_DIR}"
+
+          export LIBEDGETPU_NAME=darwin_x86_64
+          export TRIPLET=x86_64-apple-darwin
+          bash scripts/pack.sh out "${LIBEDGETPU_NAME}" "${TRIPLET}" "${PACK_DIR}"
+          export ZIP_FILENAME="edgetpu_runtime_${TRIPLET}_$(date '+%Y%m%d')"
+          zip -r -9 -y "${ZIP_FILENAME}.zip" "${PACK_DIR}"
+          rm -rf "${PACK_DIR}"
       - uses: softprops/action-gh-release@v1
         with:
           tag_name: grouper

Makefile

@@ -33,8 +33,8 @@ else
 $(error $(OS) is not supported)
 endif
 
-ifeq ($(filter $(CPU),k8 armv7a aarch64 riscv64 s390x ppc64el darwin_arm64 darwin_x86_64),)
-$(error CPU must be k8, armv7a, aarch64, riscv64, s390x, ppc64el, darwin_arm64, or darwin_x86_64)
+ifeq ($(filter $(CPU),k8 armv7a aarch64 riscv64 darwin_arm64 darwin_x86_64),)
+$(error CPU must be k8, armv7a, aarch64, riscv64, darwin_arm64, or darwin_x86_64)
 endif
 
 COMPILATION_MODE ?= opt
@@ -153,7 +153,7 @@ clean:
 DOCKER_CONTEXT_DIR := $(MAKEFILE_DIR)/docker
 DOCKER_WORKSPACE := $(MAKEFILE_DIR)
 DOCKER_CONTAINER_WORKSPACE := /workspace
-DOCKER_CPUS ?= k8 armv7a aarch64 riscv64 s390x ppc64el
+DOCKER_CPUS ?= k8 armv7a aarch64 riscv64
 DOCKER_TARGETS ?=
 DOCKER_IMAGE ?= ubuntu:20.04
 DOCKER_TAG_BASE ?= libedgetpu-cross

README.md

@@ -17,7 +17,7 @@ There are three ways to build libedgetpu:
 Build Linux binaries inside Docker container (works on Linux and macOS):
 ```
 $ DOCKER_CPUS="k8" DOCKER_IMAGE="ubuntu:18.04" DOCKER_TARGETS=libedgetpu make docker-build
-$ DOCKER_CPUS="armv7a aarch64 riscv64 s390x ppc64el" DOCKER_IMAGE="ubuntu:20.04" DOCKER_TARGETS=libedgetpu make docker-build
+$ DOCKER_CPUS="armv7a aarch64 riscv64" DOCKER_IMAGE="ubuntu:20.04" DOCKER_TARGETS=libedgetpu make docker-build
 ```
 
 All built binaries go to the `out` directory. Note that the bazel-* are not copied to the host from the Docker container.
@@ -36,13 +36,11 @@ Build native binaries on Windows:
 $ build.bat
 ```
 
-Cross-compile for ARMv7-A (32 bit), ARMv8-A (64 bit), RISC-V (64 bit), s390x, ppc64el (PowerPC 64 bit little-endian) on Linux:
+Cross-compile for ARMv7-A (32 bit), ARMv8-A (64 bit), and RISC-V (64 bit) on Linux:
 ```
 $ CPU=armv7a make
 $ CPU=aarch64 make
 $ CPU=riscv64 make
-$ CPU=s390x make
-$ CPU=ppc64el make
 ```
 
 ### Makefile

docker/Dockerfile

@@ -20,37 +20,27 @@ RUN /update_sources.sh
 RUN dpkg --add-architecture armhf
 RUN dpkg --add-architecture arm64
 RUN dpkg --add-architecture riscv64
-RUN dpkg --add-architecture s390x
-RUN dpkg --add-architecture ppc64el
 
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y \
       libc6-dev:arm64 \
       libc6-dev:armhf \
       libc6-dev:riscv64 \
-      libc6-dev:s390x \
-      libc6-dev:ppc64el \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y \
       python3-all \
       python3-numpy \
       build-essential \
       crossbuild-essential-armhf \
       crossbuild-essential-arm64 \
       crossbuild-essential-riscv64 \
-      crossbuild-essential-s390x \
-      crossbuild-essential-ppc64el \
       libusb-1.0-0-dev \
       libusb-1.0-0-dev:arm64 \
       libusb-1.0-0-dev:armhf \
       libusb-1.0-0-dev:riscv64 \
-      libusb-1.0-0-dev:s390x \
-      libusb-1.0-0-dev:ppc64el \
       zlib1g-dev \
       zlib1g-dev:armhf \
       zlib1g-dev:arm64 \
       zlib1g-dev:riscv64 \
-      zlib1g-dev:s390x \
-      zlib1g-dev:ppc64el \
       sudo \
       debhelper \
       pkg-config \

docker/update_sources.sh

@@ -19,7 +19,7 @@
 sed -i "s/deb\ /deb \[arch=amd64\]\ /g" /etc/apt/sources.list
 
 cat <<EOT >> /etc/apt/sources.list
-deb [arch=arm64,armhf,riscv64,s390x,ppc64el] http://ports.ubuntu.com/ubuntu-ports ${UBUNTU_CODENAME} main universe
-deb [arch=arm64,armhf,riscv64,s390x,ppc64el] http://ports.ubuntu.com/ubuntu-ports ${UBUNTU_CODENAME}-updates main universe
-deb [arch=arm64,armhf,riscv64,s390x,ppc64el] http://ports.ubuntu.com/ubuntu-ports ${UBUNTU_CODENAME}-security main universe
+deb [arch=arm64,armhf,riscv64] http://ports.ubuntu.com/ubuntu-ports ${UBUNTU_CODENAME} main universe
+deb [arch=arm64,armhf,riscv64] http://ports.ubuntu.com/ubuntu-ports ${UBUNTU_CODENAME}-updates main universe
+deb [arch=arm64,armhf,riscv64] http://ports.ubuntu.com/ubuntu-ports ${UBUNTU_CODENAME}-security main universe
 EOT

scripts/pack.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+OUT_DIR="$1"
+LIBEDGETPU_NAME="$2"
+TRIPLET="$3"
+PACK_DIR="$4"
+
+OUT_DIRECT_DIR="${OUT_DIR}/direct/${LIBEDGETPU_NAME}"
+OUT_THROTTLED_DIR="${OUT_DIR}/throttled/${LIBEDGETPU_NAME}"
+PACK_LIBEDGETPU_DIR="${PACK_DIR}/libedgetpu"
+PACK_LIBEDGETPU_DIRECT_DIR="${PACK_LIBEDGETPU_DIR}/direct/${TRIPLET}"
+PACK_LIBEDGETPU_THROTTLED_DIR="${PACK_LIBEDGETPU_DIR}/throttled/${TRIPLET}"
+mkdir -p "${PACK_LIBEDGETPU_DIR}/direct"
+mkdir -p "${PACK_LIBEDGETPU_DIR}/throttled"
+mv "${OUT_DIRECT_DIR}" "${PACK_LIBEDGETPU_DIRECT_DIR}"
+mv "${OUT_THROTTLED_DIR}" "${PACK_LIBEDGETPU_THROTTLED_DIR}"
+cp ./tflite/public/edgetpu.h "${PACK_LIBEDGETPU_DIR}"
+cp ./tflite/public/edgetpu_c.h "${PACK_LIBEDGETPU_DIR}"
+cp ./debian/edgetpu-accelerator.rules "${PACK_LIBEDGETPU_DIR}"
+cp ./LICENSE "${PACK_LIBEDGETPU_DIR}"
+cp ./scripts/install.sh "${PACK_DIR}"
+cp ./scripts/uninstall.sh "${PACK_DIR}"