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

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

Hide file tree

Showing 70 changed files with 669 additions and 747 deletions.
diff --git a/.github/actions/deploy-centos/action.yml b/.github/actions/deploy-centos/action.yml
@@ -36,7 +36,7 @@ runs:
         source scl_source enable $SCL_ENABLE || true
 
         curl -LO https://github.com/Kitware/CMake/releases/download/v3.24.2/cmake-3.24.2-linux-x86_64.tar.gz
-        curl -LO https://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz
+        curl -LO https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz
         curl -LO https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.18.3.tar.gz
         curl -LO https://services.gradle.org/distributions/gradle-7.1.1-bin.zip
         tar -xzf cmake-3.24.2-linux-x86_64.tar.gz -C /opt/

diff --git a/.github/actions/deploy-macosx/action.yml b/.github/actions/deploy-macosx/action.yml
@@ -59,7 +59,7 @@ runs:
         sudo install_name_tool -add_rpath @loader_path/. -id @rpath/libSDL2-2.0.0.dylib /usr/local/opt/sdl2/lib/libSDL2-2.0.0.dylib
         sudo install_name_tool -add_rpath @loader_path/. -id @rpath/libusb-1.0.0.dylib /usr/local/opt/libusb/lib/libusb-1.0.0.dylib
 
-        curl -LO https://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz
+        curl -LO https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz
         sudo tar -xzf apache-maven-3.6.3-bin.tar.gz -C /usr/local/opt
         sudo ln -sf /usr/local/opt/apache-maven-3.6.3/bin/mvn /usr/local/bin/mvn
 

diff --git a/.github/actions/deploy-ubuntu/action.yml b/.github/actions/deploy-ubuntu/action.yml
@@ -7,11 +7,14 @@ 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
         fi
+        cd $HOME
 
         mkdir -p .ccache
         echo "max_size = 2.0G"                                                                        > .ccache/ccache.conf
@@ -26,15 +29,15 @@ runs:
           export USERLAND_BUILDME="buildme"
         elif [[ "$CI_DEPLOY_PLATFORM" == "linux-arm64" ]]; then
           export ARCH=arm64
-          export ARCH2=sbsa
+          export ARCH_CUDA=sbsa
           export PREFIX=aarch64-linux-gnu
           export CUDA=cuda-repo-rhel8-12-1-local-12.1.1_530.30.02-1.aarch64.rpm
           export CUDNN=8.9.1.23-1.cuda12.1.aarch64
           export NCCL=2.18.1-1+cuda12.1.aarch64
           export USERLAND_BUILDME="buildme --aarch64"
         elif [[ "$CI_DEPLOY_PLATFORM" == "linux-ppc64le" ]]; then
           export ARCH=ppc64el
-          export ARCH2=ppc64le
+          export ARCH_CUDA=ppc64le
           export PREFIX=powerpc64le-linux-gnu
           export CUDA=cuda-repo-rhel8-12-1-local-12.1.1_530.30.02-1.ppc64le.rpm
           export CUDNN=8.9.1.23-1.cuda12.1.ppc64le
@@ -44,14 +47,13 @@ runs:
           export PREFIX=i686-linux-gnu
         elif [[ "$CI_DEPLOY_PLATFORM" == "linux-x86_64" ]]; then
           export ARCH=amd64
-          export ARCH2=x86_64
+          export ARCH_CUDA=x86_64
           export PREFIX=x86_64-linux-gnu
           export CUDA=cuda-repo-rhel8-12-1-local-12.1.1_530.30.02-1.x86_64.rpm
           export CUDNN=8.9.1.23-1.cuda12.1.x86_64
           export NCCL=2.18.1-1+cuda12.1.x86_64
         fi
         echo "ARCH=$ARCH" >> $GITHUB_ENV
-        echo "ARCH2=$ARCH2" >> $GITHUB_ENV
         echo "PREFIX=$PREFIX" >> $GITHUB_ENV
 
         $SUDO apt-get update
@@ -84,12 +86,14 @@ 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 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
+        export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
+        echo "JAVA_HOME=$JAVA_HOME" >> $GITHUB_ENV
+        ln -sf $JAVA_HOME /usr/lib/jvm/default-java
         find /usr/lib/jvm/default-java/
         curl -LO https://github.com/Kitware/CMake/releases/download/v3.24.2/cmake-3.24.2-linux-x86_64.tar.gz
