diff --git a/.github/workflows/PR-5.x-U20.yaml b/.github/workflows/PR-5.x-U20.yaml deleted file mode 100644 index 596bdbc633..0000000000 --- a/.github/workflows/PR-5.x-U20.yaml +++ /dev/null @@ -1,171 +0,0 @@ -name: PR:5.x U20 - -on: - pull_request: - branches: - - 5.x - -env: - EXTRA_CMAKE_OPTIONS: '-DBUILD_DOCS=ON -DPYTHON_DEFAULT_EXECUTABLE=/usr/bin/python3 -DBUILD_EXAMPLES=ON -DOPENCV_ENABLE_NONFREE=ON -DENABLE_CCACHE=OFF' - OPENCV_TEST_DATA_PATH: '/opencv_extra/testdata' - OPENCV_DOCKER_WORKDIR: '/__w/opencv/opencv' - PR_AUTHOR: ${{ github.event.pull_request.user.login }} - SOURCE_BRANCH_NAME: ${{ github.head_ref }} - TARGET_BRANCH_NAME: ${{ github.base_ref }} - ANT_HOME: '/usr/share/ant' - PYTHONPATH: /opencv-build/python_loader:$PYTHONPATH - -jobs: - BuildAndTest: - runs-on: ubuntu-20.04 - defaults: - run: - shell: bash - container: - image: quay.io/asenyaev/opencv-ubuntu:20.04 - steps: - - name: PR info - run: | - echo "PR Author: ${{ env.PR_AUTHOR }}" - echo "Source branch name: ${{ env.SOURCE_BRANCH_NAME }}" - echo "Target branch name: ${{ env.TARGET_BRANCH_NAME }}" - - name: Clean - run: find . -mindepth 1 -delete - - name: Fetch opencv - uses: actions/checkout@v3 - with: - repository: opencv/opencv - ref: ${{ env.TARGET_BRANCH_NAME }} - fetch-depth: 0 - - name: Merge opencv with ${{ env.SOURCE_BRANCH_NAME }} branch - run: | - cd ${{ env.OPENCV_DOCKER_WORKDIR }} - git config --global --add safe.directory ${{ env.OPENCV_DOCKER_WORKDIR }} - git config user.email "opencv.ci" - git config user.name "opencv.ci" - git pull -v "https://github.com/${{ env.PR_AUTHOR }}/opencv" "${{ env.SOURCE_BRANCH_NAME }}" - - name: Clone opencv_extra - run: git clone --single-branch --branch ${{ env.TARGET_BRANCH_NAME }} --depth 1 https://github.com/opencv/opencv_extra.git /opencv_extra - - name: Configure OpenCV - run: | - cd /opencv-build - cmake -G Ninja ${{ env.EXTRA_CMAKE_OPTIONS }} ${{ env.OPENCV_DOCKER_WORKDIR }} - - name: Build OpenCV - run: | - cd /opencv-build - ninja - - name: Accuracy:3d - run: cd /opencv-build && xvfb-run -a bin/opencv_test_3d - - name: Accuracy:calib - run: cd /opencv-build && xvfb-run -a bin/opencv_test_calib - - name: Accuracy:core - run: cd /opencv-build && xvfb-run -a bin/opencv_test_core - - name: Accuracy:dnn - run: cd /opencv-build && xvfb-run -a bin/opencv_test_dnn - - name: Accuracy:features2d - run: cd /opencv-build && xvfb-run -a bin/opencv_test_features2d - - name: Accuracy:flann - run: cd /opencv-build && xvfb-run -a bin/opencv_test_flann - - name: Accuracy:gapi - run: cd /opencv-build && xvfb-run -a bin/opencv_test_gapi - - name: Accuracy:highgui - run: cd /opencv-build && xvfb-run -a bin/opencv_test_highgui - - name: Accuracy:imgcodecs - run: cd /opencv-build && xvfb-run -a bin/opencv_test_imgcodecs - - name: Accuracy:imgproc - run: cd /opencv-build && xvfb-run -a bin/opencv_test_imgproc - - name: Accuracy:ml - run: cd /opencv-build && xvfb-run -a bin/opencv_test_ml - - name: Accuracy:objdetect - run: cd /opencv-build && xvfb-run -a bin/opencv_test_objdetect - - name: Accuracy:photo - run: cd /opencv-build && xvfb-run -a bin/opencv_test_photo - - name: Accuracy:stereo - run: cd /opencv-build && xvfb-run -a bin/opencv_test_stereo - - name: Accuracy:stitching - run: cd /opencv-build && xvfb-run -a bin/opencv_test_stitching - - name: Accuracy:video - run: cd /opencv-build && xvfb-run -a bin/opencv_test_video - - name: Accuracy:videoio - run: cd /opencv-build && xvfb-run -a bin/opencv_test_videoio - - name: Performance:3d - run: cd /opencv-build && xvfb-run -a bin/opencv_perf_3d --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 - - name: Performance:calib - run: cd /opencv-build && xvfb-run -a bin/opencv_perf_calib --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 - - name: Performance:core - run: cd /opencv-build && xvfb-run -a bin/opencv_perf_core --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 - - name: Performance:dnn - run: cd /opencv-build && xvfb-run -a bin/opencv_perf_dnn --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 - - name: Performance:features2d - run: cd /opencv-build && xvfb-run -a bin/opencv_perf_features2d --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 - - name: Performance:gapi - run: cd /opencv-build && xvfb-run -a bin/opencv_perf_gapi --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 - - name: Performance:imgcodecs - run: cd /opencv-build && xvfb-run -a bin/opencv_perf_imgcodecs --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 - - name: Performance:imgproc - run: cd /opencv-build && xvfb-run -a bin/opencv_perf_imgproc --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 - - name: Performance:objdetect - run: cd /opencv-build && xvfb-run -a bin/opencv_perf_objdetect --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 - - name: Performance:photo - run: cd /opencv-build && xvfb-run -a bin/opencv_perf_photo --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 - - name: Performance:stereo - run: cd /opencv-build && xvfb-run -a bin/opencv_perf_stereo --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 - - name: Performance:stitching - run: cd /opencv-build && xvfb-run -a bin/opencv_perf_stitching --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 - - name: Performance:video - run: cd /opencv-build && xvfb-run -a bin/opencv_perf_video --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 - - name: Performance:videoio - run: cd /opencv-build && xvfb-run -a bin/opencv_perf_videoio --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 - - name: Python3 - run: | - cd ${{ env.OPENCV_DOCKER_WORKDIR }}/modules/python/test - python3 ./test.py --repo ../../../ -v - - name: Java - run: cd /opencv-build && xvfb-run -a python3 ${{ env.OPENCV_DOCKER_WORKDIR }}/modules/ts/misc/run.py . -a -t java - - name: Save Unit Test Results - uses: actions/upload-artifact@v3 - if: always() - with: - name: junit-html - path: /opencv-build/java_test/testResults/junit-noframes.html - - name: Pylint - run: cd /opencv-build && cmake --build . --config release --target check_pylint -- -j4 - - BuildContrib: - runs-on: ubuntu-20.04 - defaults: - run: - shell: bash - container: - image: quay.io/asenyaev/opencv-ubuntu:20.04 - steps: - - name: PR info - run: | - echo "PR Author: ${{ env.PR_AUTHOR }}" - echo "Source branch name: ${{ env.SOURCE_BRANCH_NAME }}" - echo "Target branch name: ${{ env.TARGET_BRANCH_NAME }}" - - name: Clean - run: find . -mindepth 1 -delete - - name: Fetch opencv - uses: actions/checkout@v3 - with: - repository: opencv/opencv - ref: ${{ env.TARGET_BRANCH_NAME }} - fetch-depth: 0 - - name: Merge opencv with a test branch - run: | - cd ${{ env.OPENCV_DOCKER_WORKDIR }} - git config --global --add safe.directory ${{ env.OPENCV_DOCKER_WORKDIR }} - git config user.email "opencv.ci" - git config user.name "opencv.ci" - git pull -v "https://github.com/${{ env.PR_AUTHOR }}/opencv" "${{ env.SOURCE_BRANCH_NAME }}" - - name: Clone opencv_contrib - run: git clone --single-branch --branch ${{ env.TARGET_BRANCH_NAME }} --depth 1 https://github.com/opencv/opencv_contrib.git /opencv_contrib - - name: Configure OpenCV Contrib - run: | - cd /opencv-contrib-build - cmake -G Ninja ${{ env.EXTRA_CMAKE_OPTIONS }} -DOPENCV_EXTRA_MODULES_PATH=/opencv_contrib/modules ${{ env.OPENCV_DOCKER_WORKDIR }} - - name: Build OpenCV Contrib - run: | - cd /opencv-contrib-build - ninja diff --git a/.github/workflows/PR-5.x.yaml b/.github/workflows/PR-5.x.yaml new file mode 100644 index 0000000000..5893a1e141 --- /dev/null +++ b/.github/workflows/PR-5.x.yaml @@ -0,0 +1,19 @@ +name: PR:5.x + +on: + pull_request: + branches: + - 5.x + +jobs: + ARM64: + uses: opencv/ci-gha-workflow/.github/workflows/OCV-PR-5.x-ARM64.yaml@main + + U20: + uses: opencv/ci-gha-workflow/.github/workflows/OCV-PR-5.x-U20.yaml@main + + W10: + uses: opencv/ci-gha-workflow/.github/workflows/OCV-PR-5.x-W10.yaml@main + + TIM-VX: + uses: opencv/ci-gha-workflow/.github/workflows/OCV-timvx-backend-tests-4.x.yml@main \ No newline at end of file diff --git a/.github/workflows/timvx_backend_tests.yml b/.github/workflows/timvx_backend_tests.yml deleted file mode 100644 index c45a86f8b2..0000000000 --- a/.github/workflows/timvx_backend_tests.yml +++ /dev/null @@ -1,104 +0,0 @@ -name: TIM-VX Backend - -on: - pull_request: - branches: [ 4.x ] - types: [ labeled, opened, synchronize, reopened ] - - -jobs: - x86-simulator-build-test: - runs-on: ubuntu-20.04 - # Docker image from https://hub.docker.com/r/yuentau/ocv_ubuntu - container: docker.io/yuentau/ocv_ubuntu:20.04 - env: - PR_AUTHOR: ${{ github.event.pull_request.user.login }} - SOURCE_BRANCH_NAME: ${{ github.head_ref }} - TARGET_BRANCH_NAME: ${{ github.base_ref }} - steps: - - name: info - run: | - echo "PR Author: ${{ env.PR_AUTHOR }}" - echo "Source branch name: ${{ env.SOURCE_BRANCH_NAME }}" - echo "Target branch name: ${{ env.TARGET_BRANCH_NAME }}" - - name: clean - shell: bash - run: find . -mindepth 1 -delete - - name: fetch opencv - uses: actions/checkout@v3 - with: - repository: opencv/opencv - ref: ${{ env.TARGET_BRANCH_NAME }} - fetch-depth: 0 - path: opencv - - name: merge opencv with test branch - shell: bash - run: | - cd opencv - git config user.email "opencv.ci" - git config user.name "opencv.ci" - git pull -v "https://github.com/${{ env.PR_AUTHOR }}/opencv" "${{ env.SOURCE_BRANCH_NAME }}" --allow-unrelated-histories - - name: configure - run: | - cmake -B build -DWITH_TIMVX=ON -DCMAKE_INSTALL_PREFIX=./install -DBUILD_SHARED_LIBS=ON -DBUILD_PERF_TESTS=ON -DBUILD_TESTS=ON -DBUILD_EXAMPLES=OFF -DBUILD_DOCS=OFF -DWITH_OPENCL=OFF opencv - - name: build - run: cmake --build build --target install -j $(nproc) - - khadas-vim3-tests: - if: contains(github.event.pull_request.labels.*.name, 'category:dnn_timvx') - concurrency: - group: khadas-vim3 - cancel-in-progress: false - runs-on: [self-hosted, Linux, ARM64, khadas-vim3] - env: - PR_AUTHOR: ${{ github.event.pull_request.user.login }} - SOURCE_BRANCH_NAME: ${{ github.head_ref }} - TARGET_BRANCH_NAME: ${{ github.base_ref }} - steps: - - name: info - run: | - echo "PR Author: ${{ env.PR_AUTHOR }}" - echo "Source branch name: ${{ env.SOURCE_BRANCH_NAME }}" - echo "Target branch name: ${{ env.TARGET_BRANCH_NAME }}" - - name: clean - shell: bash - run: find . -mindepth 1 -delete - - name: fetch opencv - uses: actions/checkout@v3 - with: - repository: opencv/opencv - ref: ${{ env.TARGET_BRANCH_NAME }} - fetch-depth: 0 - path: opencv - - name: merge opencv with test branch - shell: bash - run: | - cd opencv - git config user.email "opencv.ci" - git config user.name "opencv.ci" - git pull -v "https://github.com/${{ env.PR_AUTHOR }}/opencv" "${{ env.SOURCE_BRANCH_NAME }}" --allow-unrelated-histories - - name: fetch opencv_extra - uses: actions/checkout@v3 - with: - repository: opencv/opencv_extra - path: opencv_extra - - name: merge opencv_extra with test branch - shell: bash - run: | - RET=$(git ls-remote --heads "https://github.com/${{ env.PR_AUTHOR }}/opencv_extra" "${{ env.SOURCE_BRANCH_NAME }}") - if [[ ! -z "$RET" ]]; then - cd opencv_extra - git config user.email "opencv.ci" - git config user.name "opencv.ci" - git pull -v "https://github.com/${{ env.PR_AUTHOR }}/opencv_extra" "${{ env.SOURCE_BRANCH_NAME }}" --allow-unrelated-histories - else - echo "no merge since ${{ env.PR_AUTHOR }}/opencv_extra does not have branch ${{ env.SOURCE_BRANCH_NAME }}" - fi - - name: configure - run: | - cmake -B build -D CMAKE_BUILD_TYPE=RELEASE -DCMAKE_INSTALL_PREFIX=./install -DWITH_TIMVX=ON -DWITH_OPENCL=OFF -DWITH_EIGEN=OFF opencv - - name: build - run: cmake --build build --target opencv_test_dnn -j 4 - - name: unit tests for int8 layers - run: | - OPENCV_TEST_DATA_PATH=./opencv_extra/testdata ./build/bin/opencv_test_dnn --gtest_filter="Test_Int8_layers.*/1"