Update builds for OpenCV, FFmpeg, MKL, DNNL, OpenBLAS, CPython, NumPy…

…, SciPy, LLVM, libffi, Leptonica, Tesseract, CUDA, OpenCL
bytedeco · Jun 8, 2023 · 0686806 · 0686806
1 parent 913c7fc
commit 0686806
Show file tree

Hide file tree

Showing 64 changed files with 554 additions and 633 deletions.
diff --git a/.github/actions/deploy-ubuntu/action.yml b/.github/actions/deploy-ubuntu/action.yml
@@ -7,10 +7,13 @@ runs:
       env:
         GITHUB_EVENT_HEAD_COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
       run: |
-        SUDO=sudo
-        if [[ "$USER" == "root" ]]; then
-          SUDO=
-          cd /root
+        export SUDO=$(which sudo)
+        echo "SUDO=$SUDO" >> $GITHUB_ENV
+        if [[ -z "$SUDO" ]]; then
+          echo "Fixing HOME to /root (was '$HOME')"
+          export HOME=/root
+          echo "HOME=$HOME" >> $GITHUB_ENV
+          cd $HOME
         fi
 
         mkdir -p .ccache
@@ -84,7 +87,7 @@ runs:
         # $SUDO apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BA6932366A755776
         $SUDO apt-get update
         $SUDO apt-get -y install gcc-multilib g++-multilib python3 python2.7 python3-minimal python2.7-minimal rpm libasound2-dev:$ARCH freeglut3-dev:$ARCH libfontconfig-dev:$ARCH libgtk2.0-dev:$ARCH libusb-dev:$ARCH libusb-1.0-0-dev:$ARCH libffi-dev:$ARCH libbz2-dev:$ARCH zlib1g-dev:$ARCH libxcb1-dev:$ARCH
-        $SUDO apt-get -y install pkg-config ccache clang $TOOLCHAIN openjdk-8-jdk-headless ant python python3-pip swig git file wget unzip tar bzip2 gzip patch autoconf-archive autogen automake make libtool bison flex perl nasm curl libcurl4-openssl-dev libssl-dev libffi-dev libbz2-dev zlib1g-dev
+        $SUDO apt-get -y install pkg-config ccache clang $TOOLCHAIN openjdk-8-jdk-headless ant python2 python3-pip swig git file wget unzip tar bzip2 gzip patch autoconf-archive autogen automake make libtool bison flex perl nasm curl libcurl4-openssl-dev libssl-dev libffi-dev libbz2-dev zlib1g-dev rapidjson-dev
 
         ln -sf /usr/lib/jvm/java-8-openjdk-amd64 /usr/lib/jvm/default-java
         find /usr/lib/jvm/default-java/
@@ -262,17 +265,13 @@ runs:
 
         export MAKEJ=$(getconf _NPROCESSORS_ONLN)
         echo Fetching $GITHUB_REPOSITORY@$GITHUB_SHA
+        git config --global --add safe.directory '*'
         git init
         git fetch --depth 1 https://github.com/$GITHUB_REPOSITORY $GITHUB_SHA
         git checkout $GITHUB_SHA
         git submodule update --init --recursive
         git submodule foreach --recursive 'git reset --hard'
 
-        if [[ "$USER" == "root" ]]; then
-          echo "Fixing HOME to /root (was '$HOME')"
-          export HOME=/root
-        fi
-
         if [[ -n ${CI_DEPLOY_NEED_GRADLE:-} ]]; then
           echo Executing Gradle $GRADLE_TASK ${{ matrix.options }} $CI_DEPLOY_OPTIONS on $MAKEJ processors
           export GRADLE_OPTIONS="-Dorg.gradle.jvmargs=-Xmx2048m -PjavacppPlatform=$CI_DEPLOY_PLATFORM -PjavacppPlatformExtension=${{ matrix.ext }} ${{ matrix.options }} $CI_DEPLOY_OPTIONS --info"
@@ -306,7 +305,4 @@ runs:
     - name: Clean up
       shell: bash
       run: |