-        curl -LO https://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz
+        curl -LO https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz
         curl -LO https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.18.3.tar.gz
         curl -LO https://services.gradle.org/distributions/gradle-7.1.1-bin.zip
         $SUDO tar -xzf cmake-3.24.2-linux-x86_64.tar.gz -C /opt/
@@ -122,13 +126,13 @@ runs:
           export MAVEN_OPTIONS="-Djavacpp.platform.compiler=$PREFIX-g++ -Djava.library.path=/usr/$PREFIX/lib/:/usr/lib/$PREFIX/:$USERLAND_PATH/build/lib/"
         fi
 
-        if [[ "$CI_DEPLOY_PLATFORM" == "linux-arm64" ]] || [[ "$CI_DEPLOY_PLATFORM" == "linux-ppc64le" ]] && [[ -n ${CI_DEPLOY_NEED_CUDA:-} ]]; then
+        if [[ -n ${ARCH_CUDA:-} ]] && [[ -n ${CI_DEPLOY_NEED_CUDA:-} ]]; then
           echo Installing CUDA, cuDNN, etc
           curl -LO https://developer.download.nvidia.com/compute/cuda/12.1.1/local_installers/$CUDA
-          curl -LO https://developer.download.nvidia.com/compute/cuda/repos/rhel8/$ARCH2/libcudnn8-$CUDNN.rpm
-          curl -LO https://developer.download.nvidia.com/compute/cuda/repos/rhel8/$ARCH2/libcudnn8-devel-$CUDNN.rpm
-          curl -LO https://developer.download.nvidia.com/compute/cuda/repos/rhel8/$ARCH2/libnccl-$NCCL.rpm
-          curl -LO https://developer.download.nvidia.com/compute/cuda/repos/rhel8/$ARCH2/libnccl-devel-$NCCL.rpm
+          curl -LO https://developer.download.nvidia.com/compute/cuda/repos/rhel8/$ARCH_CUDA/libcudnn8-$CUDNN.rpm
+          curl -LO https://developer.download.nvidia.com/compute/cuda/repos/rhel8/$ARCH_CUDA/libcudnn8-devel-$CUDNN.rpm
+          curl -LO https://developer.download.nvidia.com/compute/cuda/repos/rhel8/$ARCH_CUDA/libnccl-$NCCL.rpm
+          curl -LO https://developer.download.nvidia.com/compute/cuda/repos/rhel8/$ARCH_CUDA/libnccl-devel-$NCCL.rpm
 
           $SUDO rpm -i --force --ignorearch --nodeps $CUDA libcudnn*.rpm libnccl*.rpm
           rm -f *.rpm *.tgz *.txz *.tar.*
@@ -248,8 +252,6 @@ runs:
     - name: Build project
       shell: bash
       run: |
-        export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
-
         git --version
         $PREFIX-gcc --version
         cmake --version
@@ -262,17 +264,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 +304,5 @@ runs:
     - name: Clean up
       shell: bash
       run: |
-        if [[ "$USER" == "root" ]]; then
-          cd /root
-        fi
+        cd $HOME
         rm -Rf $(find .m2/repository/ -name '*SNAPSHOT*')
diff --git a/.github/actions/deploy-windows/action.yml b/.github/actions/deploy-windows/action.yml
@@ -27,7 +27,7 @@ runs:
         rm "C:/msys64/mingw32/bin/clang-cl.exe" "C:/msys64/mingw64/bin/clang-cl.exe" "C:/msys64/mingw32/bin/cmake.exe" "C:/msys64/mingw64/bin/cmake.exe"
         rm "C:/Strawberry/c/lib/libz.a" "C:/Strawberry/c/lib/libzlib.a" "C:/Strawberry/c/lib/libzdll.a"
 
-        curl -LO https://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz
+        curl -LO https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz
         bash -c "tar -xzf apache-maven-3.6.3-bin.tar.gz -C 'C:/Program Files/'"
 
         python -m pip install gdown || python -m pip install gdown

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