diff --git a/.github/actions/deploy-ubuntu/action.yml b/.github/actions/deploy-ubuntu/action.yml index 6c55bec0aaa..82fc861ebc5 100644 --- a/.github/actions/deploy-ubuntu/action.yml +++ b/.github/actions/deploy-ubuntu/action.yml @@ -85,7 +85,7 @@ runs: # $SUDO apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EB9B1D8886F44E2A # $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 gcc-multilib g++-multilib gfortran-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 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 export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/ @@ -137,6 +137,7 @@ runs: $SUDO rpm -i --force --ignorearch --nodeps $CUDA libcudnn*.rpm libnccl*.rpm rm -f *.rpm *.tgz *.txz *.tar.* pushd /var/cuda-repo-rhel8-12-1-local/; $SUDO rpm -i --force --ignorearch --nodeps cuda*.rpm libc*.rpm libn*.rpm; $SUDO rm *.rpm; popd + $SUDO ln -sf /usr/local/cuda/lib64/ /usr/local/cuda/lib $SUDO ln -sf /usr/local/cuda/lib64/stubs/libcuda.so /usr/local/cuda/lib64/libcuda.so $SUDO ln -sf /usr/local/cuda/lib64/stubs/libnvidia-ml.so /usr/local/cuda/lib64/libnvidia-ml.so $SUDO mv /usr/include/cudnn* /usr/include/nccl* /usr/local/cuda/include/ diff --git a/.github/workflows/arpack-ng.yml b/.github/workflows/arpack-ng.yml index 0b1daaba14a..cd3f5e43f0a 100644 --- a/.github/workflows/arpack-ng.yml +++ b/.github/workflows/arpack-ng.yml @@ -18,45 +18,41 @@ env: CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }} jobs: - 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-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-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64] +# needs: [linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64] + needs: [linux-arm64, linux-ppc64le, linux-x86_64, 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/bullet.yml b/.github/workflows/bullet.yml index 765fd9dff51..86d64b5c2f5 100644 --- a/.github/workflows/bullet.yml +++ b/.github/workflows/bullet.yml @@ -17,50 +17,45 @@ 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-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 +# 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: [android-arm, android-arm64, android-x86, android-x86_64, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64] +# needs: [android-arm, android-arm64, android-x86, android-x86_64, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64] + needs: [android-arm64, android-x86_64, linux-x86_64, 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/cminpack.yml b/.github/workflows/cminpack.yml index be2da9bc23f..657d21d1c68 100644 --- a/.github/workflows/cminpack.yml +++ b/.github/workflows/cminpack.yml @@ -18,45 +18,41 @@ env: CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }} jobs: - 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-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-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64] +# needs: [linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64] + needs: [linux-arm64, linux-ppc64le, linux-x86_64, 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/fftw.yml b/.github/workflows/fftw.yml index 27b03ff5b55..fbe458af9b3 100644 --- a/.github/workflows/fftw.yml +++ b/.github/workflows/fftw.yml @@ -18,65 +18,57 @@ 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-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: [android-arm, android-arm64, android-x86, android-x86_64, linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, 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-x86_64, windows-x86, windows-x86_64] + needs: [android-arm64, android-x86_64, linux-arm64, linux-ppc64le, linux-x86_64, 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/gsl.yml b/.github/workflows/gsl.yml index bfc6459d118..91d2a9983bd 100644 --- a/.github/workflows/gsl.yml +++ b/.github/workflows/gsl.yml @@ -18,65 +18,57 @@ 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-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: [android-arm, android-arm64, android-x86, android-x86_64, linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, 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-x86_64, windows-x86, windows-x86_64] + needs: [android-arm64, android-x86_64, linux-arm64, linux-ppc64le, linux-x86_64, 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/nvcodec.yml b/.github/workflows/nvcodec.yml index cfd9f03d328..acf42d9b41d 100644 --- a/.github/workflows/nvcodec.yml +++ b/.github/workflows/nvcodec.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 windows-x86_64: runs-on: windows-2019 steps: diff --git a/.github/workflows/onnx.yml b/.github/workflows/onnx.yml index 65af0283db5..3def750ce8b 100644 --- a/.github/workflows/onnx.yml +++ b/.github/workflows/onnx.yml @@ -19,9 +19,8 @@ env: jobs: 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/onnxruntime.yml b/.github/workflows/onnxruntime.yml index b0b2a06beea..60c8f52e1d0 100644 --- a/.github/workflows/onnxruntime.yml +++ b/.github/workflows/onnxruntime.yml @@ -20,17 +20,15 @@ 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 strategy: matrix: ext: ["", -gpu] 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 # strategy: diff --git a/.github/workflows/pytorch.yml b/.github/workflows/pytorch.yml index 7abe47ec094..573f314d2f1 100644 --- a/.github/workflows/pytorch.yml +++ b/.github/workflows/pytorch.yml @@ -21,7 +21,6 @@ env: jobs: linux-x86_64: runs-on: ubuntu-20.04 - container: centos:7 strategy: matrix: ext: ["", -gpu] @@ -30,8 +29,8 @@ jobs: with: key: ${{ github.workflow }}-${{ github.job }}${{ matrix.ext }}@${{ github.run_id }}-${{ github.run_attempt }} restore-keys: ${{ github.workflow }}-${{ github.job }}${{ matrix.ext }}@ - path: /root/.ccache - - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions + path: /home/runner/.ccache + - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions timeout-minutes: 350 macosx-x86_64: runs-on: macos-11 diff --git a/.github/workflows/systems.yml b/.github/workflows/systems.yml index b0fc086e8af..b3d1b169339 100644 --- a/.github/workflows/systems.yml +++ b/.github/workflows/systems.yml @@ -17,45 +17,41 @@ env: CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }} STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }} jobs: - 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-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-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64] +# needs: [linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64] + needs: [linux-arm64, linux-ppc64le, linux-x86_64, 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/tensorflow-lite.yml b/.github/workflows/tensorflow-lite.yml index a4971df61a8..c71a7cb9cfc 100644 --- a/.github/workflows/tensorflow-lite.yml +++ b/.github/workflows/tensorflow-lite.yml @@ -17,46 +17,38 @@ 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-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: @@ -66,7 +58,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-x86, linux-x86_64, macosx-x86_64, windows-x86_64] +# needs: [android-arm, android-arm64, android-x86, android-x86_64, linux-armhf, linux-arm64, linux-x86, linux-x86_64, macosx-x86_64, windows-x86_64] + needs: [android-arm64, android-x86_64, linux-arm64, linux-x86_64, 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/tensorrt.yml b/.github/workflows/tensorrt.yml index 233d908ac47..b4b9ac6d4c5 100644 --- a/.github/workflows/tensorrt.yml +++ b/.github/workflows/tensorrt.yml @@ -20,14 +20,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 windows-x86_64: runs-on: windows-2019 steps: diff --git a/.github/workflows/tvm.yml b/.github/workflows/tvm.yml index 537b74dc8b4..bd7f8917f13 100644 --- a/.github/workflows/tvm.yml +++ b/.github/workflows/tvm.yml @@ -20,12 +20,11 @@ env: jobs: linux-x86_64: runs-on: ubuntu-20.04 - container: centos:7 strategy: matrix: ext: ["", -gpu] 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 # strategy: diff --git a/arpack-ng/platform/pom.xml b/arpack-ng/platform/pom.xml index 06eb2fd09b6..bdaa6abeb07 100644 --- a/arpack-ng/platform/pom.xml +++ b/arpack-ng/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ @@ -31,24 +31,24 @@ ${javacpp.moduleId} ${project.version} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.linux-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-armhf} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -67,12 +67,12 @@ ${project.version} ${javacpp.platform.macosx-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.windows-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -136,13 +136,13 @@ ${project.build.directory}/${project.artifactId}.jar module org.bytedeco.${javacpp.packageName}.platform { - requires static org.bytedeco.${javacpp.packageName}.linux.x86; +// requires static org.bytedeco.${javacpp.packageName}.linux.x86; requires static org.bytedeco.${javacpp.packageName}.linux.x86_64; - requires static org.bytedeco.${javacpp.packageName}.linux.armhf; +// requires static org.bytedeco.${javacpp.packageName}.linux.armhf; requires static org.bytedeco.${javacpp.packageName}.linux.arm64; requires static org.bytedeco.${javacpp.packageName}.linux.ppc64le; requires static org.bytedeco.${javacpp.packageName}.macosx.x86_64; - requires static org.bytedeco.${javacpp.packageName}.windows.x86; +// requires static org.bytedeco.${javacpp.packageName}.windows.x86; requires static org.bytedeco.${javacpp.packageName}.windows.x86_64; } diff --git a/arpack-ng/pom.xml b/arpack-ng/pom.xml index 40ae8c44b07..4aa0f634e83 100644 --- a/arpack-ng/pom.xml +++ b/arpack-ng/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco diff --git a/arpack-ng/samples/pom.xml b/arpack-ng/samples/pom.xml index 549147761de..03d3bafcd55 100644 --- a/arpack-ng/samples/pom.xml +++ b/arpack-ng/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.arpack icbarpackc - 1.5.9 + 1.5.10-SNAPSHOT IcbArpackC 1.7 @@ -12,7 +12,7 @@ org.bytedeco arpack-ng-platform - 3.9.0-1.5.9 + 3.9.0-1.5.10-SNAPSHOT diff --git a/bullet/platform/pom.xml b/bullet/platform/pom.xml index 5737cbf9593..9f430ed4217 100644 --- a/bullet/platform/pom.xml +++ b/bullet/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ @@ -30,36 +30,36 @@ ${javacpp.moduleId} ${project.version} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.android-arm} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.android-arm64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.android-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.android-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -72,12 +72,12 @@ ${project.version} ${javacpp.platform.macosx-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.windows-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -145,10 +145,10 @@ // requires static org.bytedeco.${javacpp.moduleId}.android.arm64; // requires static org.bytedeco.${javacpp.moduleId}.android.x86; // requires static org.bytedeco.${javacpp.moduleId}.android.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.linux.x86; +// requires static org.bytedeco.${javacpp.moduleId}.linux.x86; requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64; requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.windows.x86; +// requires static org.bytedeco.${javacpp.moduleId}.windows.x86; requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64; } diff --git a/bullet/pom.xml b/bullet/pom.xml index 8b994e10798..e586711764f 100644 --- a/bullet/pom.xml +++ b/bullet/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco diff --git a/bullet/samples/pom.xml b/bullet/samples/pom.xml index aa1e18a651f..b922e22b900 100644 --- a/bullet/samples/pom.xml +++ b/bullet/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.bullet samples - 1.5.9 + 1.5.10-SNAPSHOT SimpleBox 1.7 @@ -12,7 +12,7 @@ org.bytedeco bullet-platform - 3.25-1.5.9 + 3.25-1.5.10-SNAPSHOT diff --git a/cminpack/platform/pom.xml b/cminpack/platform/pom.xml index a58901fd697..6966667bc4d 100644 --- a/cminpack/platform/pom.xml +++ b/cminpack/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ @@ -30,24 +30,24 @@ ${javacpp.moduleId} ${project.version} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.linux-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-armhf} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -66,12 +66,12 @@ ${project.version} ${javacpp.platform.macosx-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.windows-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -135,13 +135,13 @@ ${project.build.directory}/${project.artifactId}.jar module org.bytedeco.${javacpp.moduleId}.platform { - requires static org.bytedeco.${javacpp.moduleId}.linux.x86; +// requires static org.bytedeco.${javacpp.moduleId}.linux.x86; requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; +// requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; requires static org.bytedeco.${javacpp.moduleId}.linux.arm64; requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le; requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.windows.x86; +// requires static org.bytedeco.${javacpp.moduleId}.windows.x86; requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64; } diff --git a/cminpack/pom.xml b/cminpack/pom.xml index 13d3351b5cd..b47b755aca7 100644 --- a/cminpack/pom.xml +++ b/cminpack/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco diff --git a/cminpack/samples/pom.xml b/cminpack/samples/pom.xml index 32f7c128f88..dd04fe37459 100644 --- a/cminpack/samples/pom.xml +++ b/cminpack/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.cminpack tlmdif1c - 1.5.9 + 1.5.10-SNAPSHOT Tlmdif1c 1.7 @@ -12,7 +12,7 @@ org.bytedeco cminpack-platform - 1.3.8-1.5.9 + 1.3.8-1.5.10-SNAPSHOT diff --git a/fftw/platform/pom.xml b/fftw/platform/pom.xml index 1e9119cbb89..0a9bf7949c7 100644 --- a/fftw/platform/pom.xml +++ b/fftw/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ @@ -30,48 +30,48 @@ ${javacpp.moduleId} ${project.version} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.android-arm} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.android-arm64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.android-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.android-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.linux-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-armhf} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -90,12 +90,12 @@ ${project.version} ${javacpp.platform.macosx-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.windows-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -163,13 +163,13 @@ // requires static org.bytedeco.${javacpp.moduleId}.android.arm64; // requires static org.bytedeco.${javacpp.moduleId}.android.x86; // requires static org.bytedeco.${javacpp.moduleId}.android.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.linux.x86; +// requires static org.bytedeco.${javacpp.moduleId}.linux.x86; requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; +// requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; requires static org.bytedeco.${javacpp.moduleId}.linux.arm64; requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le; requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.windows.x86; +// requires static org.bytedeco.${javacpp.moduleId}.windows.x86; requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64; } diff --git a/fftw/pom.xml b/fftw/pom.xml index 969233f4186..a0a71ac4a57 100644 --- a/fftw/pom.xml +++ b/fftw/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco diff --git a/fftw/samples/pom.xml b/fftw/samples/pom.xml index bd870f222ae..e1a63135699 100644 --- a/fftw/samples/pom.xml +++ b/fftw/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.fftw example - 1.5.9 + 1.5.10-SNAPSHOT Example 1.7 @@ -12,7 +12,7 @@ org.bytedeco fftw-platform - 3.3.10-1.5.9 + 3.3.10-1.5.10-SNAPSHOT diff --git a/gsl/platform/pom.xml b/gsl/platform/pom.xml index 6f3b1b04d63..17042de642f 100644 --- a/gsl/platform/pom.xml +++ b/gsl/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ @@ -30,48 +30,48 @@ ${javacpp.moduleId} ${project.version} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.android-arm} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.android-arm64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.android-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.android-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.linux-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-armhf} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -90,12 +90,12 @@ ${project.version} ${javacpp.platform.macosx-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.windows-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -163,13 +163,13 @@ // requires static org.bytedeco.${javacpp.moduleId}.android.arm64; // requires static org.bytedeco.${javacpp.moduleId}.android.x86; // requires static org.bytedeco.${javacpp.moduleId}.android.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.linux.x86; +// requires static org.bytedeco.${javacpp.moduleId}.linux.x86; requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; +// requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; requires static org.bytedeco.${javacpp.moduleId}.linux.arm64; requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le; requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.windows.x86; +// requires static org.bytedeco.${javacpp.moduleId}.windows.x86; requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64; } diff --git a/gsl/pom.xml b/gsl/pom.xml index b5a625e4671..039a8625ce4 100644 --- a/gsl/pom.xml +++ b/gsl/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco diff --git a/gsl/samples/pom.xml b/gsl/samples/pom.xml index 36ca452e567..7ba589dd5bf 100644 --- a/gsl/samples/pom.xml +++ b/gsl/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.gsl demo - 1.5.9 + 1.5.10-SNAPSHOT Demo 1.7 @@ -12,14 +12,14 @@ org.bytedeco gsl-platform - 2.7-1.5.9 + 2.7-1.5.10-SNAPSHOT org.bytedeco mkl-platform-redist - 2023.1-1.5.9 + 2023.1-1.5.10-SNAPSHOT diff --git a/nvcodec/platform/pom.xml b/nvcodec/platform/pom.xml index 4b68514b1b0..be98a7af91d 100644 --- a/nvcodec/platform/pom.xml +++ b/nvcodec/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ diff --git a/nvcodec/pom.xml b/nvcodec/pom.xml index 99cf4321bb9..6fd07306098 100644 --- a/nvcodec/pom.xml +++ b/nvcodec/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco diff --git a/nvcodec/samples/pom.xml b/nvcodec/samples/pom.xml index cac800663bd..fcc700a675a 100644 --- a/nvcodec/samples/pom.xml +++ b/nvcodec/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.nvcodec samplenvcodec - 1.5.9 + 1.5.10-SNAPSHOT 1.7 1.7 @@ -16,14 +16,14 @@ org.bytedeco nvcodec-platform - 12.1.14-1.5.9 + 12.1.14-1.5.10-SNAPSHOT org.bytedeco cuda-platform-redist - 12.1-8.9-1.5.9 + 12.1-8.9-1.5.10-SNAPSHOT diff --git a/nvcodec/samples/simple/pom.xml b/nvcodec/samples/simple/pom.xml index d87432675a3..41912e08d30 100644 --- a/nvcodec/samples/simple/pom.xml +++ b/nvcodec/samples/simple/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.nvcodec sampleencodedecode - 1.5.9 + 1.5.10-SNAPSHOT SampleEncodeDecode 1.7 @@ -12,14 +12,14 @@ org.bytedeco nvcodec-platform - 12.1.14-1.5.9 + 12.1.14-1.5.10-SNAPSHOT org.bytedeco cuda-platform-redist - 12.1-8.9-1.5.9 + 12.1-8.9-1.5.10-SNAPSHOT diff --git a/onnx/platform/pom.xml b/onnx/platform/pom.xml index 0a5ecd96756..f401e74f407 100644 --- a/onnx/platform/pom.xml +++ b/onnx/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ diff --git a/onnx/pom.xml b/onnx/pom.xml index d466cf3423e..b7b05893591 100644 --- a/onnx/pom.xml +++ b/onnx/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco diff --git a/onnx/samples/pom.xml b/onnx/samples/pom.xml index 5d7f3592ebb..dd870168a8e 100644 --- a/onnx/samples/pom.xml +++ b/onnx/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.onnx loadmodel - 1.5.9 + 1.5.10-SNAPSHOT LoadModel 1.7 @@ -12,7 +12,7 @@ org.bytedeco onnx-platform - 1.14.0-1.5.9 + 1.14.0-1.5.10-SNAPSHOT diff --git a/onnxruntime/platform/gpu/pom.xml b/onnxruntime/platform/gpu/pom.xml index d1f38776f2e..a1c982a386b 100644 --- a/onnxruntime/platform/gpu/pom.xml +++ b/onnxruntime/platform/gpu/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../../ diff --git a/onnxruntime/platform/pom.xml b/onnxruntime/platform/pom.xml index dd6efd9abe0..35995697cec 100644 --- a/onnxruntime/platform/pom.xml +++ b/onnxruntime/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ diff --git a/onnxruntime/pom.xml b/onnxruntime/pom.xml index 43e179c4255..eb74ce0626e 100644 --- a/onnxruntime/pom.xml +++ b/onnxruntime/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco diff --git a/onnxruntime/samples/pom.xml b/onnxruntime/samples/pom.xml index d56f712597d..31529884a3e 100644 --- a/onnxruntime/samples/pom.xml +++ b/onnxruntime/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.onnxruntime cxxapisample - 1.5.9 + 1.5.10-SNAPSHOT CXXApiSample 1.8 @@ -12,21 +12,21 @@ org.bytedeco onnxruntime-platform - 1.15.0-1.5.9 + 1.15.0-1.5.10-SNAPSHOT org.bytedeco onnxruntime-platform-gpu - 1.15.0-1.5.9 + 1.15.0-1.5.10-SNAPSHOT org.bytedeco cuda-platform-redist - 12.1-8.9-1.5.9 + 12.1-8.9-1.5.10-SNAPSHOT diff --git a/pytorch/cppbuild.sh b/pytorch/cppbuild.sh index f0f5e0ecf50..f7498fb9304 100755 --- a/pytorch/cppbuild.sh +++ b/pytorch/cppbuild.sh @@ -11,6 +11,11 @@ export BUILD_TEST=0 export CUDACXX="/usr/local/cuda/bin/nvcc" export CUDA_HOME="/usr/local/cuda" export CUDNN_HOME="/usr/local/cuda" +export NCCL_ROOT="/usr/local/cuda" +export NCCL_ROOT_DIR="/usr/local/cuda" +export NCCL_INCLUDE_DIR="/usr/local/cuda/include" +export NCCL_LIB_DIR="/usr/local/cuda/lib64" +export NCCL_VERSION="2" export MAX_JOBS=$MAKEJ export USE_CUDA=0 export USE_CUDNN=0 diff --git a/pytorch/platform/gpu/pom.xml b/pytorch/platform/gpu/pom.xml index 41f6ddec908..6122547a6a9 100644 --- a/pytorch/platform/gpu/pom.xml +++ b/pytorch/platform/gpu/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../../ diff --git a/pytorch/platform/pom.xml b/pytorch/platform/pom.xml index a300a337cca..83072671840 100644 --- a/pytorch/platform/pom.xml +++ b/pytorch/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ diff --git a/pytorch/pom.xml b/pytorch/pom.xml index 7e7099a6086..25b9249eb17 100644 --- a/pytorch/pom.xml +++ b/pytorch/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco diff --git a/pytorch/samples/pom.xml b/pytorch/samples/pom.xml index 1abc77102e6..840cfae6393 100644 --- a/pytorch/samples/pom.xml +++ b/pytorch/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.pytorch simplemnist - 1.5.9 + 1.5.10-SNAPSHOT SimpleMNIST 1.7 @@ -12,28 +12,28 @@ org.bytedeco pytorch-platform - 2.0.1-1.5.9 + 2.0.1-1.5.10-SNAPSHOT org.bytedeco pytorch-platform-gpu - 2.0.1-1.5.9 + 2.0.1-1.5.10-SNAPSHOT org.bytedeco cuda-platform-redist - 12.1-8.9-1.5.9 + 12.1-8.9-1.5.10-SNAPSHOT org.bytedeco mkl-platform-redist - 2023.1-1.5.9 + 2023.1-1.5.10-SNAPSHOT diff --git a/systems/platform/pom.xml b/systems/platform/pom.xml index 9f2212c60ae..13623b8c5d4 100644 --- a/systems/platform/pom.xml +++ b/systems/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ @@ -30,24 +30,24 @@ ${javacpp.moduleId} ${project.version} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.linux-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-armhf} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -66,12 +66,12 @@ ${project.version} ${javacpp.platform.macosx-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.windows-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -135,13 +135,13 @@ ${project.build.directory}/${project.artifactId}.jar module org.bytedeco.${javacpp.moduleId}.platform { - requires static org.bytedeco.${javacpp.moduleId}.linux.x86; +// requires static org.bytedeco.${javacpp.moduleId}.linux.x86; requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; +// requires static org.bytedeco.${javacpp.moduleId}.linux.armhf; requires static org.bytedeco.${javacpp.moduleId}.linux.arm64; requires static org.bytedeco.${javacpp.moduleId}.linux.ppc64le; requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64; - requires static org.bytedeco.${javacpp.moduleId}.windows.x86; +// requires static org.bytedeco.${javacpp.moduleId}.windows.x86; requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64; } diff --git a/systems/pom.xml b/systems/pom.xml index 1b56e00e0ab..cf342bd9be5 100644 --- a/systems/pom.xml +++ b/systems/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco diff --git a/systems/samples/pom.xml b/systems/samples/pom.xml index 519e2c3890e..c08f19daaf7 100644 --- a/systems/samples/pom.xml +++ b/systems/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.systems testavx - 1.5.9 + 1.5.10-SNAPSHOT TestAVX 1.7 @@ -12,7 +12,7 @@ org.bytedeco systems-platform - 1.5.9 + 1.5.10-SNAPSHOT diff --git a/systems/src/main/java/org/bytedeco/systems/presets/linux.java b/systems/src/main/java/org/bytedeco/systems/presets/linux.java index 523594e162f..598ee6951e1 100644 --- a/systems/src/main/java/org/bytedeco/systems/presets/linux.java +++ b/systems/src/main/java/org/bytedeco/systems/presets/linux.java @@ -148,7 +148,8 @@ public void map(InfoMap infoMap) { .put(new Info("_POSIX2_VERSION", "_POSIX2_C_BIND", "_POSIX2_C_DEV", "_POSIX2_SW_DEV", "_POSIX2_LOCALEDEF").cppTypes("long")) - .put(new Info("_POSIX2_C_VERSION").skip()) + .put(new Info("__glibc_reserved1", "__glibc_reserved2", "__glibc_reserved3", + "__glibc_reserved4", "__glibc_reserved5", "_POSIX2_C_VERSION").skip()) .put(new Info("__u16", "__uint16_t") .cast().valueTypes("short").pointerTypes("ShortPointer", "ShortBuffer", "short[]")) diff --git a/tensorflow-lite/platform/pom.xml b/tensorflow-lite/platform/pom.xml index e2c8a1bd942..8ea7dd3cc79 100644 --- a/tensorflow-lite/platform/pom.xml +++ b/tensorflow-lite/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ @@ -26,48 +26,48 @@ ${javacpp.moduleId} ${project.version} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.android-arm} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.android-arm64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.android-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.android-x86_64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-armhf} - + + + + + + ${project.groupId} ${javacpp.moduleId} ${project.version} ${javacpp.platform.linux-arm64} - - ${project.groupId} - ${javacpp.moduleId} - ${project.version} - ${javacpp.platform.linux-x86} - + + + + + + ${project.groupId} ${javacpp.moduleId} @@ -147,9 +147,9 @@ // requires static org.bytedeco.${javacpp.moduleId}.android.arm64; // requires static org.bytedeco.${javacpp.moduleId}.android.x86; // requires static org.bytedeco.${javacpp.moduleId}.android.x86_64; - requires static org.bytedeco.${javacpp.packageName}.linux.armhf; +// requires static org.bytedeco.${javacpp.packageName}.linux.armhf; requires static org.bytedeco.${javacpp.packageName}.linux.arm64; - requires static org.bytedeco.${javacpp.packageName}.linux.x86; +// requires static org.bytedeco.${javacpp.packageName}.linux.x86; requires static org.bytedeco.${javacpp.packageName}.linux.x86_64; requires static org.bytedeco.${javacpp.packageName}.macosx.x86_64; requires static org.bytedeco.${javacpp.packageName}.windows.x86_64; diff --git a/tensorflow-lite/pom.xml b/tensorflow-lite/pom.xml index d7c050f12db..419ae15cee3 100644 --- a/tensorflow-lite/pom.xml +++ b/tensorflow-lite/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco diff --git a/tensorflow-lite/samples/pom.xml b/tensorflow-lite/samples/pom.xml index f3abca49adc..00499b927f9 100644 --- a/tensorflow-lite/samples/pom.xml +++ b/tensorflow-lite/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.tensorflow-lite examples - 1.5.9 + 1.5.10-SNAPSHOT Minimal 1.7 @@ -12,7 +12,7 @@ org.bytedeco tensorflow-lite-platform - 2.12.0-1.5.9 + 2.12.0-1.5.10-SNAPSHOT diff --git a/tensorrt/platform/pom.xml b/tensorrt/platform/pom.xml index a0742bc9d98..cad8954bb1f 100644 --- a/tensorrt/platform/pom.xml +++ b/tensorrt/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ diff --git a/tensorrt/platform/redist/pom.xml b/tensorrt/platform/redist/pom.xml index 4d27d4f34e4..0f5c3343a75 100644 --- a/tensorrt/platform/redist/pom.xml +++ b/tensorrt/platform/redist/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../../ diff --git a/tensorrt/pom.xml b/tensorrt/pom.xml index 7cc60c97156..48449f50835 100644 --- a/tensorrt/pom.xml +++ b/tensorrt/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco diff --git a/tensorrt/samples/pom.xml b/tensorrt/samples/pom.xml index 41111cc0680..b04e42c6804 100644 --- a/tensorrt/samples/pom.xml +++ b/tensorrt/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.tensorrt samplegooglenet - 1.5.9 + 1.5.10-SNAPSHOT SampleGoogleNet 1.7 @@ -12,19 +12,19 @@ org.bytedeco tensorrt-platform - 8.6-1.5.9 + 8.6-1.5.10-SNAPSHOT org.bytedeco cuda-platform-redist - 12.1-8.9-1.5.9 + 12.1-8.9-1.5.10-SNAPSHOT org.bytedeco tensorrt-platform-redist - 8.6-1.5.9 + 8.6-1.5.10-SNAPSHOT diff --git a/tvm/platform/gpu/pom.xml b/tvm/platform/gpu/pom.xml index f4982531066..0e68adc7c42 100644 --- a/tvm/platform/gpu/pom.xml +++ b/tvm/platform/gpu/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../../ diff --git a/tvm/platform/pom.xml b/tvm/platform/pom.xml index bd179a9fbcb..b87afb77ba8 100644 --- a/tvm/platform/pom.xml +++ b/tvm/platform/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT ../../ diff --git a/tvm/pom.xml b/tvm/pom.xml index 7c51dcd0207..a4446c5af60 100644 --- a/tvm/pom.xml +++ b/tvm/pom.xml @@ -6,7 +6,7 @@ org.bytedeco javacpp-presets - 1.5.9 + 1.5.10-SNAPSHOT org.bytedeco diff --git a/tvm/samples/pom.xml b/tvm/samples/pom.xml index 9afeb3431f4..eded882c3a3 100644 --- a/tvm/samples/pom.xml +++ b/tvm/samples/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bytedeco.tvm howtodeploy - 1.5.9 + 1.5.10-SNAPSHOT HowtoDeploy 1.7 @@ -12,28 +12,28 @@ org.bytedeco tvm-platform - 0.12.0-1.5.9 + 0.12.0-1.5.10-SNAPSHOT org.bytedeco tvm-platform-gpu - 0.12.0-1.5.9 + 0.12.0-1.5.10-SNAPSHOT org.bytedeco cuda-platform-redist - 12.1-8.9-1.5.9 + 12.1-8.9-1.5.10-SNAPSHOT org.bytedeco mkl-platform-redist - 2023.1-1.5.9 + 2023.1-1.5.10-SNAPSHOT