-        if [[ "$USER" == "root" ]]; then
-          cd /root
-        fi
-        rm -Rf $(find .m2/repository/ -name '*SNAPSHOT*')
+        rm -Rf $(find $HOME/.m2/repository/ -name '*SNAPSHOT*')
diff --git a/.github/workflows/cpython.yml b/.github/workflows/cpython.yml
@@ -19,43 +19,38 @@ env:
 jobs:
 #  linux-armhf:
 #    runs-on: ubuntu-20.04
-#    container: ubuntu:bionic
 #    steps:
 #      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
 #  linux-arm64:
 #    runs-on: ubuntu-20.04
-#    container: ubuntu:bionic
 #    steps:
 #      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
 #  linux-ppc64le:
 #    runs-on: ubuntu-20.04
-#    container: ubuntu:bionic
 #    steps:
 #      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
-  linux-x86:
-    runs-on: ubuntu-20.04
-    container: centos:7
-    steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
+#  linux-x86:
+#    runs-on: ubuntu-20.04
+#    steps:
+#      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
   linux-x86_64:
     runs-on: ubuntu-20.04
-    container: centos:7
     steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
+      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
   macosx-x86_64:
     runs-on: macos-11
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
-  windows-x86:
-    runs-on: windows-2019
-    steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
+#  windows-x86:
+#    runs-on: windows-2019
+#    steps:
+#      - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
   windows-x86_64:
     runs-on: windows-2019
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
   redeploy:
-    needs: [linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64]
+    needs: [linux-x86_64, macosx-x86_64, windows-x86_64]
 #    needs: [linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64]
     runs-on: ubuntu-20.04
     steps:

diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml
@@ -20,19 +20,16 @@ env:
 jobs:
   linux-arm64:
     runs-on: ubuntu-20.04
-    container: ubuntu:bionic
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
   linux-ppc64le:
     runs-on: ubuntu-20.04
-    container: ubuntu:bionic
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
   linux-x86_64:
     runs-on: ubuntu-20.04
-    container: centos:7
     steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
+      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
 #  macosx-x86_64:
 #    runs-on: macos-11
 #    steps:

diff --git a/.github/workflows/dnnl.yml b/.github/workflows/dnnl.yml
@@ -19,14 +19,12 @@ env:
 jobs:
   linux-arm64:
     runs-on: ubuntu-20.04
-    container: ubuntu:bionic
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
   linux-x86_64:
     runs-on: ubuntu-20.04
-    container: centos:7
     steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
+      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
   macosx-x86_64:
     runs-on: macos-11
     steps:

diff --git a/.github/workflows/ffmpeg.yml b/.github/workflows/ffmpeg.yml
@@ -18,78 +18,69 @@ env:
   CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
   STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }}
 jobs:
-  android-arm:
-    runs-on: ubuntu-20.04
-    container: centos:7
-    strategy:
-      matrix:
-        ext: ["", -gpl]
-    steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
+#  android-arm:
+#    runs-on: ubuntu-20.04
+#    strategy:
+#      matrix:
+#        ext: ["", -gpl]
+#    steps:
+#      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
   android-arm64:
     runs-on: ubuntu-20.04
-    container: centos:7
-    strategy:
-      matrix:
-        ext: ["", -gpl]
-    steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
-  android-x86:
-    runs-on: ubuntu-20.04
-    container: centos:7
     strategy:
       matrix:
         ext: ["", -gpl]
     steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
+      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
+#  android-x86:
+#    runs-on: ubuntu-20.04
+#    strategy:
+#      matrix:
+#        ext: ["", -gpl]
+#    steps:
+#      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
   android-x86_64:
     runs-on: ubuntu-20.04
-    container: centos:7
-    strategy:
-      matrix:
-        ext: ["", -gpl]
-    steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
-  linux-armhf:
-    runs-on: ubuntu-20.04
-    container: ubuntu:bionic
     strategy:
       matrix:
         ext: ["", -gpl]
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
+#  linux-armhf:
+#    runs-on: ubuntu-20.04
+#    strategy:
+#      matrix:
+#        ext: ["", -gpl]
+#    steps:
+#      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
   linux-arm64:
     runs-on: ubuntu-20.04
