diff --git a/.github/actions/deploy-macosx/action.yml b/.github/actions/deploy-macosx/action.yml index 4b0334c5762..6d46264e602 100644 --- a/.github/actions/deploy-macosx/action.yml +++ b/.github/actions/deploy-macosx/action.yml @@ -11,8 +11,8 @@ runs: echo "hash_dir = false" >> .ccache/ccache.conf echo "sloppiness = file_macro,include_file_ctime,include_file_mtime,pch_defines,time_macros" >> .ccache/ccache.conf - export MACOSX_DEPLOYMENT_TARGET=10.15 - echo "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET" >> $GITHUB_ENV + # export MACOSX_DEPLOYMENT_TARGET=10.15 + # echo "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET" >> $GITHUB_ENV echo Removing broken stuff from Mono sudo rm -Rf /Library/Frameworks/Mono.framework @@ -22,7 +22,7 @@ runs: sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/MacOSX10* fi - brew uninstall --force gcc gcc@7 gcc@8 gcc@9 gcc@10 gcc@11 gcc@12 maven + brew uninstall --force --ignore-dependencies gcc gcc@7 gcc@8 gcc@9 gcc@10 gcc@11 gcc@12 maven openblas r brew install boost ccache swig autoconf-archive automake cmake libomp libtool libusb ant nasm xz pkg-config sdl2 gpg1 bison flex perl ragel binutils gradle gmp isl libmpc mpfr geoip pcre ssdeep yajl if [[ -n ${CI_DEPLOY_NEED_GCC:-} ]]; then diff --git a/.github/workflows/ale.yml b/.github/workflows/ale.yml index e06b649338d..9ff9538700b 100644 --- a/.github/workflows/ale.yml +++ b/.github/workflows/ale.yml @@ -26,7 +26,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: diff --git a/.github/workflows/arpack-ng.yml b/.github/workflows/arpack-ng.yml index 544baa228f5..4f2298daf29 100644 --- a/.github/workflows/arpack-ng.yml +++ b/.github/workflows/arpack-ng.yml @@ -42,7 +42,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: diff --git a/.github/workflows/arrow.yml b/.github/workflows/arrow.yml index df8dbf26cf8..d4786451b29 100644 --- a/.github/workflows/arrow.yml +++ b/.github/workflows/arrow.yml @@ -21,7 +21,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86_64: diff --git a/.github/workflows/artoolkitplus.yml b/.github/workflows/artoolkitplus.yml index a0afe96aa85..d2d5675ff05 100644 --- a/.github/workflows/artoolkitplus.yml +++ b/.github/workflows/artoolkitplus.yml @@ -61,7 +61,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: diff --git a/.github/workflows/bullet.yml b/.github/workflows/bullet.yml index 4c5d32223cd..4003268582c 100644 --- a/.github/workflows/bullet.yml +++ b/.github/workflows/bullet.yml @@ -46,7 +46,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: diff --git a/.github/workflows/caffe.yml b/.github/workflows/caffe.yml index deaeee7efc8..dcb7949e6ca 100644 --- a/.github/workflows/caffe.yml +++ b/.github/workflows/caffe.yml @@ -30,7 +30,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 # strategy: # matrix: # ext: ["", -gpu] diff --git a/.github/workflows/chilitags.yml b/.github/workflows/chilitags.yml index f7a328d2c74..7e2e621c8ae 100644 --- a/.github/workflows/chilitags.yml +++ b/.github/workflows/chilitags.yml @@ -61,7 +61,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: diff --git a/.github/workflows/cminpack.yml b/.github/workflows/cminpack.yml index 5b317d1f482..a8592ace917 100644 --- a/.github/workflows/cminpack.yml +++ b/.github/workflows/cminpack.yml @@ -42,7 +42,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: diff --git a/.github/workflows/cpu_features.yml b/.github/workflows/cpu_features.yml index 985f6a4b3b1..5fe064079c8 100644 --- a/.github/workflows/cpu_features.yml +++ b/.github/workflows/cpu_features.yml @@ -61,7 +61,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: diff --git a/.github/workflows/cpython.yml b/.github/workflows/cpython.yml index 4bd92c02fc0..90fe387879f 100644 --- a/.github/workflows/cpython.yml +++ b/.github/workflows/cpython.yml @@ -41,7 +41,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml index 0472e964701..c927f7a9dd7 100644 --- a/.github/workflows/cuda.yml +++ b/.github/workflows/cuda.yml @@ -32,7 +32,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions # macosx-x86_64: -# runs-on: macos-10.15 +# runs-on: macos-11 # steps: # - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86_64: diff --git a/.github/workflows/depthai.yml b/.github/workflows/depthai.yml index ded412458da..f5baac6bbab 100644 --- a/.github/workflows/depthai.yml +++ b/.github/workflows/depthai.yml @@ -36,7 +36,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions redeploy: diff --git a/.github/workflows/dnnl.yml b/.github/workflows/dnnl.yml index 1749ae7fc55..bf0eaa9040e 100644 --- a/.github/workflows/dnnl.yml +++ b/.github/workflows/dnnl.yml @@ -26,7 +26,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86_64: diff --git a/.github/workflows/ffmpeg.yml b/.github/workflows/ffmpeg.yml index 892c03a0e7d..ccc649238db 100644 --- a/.github/workflows/ffmpeg.yml +++ b/.github/workflows/ffmpeg.yml @@ -89,14 +89,14 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-arm64: - runs-on: macos-10.15 + runs-on: macos-11 strategy: matrix: ext: ["", -gpl] steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 strategy: matrix: ext: ["", -gpl] diff --git a/.github/workflows/fftw.yml b/.github/workflows/fftw.yml index 3b24bb2000a..db847128385 100644 --- a/.github/workflows/fftw.yml +++ b/.github/workflows/fftw.yml @@ -61,7 +61,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: diff --git a/.github/workflows/flandmark.yml b/.github/workflows/flandmark.yml index 5ff850fb95a..6805ff33ca9 100644 --- a/.github/workflows/flandmark.yml +++ b/.github/workflows/flandmark.yml @@ -61,7 +61,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: diff --git a/.github/workflows/gsl.yml b/.github/workflows/gsl.yml index 681192c063e..8e199635db4 100644 --- a/.github/workflows/gsl.yml +++ b/.github/workflows/gsl.yml @@ -61,7 +61,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: diff --git a/.github/workflows/hdf5.yml b/.github/workflows/hdf5.yml index 88a83bf514f..17b78774cbf 100644 --- a/.github/workflows/hdf5.yml +++ b/.github/workflows/hdf5.yml @@ -41,7 +41,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: diff --git a/.github/workflows/hyperscan.yml b/.github/workflows/hyperscan.yml index 2647ed00fbb..dc2e45054fe 100644 --- a/.github/workflows/hyperscan.yml +++ b/.github/workflows/hyperscan.yml @@ -21,7 +21,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86_64: diff --git a/.github/workflows/leptonica.yml b/.github/workflows/leptonica.yml index 7a9c2f910cf..96ed8b0b39a 100644 --- a/.github/workflows/leptonica.yml +++ b/.github/workflows/leptonica.yml @@ -61,11 +61,11 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-arm64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: diff --git a/.github/workflows/libdc1394.yml b/.github/workflows/libdc1394.yml index 5c4f97cceb6..caef0265d31 100644 --- a/.github/workflows/libdc1394.yml +++ b/.github/workflows/libdc1394.yml @@ -41,7 +41,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: diff --git a/.github/workflows/libffi.yml b/.github/workflows/libffi.yml index 422e1ebe9d8..49b400ce865 100644 --- a/.github/workflows/libffi.yml +++ b/.github/workflows/libffi.yml @@ -61,11 +61,11 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-arm64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: diff --git a/.github/workflows/libfreenect.yml b/.github/workflows/libfreenect.yml index e1678354250..10b5fcd3f00 100644 --- a/.github/workflows/libfreenect.yml +++ b/.github/workflows/libfreenect.yml @@ -41,7 +41,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: diff --git a/.github/workflows/libfreenect2.yml b/.github/workflows/libfreenect2.yml index 3537204b132..a872b5a5ba3 100644 --- a/.github/workflows/libfreenect2.yml +++ b/.github/workflows/libfreenect2.yml @@ -26,7 +26,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86_64: diff --git a/.github/workflows/libpostal.yml b/.github/workflows/libpostal.yml index 5b5045d23e3..f9c119b8529 100644 --- a/.github/workflows/libpostal.yml +++ b/.github/workflows/libpostal.yml @@ -26,7 +26,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86_64: diff --git a/.github/workflows/librealsense.yml b/.github/workflows/librealsense.yml index 125e88a5a38..d85d4705cd6 100644 --- a/.github/workflows/librealsense.yml +++ b/.github/workflows/librealsense.yml @@ -36,7 +36,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: diff --git a/.github/workflows/librealsense2.yml b/.github/workflows/librealsense2.yml index bb586c7d4ce..c4fc25c39ca 100644 --- a/.github/workflows/librealsense2.yml +++ b/.github/workflows/librealsense2.yml @@ -36,7 +36,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: diff --git a/.github/workflows/liquidfun.yml b/.github/workflows/liquidfun.yml index deb2ae5fc58..5e4a1de7429 100644 --- a/.github/workflows/liquidfun.yml +++ b/.github/workflows/liquidfun.yml @@ -26,7 +26,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: diff --git a/.github/workflows/llvm.yml b/.github/workflows/llvm.yml index a7439d056ef..17ea9ce86f2 100644 --- a/.github/workflows/llvm.yml +++ b/.github/workflows/llvm.yml @@ -41,11 +41,11 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-arm64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: @@ -69,7 +69,7 @@ jobs: needs: redeploy strategy: matrix: - os: [ubuntu-18.04, macos-10.15, windows-2019] + os: [ubuntu-18.04, macos-11, windows-2019] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/lz4.yml b/.github/workflows/lz4.yml index 79faeff0c60..540af408e5f 100644 --- a/.github/workflows/lz4.yml +++ b/.github/workflows/lz4.yml @@ -26,7 +26,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: diff --git a/.github/workflows/mkl-dnn.yml b/.github/workflows/mkl-dnn.yml index 1c66a5096ad..dabf0629b3f 100644 --- a/.github/workflows/mkl-dnn.yml +++ b/.github/workflows/mkl-dnn.yml @@ -22,7 +22,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86_64: diff --git a/.github/workflows/mkl.yml b/.github/workflows/mkl.yml index 153b7bdc659..9db2d7fcaf8 100644 --- a/.github/workflows/mkl.yml +++ b/.github/workflows/mkl.yml @@ -26,7 +26,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: diff --git a/.github/workflows/modsecurity.yml b/.github/workflows/modsecurity.yml index c4bf936ce31..5cfacf9a181 100644 --- a/.github/workflows/modsecurity.yml +++ b/.github/workflows/modsecurity.yml @@ -21,7 +21,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions redeploy: diff --git a/.github/workflows/mxnet.yml b/.github/workflows/mxnet.yml index 7ab760644cd..d6e95f1abb5 100644 --- a/.github/workflows/mxnet.yml +++ b/.github/workflows/mxnet.yml @@ -31,7 +31,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 # strategy: # fail-fast: false # matrix: diff --git a/.github/workflows/ngraph.yml b/.github/workflows/ngraph.yml index 5cc2a55350c..7aec94822e2 100644 --- a/.github/workflows/ngraph.yml +++ b/.github/workflows/ngraph.yml @@ -21,7 +21,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions redeploy: diff --git a/.github/workflows/numpy.yml b/.github/workflows/numpy.yml index b7c1cbdf7fd..77583b377b9 100644 --- a/.github/workflows/numpy.yml +++ b/.github/workflows/numpy.yml @@ -42,7 +42,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: diff --git a/.github/workflows/onnx.yml b/.github/workflows/onnx.yml index 5d5210f75bb..57d7d65351c 100644 --- a/.github/workflows/onnx.yml +++ b/.github/workflows/onnx.yml @@ -21,7 +21,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86_64: diff --git a/.github/workflows/onnxruntime.yml b/.github/workflows/onnxruntime.yml index e24c3cdd0ae..c4ff2706d86 100644 --- a/.github/workflows/onnxruntime.yml +++ b/.github/workflows/onnxruntime.yml @@ -30,7 +30,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 # strategy: # matrix: # ext: ["", -gpu] diff --git a/.github/workflows/openblas.yml b/.github/workflows/openblas.yml index d884bb00b1b..fe483eebd75 100644 --- a/.github/workflows/openblas.yml +++ b/.github/workflows/openblas.yml @@ -37,11 +37,11 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions ios-arm64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions ios-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions linux-armhf: @@ -70,11 +70,11 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-arm64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: diff --git a/.github/workflows/opencl.yml b/.github/workflows/opencl.yml index bbaca2f6e4d..c06d3fe5ce5 100644 --- a/.github/workflows/opencl.yml +++ b/.github/workflows/opencl.yml @@ -26,7 +26,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86_64: diff --git a/.github/workflows/opencv.yml b/.github/workflows/opencv.yml index 641bd5eef27..efb82ceeaae 100644 --- a/.github/workflows/opencv.yml +++ b/.github/workflows/opencv.yml @@ -37,11 +37,11 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions ios-arm64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions ios-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions linux-armhf: @@ -73,11 +73,11 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-arm64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: diff --git a/.github/workflows/openpose.yml b/.github/workflows/openpose.yml index fdd87164deb..1d8590f1e66 100644 --- a/.github/workflows/openpose.yml +++ b/.github/workflows/openpose.yml @@ -21,7 +21,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions redeploy: diff --git a/.github/workflows/pytorch.yml b/.github/workflows/pytorch.yml index 040ab2503ee..0522f2c6145 100644 --- a/.github/workflows/pytorch.yml +++ b/.github/workflows/pytorch.yml @@ -32,7 +32,7 @@ jobs: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions timeout-minutes: 350 macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 # strategy: # matrix: # ext: ["", -gpu] diff --git a/.github/workflows/qt.yml b/.github/workflows/qt.yml index a4c93108508..2c267d1ae6b 100644 --- a/.github/workflows/qt.yml +++ b/.github/workflows/qt.yml @@ -21,7 +21,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86_64: diff --git a/.github/workflows/scipy.yml b/.github/workflows/scipy.yml index 5fc42d2a495..9acd9d8c488 100644 --- a/.github/workflows/scipy.yml +++ b/.github/workflows/scipy.yml @@ -42,7 +42,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: diff --git a/.github/workflows/skia.yml b/.github/workflows/skia.yml index d38db5b7bf3..9e0485c904a 100644 --- a/.github/workflows/skia.yml +++ b/.github/workflows/skia.yml @@ -16,11 +16,11 @@ env: STAGING_REPOSITORY: ${{ secrets.STAGING_REPOSITORY }} jobs: ios-arm64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions ios-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions linux-x86: @@ -34,7 +34,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions redeploy: diff --git a/.github/workflows/systems.yml b/.github/workflows/systems.yml index 48983690a15..212d6d300f2 100644 --- a/.github/workflows/systems.yml +++ b/.github/workflows/systems.yml @@ -41,7 +41,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: diff --git a/.github/workflows/tensorflow-lite.yml b/.github/workflows/tensorflow-lite.yml index c0417f01784..ef8ffa51d5b 100644 --- a/.github/workflows/tensorflow-lite.yml +++ b/.github/workflows/tensorflow-lite.yml @@ -46,7 +46,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86_64: diff --git a/.github/workflows/tensorflow.yml b/.github/workflows/tensorflow.yml index 0027ced7fe7..cc6f3ee6ac4 100644 --- a/.github/workflows/tensorflow.yml +++ b/.github/workflows/tensorflow.yml @@ -52,7 +52,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 # strategy: # matrix: # ext: ["", -gpu, -python, -python-gpu] diff --git a/.github/workflows/tesseract.yml b/.github/workflows/tesseract.yml index f2813cfcde4..3de44419403 100644 --- a/.github/workflows/tesseract.yml +++ b/.github/workflows/tesseract.yml @@ -61,11 +61,11 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-arm64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: diff --git a/.github/workflows/tvm.yml b/.github/workflows/tvm.yml index 01870ed5c5f..a8300490a6c 100644 --- a/.github/workflows/tvm.yml +++ b/.github/workflows/tvm.yml @@ -25,7 +25,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-centos@actions macosx-x86_64: - runs-on: macos-10.15 + runs-on: macos-11 # strategy: # matrix: # ext: ["", -gpu] diff --git a/leptonica/LICENSE.openjpeg b/leptonica/LICENSE.openjpeg new file mode 100644 index 00000000000..e8fa41040df --- /dev/null +++ b/leptonica/LICENSE.openjpeg @@ -0,0 +1,39 @@ +/* + * The copyright in this software is being made available under the 2-clauses + * BSD License, included below. This software may be subject to other third + * party and contributor rights, including patent rights, and no such rights + * are granted under this license. + * + * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2014, Professor Benoit Macq + * Copyright (c) 2003-2014, Antonin Descampe + * Copyright (c) 2003-2009, Francois-Olivier Devaux + * Copyright (c) 2005, Herve Drolon, FreeImage Team + * Copyright (c) 2002-2003, Yannick Verschueren + * Copyright (c) 2001-2003, David Janssens + * Copyright (c) 2011-2012, Centre National d'Etudes Spatiales (CNES), France + * Copyright (c) 2012, CS Systemes d'Information, France + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ diff --git a/ngraph/cppbuild.sh b/ngraph/cppbuild.sh index da4138f536c..adf328b6b96 100755 --- a/ngraph/cppbuild.sh +++ b/ngraph/cppbuild.sh @@ -28,8 +28,8 @@ tar --totals -xf ../ngraph-$NGRAPH.tar.gz export LIBRARY_PATH="$INSTALL_PATH/lib" export PATH="$PATH:$INSTALL_PATH/bin" -export CFLAGS="-I$INSTALL_PATH/include" -export CXXFLAGS="-I$INSTALL_PATH/include" +export CFLAGS="-I$INSTALL_PATH/include -Wno-error -Wno-non-c-typedef-for-linkage" +export CXXFLAGS="-I$INSTALL_PATH/include -Wno-error -Wno-non-c-typedef-for-linkage" cd ncurses-$NCURSES ./configure "--prefix=$INSTALL_PATH" "--with-shared" CFLAGS=-fPIC CXXFLAGS=-fPIC @@ -42,6 +42,8 @@ ln -sf libncurses.so.6 ../lib/libtinfo.so cd ../ngraph-$NGRAPH patch -Np1 < ../../../ngraph.patch +sedinplace '/VERSION.in/d' CMakeLists.txt +sedinplace '/\/VERSION/d' src/ngraph/CMakeLists.txt sedinplace '/In-source builds are not allowed/d' CMakeLists.txt sedinplace 's/set(NGRAPH_FORWARD_CMAKE_ARGS/set(NGRAPH_FORWARD_CMAKE_ARGS -DCMAKE_INSTALL_LIBDIR=lib/g' CMakeLists.txt sedinplace 's/"-DARCH_OPT_FLAGS=.*/"-DARCH_OPT_FLAGS=-Wno-error"/g' cmake/external_mkldnn.cmake cmake/external_mkldnn_v1.cmake diff --git a/ngraph/src/main/java/org/bytedeco/ngraph/presets/ngraph.java b/ngraph/src/main/java/org/bytedeco/ngraph/presets/ngraph.java index bb58fe3e27a..bc69df4bdbe 100644 --- a/ngraph/src/main/java/org/bytedeco/ngraph/presets/ngraph.java +++ b/ngraph/src/main/java/org/bytedeco/ngraph/presets/ngraph.java @@ -102,7 +102,7 @@ public void map(InfoMap infoMap) { + "import org.bytedeco.ngraph.Function;")) // .put(new Info("string", "std::string").annotations("@StdString").valueTypes("BytePointer", "String").pointerTypes("@Cast({\"char*\", \"std::string*\"}) BytePointer")) .put(new Info("onnxBackendID").valueTypes("onnxBackendID").pointerTypes("@ByPtrPtr onnxBackendID", "@Cast(\"onnxBackendID*\") onnxBackendID")) - .put(new Info("ngraph::runtime::cpu::CPU_Backend::Property").cast().valueTypes("int")) + .put(new Info("int32_t", "onnxEventState", "onnxStatus", "ngraph::runtime::cpu::CPU_Backend::Property").cast().valueTypes("int").pointerTypes("IntPointer", "IntBuffer", "int[]")) .put(new Info("ngraph::element::Type_t::boolean").javaNames("boolean_type")) .put(new Info("ngraph::descriptor::Tensor").purify(true).pointerTypes("DescriptorTensor")) .put(new Info("std::shared_ptr", "std::shared_ptr").annotations("@SharedPtr").pointerTypes("DescriptorTensor")) diff --git a/numpy/cppbuild.sh b/numpy/cppbuild.sh index 8bee6913318..7be18547dbc 100755 --- a/numpy/cppbuild.sh +++ b/numpy/cppbuild.sh @@ -78,11 +78,12 @@ fi export PYTHONPATH="$PYTHON_INSTALL_PATH" mkdir -p "$PYTHON_INSTALL_PATH" -if ! $PYTHON_BIN_PATH -m pip install --target=$PYTHON_LIB_PATH cython==0.29.30; then +TOOLS="setuptools==59.1.0 cython==0.29.30" +if ! $PYTHON_BIN_PATH -m pip install --target=$PYTHON_LIB_PATH $TOOLS; then echo "extra_link_args = -lgfortran" >> site.cfg chmod +x "$CPYTHON_HOST_PATH/bin/python3.10" export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$CPYTHON_HOST_PATH/lib/:$CPYTHON_HOST_PATH" - "$CPYTHON_HOST_PATH/bin/python3.10" -m pip install --target="$CPYTHON_HOST_PATH/lib/python3.10/" crossenv==1.0 cython==0.29.30 + "$CPYTHON_HOST_PATH/bin/python3.10" -m pip install --target="$CPYTHON_HOST_PATH/lib/python3.10/" crossenv==1.0 $TOOLS "$CPYTHON_HOST_PATH/bin/python3.10" -m crossenv "$PYTHON_BIN_PATH" crossenv source crossenv/bin/activate cross-expose cython diff --git a/qt/cppbuild.sh b/qt/cppbuild.sh index f3386646b75..74fcbf4fb62 100755 --- a/qt/cppbuild.sh +++ b/qt/cppbuild.sh @@ -18,6 +18,8 @@ tar --totals -xf ../qt-$QT_VERSION.tar.xz cd qt-everywhere-src-$QT_VERSION +patch -Np1 < ../../../qt.patch + # remove stuff not actually available on most Macs sedinplace '/kTLSProtocol13/d' qtbase/src/network/ssl/qsslsocket_mac.cpp sedinplace '/backtrace_from_fp/d' qtbase/src/corelib/kernel/qcore_mac.mm diff --git a/qt/qt.patch b/qt/qt.patch new file mode 100644 index 00000000000..a3b77414718 --- /dev/null +++ b/qt/qt.patch @@ -0,0 +1,9 @@ +--- qt-everywhere-src-5.15.2/qtbase/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h.orig 2021-10-29 08:04:29.000000000 -0400 ++++ qt-everywhere-src-5.15.2/qtbase/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h 2021-10-29 08:05:13.000000000 -0400 +@@ -40,6 +40,7 @@ + #ifndef QIOSURFACEGRAPHICSBUFFER_H + #define QIOSURFACEGRAPHICSBUFFER_H + ++#include + #include + #include diff --git a/systems/pom.xml b/systems/pom.xml index 03f354abd2b..faecbf284b7 100644 --- a/systems/pom.xml +++ b/systems/pom.xml @@ -34,13 +34,13 @@ javacpp - ${basedir}/cppbuild/${javacpp.platform}/ - ${basedir}/cppbuild/${javacpp.platform}/include/ ${basedir}/cppbuild/${javacpp.platform}/arm-linux-gnueabihf/ ${basedir}/cppbuild/${javacpp.platform}/aarch64-linux-gnu/ ${basedir}/cppbuild/${javacpp.platform}/powerpc64le-linux-gnu/ ${basedir}/cppbuild/${javacpp.platform}/i386-linux-gnu/ ${basedir}/cppbuild/${javacpp.platform}/x86_64-linux-gnu/ + ${basedir}/cppbuild/${javacpp.platform}/include/ + ${basedir}/cppbuild/${javacpp.platform}/ ${basedir}/target/classes/org/bytedeco/systems/include/ diff --git a/tesseract/cppbuild.sh b/tesseract/cppbuild.sh index 0a8804b1ceb..11aee4ee760 100755 --- a/tesseract/cppbuild.sh +++ b/tesseract/cppbuild.sh @@ -17,6 +17,10 @@ echo "Decompressing archives..." tar --totals -xzf ../tesseract-$TESSERACT_VERSION.tar.gz cd tesseract-$TESSERACT_VERSION +# Fix build on Mac +mv VERSION VERSION.txt +sedinplace 's/"VERSION"/"VERSION.txt"/g' CMakeLists.txt + # Disable external dependencies on asciidoc, libarchive and libtiff sedinplace '/NdkCompat/d' CMakeLists.txt sedinplace '/ndk_compat/d' CMakeLists.txt