-    container: ubuntu:bionic
     strategy:
       matrix:
         ext: ["", -gpl]
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
   linux-ppc64le:
     runs-on: ubuntu-20.04
-    container: ubuntu:bionic
     strategy:
       matrix:
         ext: ["", -gpl]
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
-  linux-x86:
-    runs-on: ubuntu-20.04
-    container: centos:7
-    strategy:
-      matrix:
-        ext: ["", -gpl]
-    steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
+#  linux-x86:
+#    runs-on: ubuntu-20.04
+#    strategy:
+#      matrix:
+#        ext: ["", -gpl]
+#    steps:
+#      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
   linux-x86_64:
     runs-on: ubuntu-20.04
-    container: centos:7
     strategy:
       matrix:
         ext: ["", -gpl]
     steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
+      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
   macosx-arm64:
     runs-on: macos-11
     strategy:
@@ -104,13 +95,13 @@ jobs:
         ext: ["", -gpl]
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
-  windows-x86:
-    runs-on: windows-2019
-    strategy:
-      matrix:
-        ext: ["", -gpl]
-    steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
+#  windows-x86:
+#    runs-on: windows-2019
+#    strategy:
+#      matrix:
+#        ext: ["", -gpl]
+#    steps:
+#      - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
   windows-x86_64:
     runs-on: windows-2019
     strategy:
@@ -119,7 +110,8 @@ jobs:
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
   redeploy:
-    needs: [android-arm, android-arm64, android-x86, android-x86_64, linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86, windows-x86_64]
+#    needs: [android-arm, android-arm64, android-x86, android-x86_64, linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86, windows-x86_64]
+    needs: [android-arm64, android-x86_64, linux-arm64, linux-ppc64le, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86_64]
     runs-on: ubuntu-20.04
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions
diff --git a/.github/workflows/leptonica.yml b/.github/workflows/leptonica.yml
@@ -18,51 +18,42 @@ env:
   CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
   STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }}
 jobs:
-  android-arm:
-    runs-on: ubuntu-20.04
-    container: centos:7
-    steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
+#  android-arm:
+#    runs-on: ubuntu-20.04
+#    steps:
+#      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
   android-arm64:
     runs-on: ubuntu-20.04
-    container: centos:7
-    steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
-  android-x86:
-    runs-on: ubuntu-20.04
-    container: centos:7
     steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
+      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
+#  android-x86:
+#    runs-on: ubuntu-20.04
+#    steps:
+#      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
   android-x86_64:
     runs-on: ubuntu-20.04
-    container: centos:7
-    steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
-  linux-armhf:
-    runs-on: ubuntu-20.04
-    container: ubuntu:bionic
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
+#  linux-armhf:
+#    runs-on: ubuntu-20.04
+#    steps:
+#      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
   linux-arm64:
     runs-on: ubuntu-20.04
-    container: ubuntu:bionic
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
   linux-ppc64le:
     runs-on: ubuntu-20.04
-    container: ubuntu:bionic
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
-  linux-x86:
-    runs-on: ubuntu-20.04
-    container: centos:7
-    steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
+#  linux-x86:
+#    runs-on: ubuntu-20.04
+#    steps:
+#      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
   linux-x86_64:
     runs-on: ubuntu-20.04
-    container: centos:7
     steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions
+      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
   macosx-arm64:
     runs-on: macos-11
     steps:
@@ -71,16 +62,17 @@ jobs:
     runs-on: macos-11
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions
-  windows-x86:
-    runs-on: windows-2019
-    steps:
-      - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
+#  windows-x86:
+#    runs-on: windows-2019
+#    steps:
+#      - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
   windows-x86_64:
     runs-on: windows-2019
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
   redeploy:
-    needs: [android-arm, android-arm64, android-x86, android-x86_64, linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86, windows-x86_64]
+#    needs: [android-arm, android-arm64, android-x86, android-x86_64, linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86, windows-x86_64]
+    needs: [android-arm64, android-x86_64, linux-arm64, linux-ppc64le, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86_64]
     runs-on: ubuntu-20.04
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions