Merge 4.x #18951
Merged
Merge 4.x #18951
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Update documentation to reflect INTER_LINEAR_EXACT being unsupported in remap
GAPI: Addition new Color conversion kernels to CPU backend. * Add BGR2RGB kernel to CPU backend * Add BGR2I420 and RGB2I420 kernels to CPU backend * Add I4202BGR and I4202RGB kernels to CPU backend
Mat conversions for macOS/AppKit * Extract CoreGraphics conversion logics from ios_conversions.mm to apple_conversions.h, apple_conversions. Add macosx_conversions.mm * Add macosx.h * Add Mat+Conversions.h and Mat+Conversions.mm * Delete duplicated declaration from apple_conversion.mm * Use short license header * Add compile guard * Delete unused imports * Move precomp.hpp import from header to implementation * Add macosx.h to skip headers * Fix compile guard condition * Use short license header * Remove commented out unused code
[G-API Wrap streaming * Wrap streaming * Fix build * Add comments * Remove comment * Fix comments to review * Add test for python pull overload
[G-API] Support ImportNetwork for cv::gapi::infer * wip * Refactoring * Fix comments to review * Fix warning Co-authored-by: Ruslan Garnov <[email protected]>
…catalyst-xcframework Support XCFramework builds, Catalyst * Early work on xcframework support * Improve legibility * Somehow this works * Specify ABIs in a place where they won't get erased If you pass in the C/CXX flags from the Python script, they won't be respected. By doing it in the actual toolchain, the options are respected and Catalyst successfully links. * Clean up and push updates * Actually use Catalyst ABI Needed to specify EXE linker flags to get compiler tests to link to the Catalyst ABIs. * Clean up * Revert changes to common toolchain that don't matter * Try some things * Support Catalyst build in OSX scripts * Remove unnecessary iOS reference to AssetsLibrary framework * Getting closer * Try some things, port to Python 3 * Some additional fixes * Point Cmake Plist gen to osx directory for Catalyst targets * Remove dynamic lib references for Catalyst, copy iOS instead of macos * Add flag for building only specified archs, remove iOS catalyst refs * Add build-xcframework.sh * Update build-xcframework.sh * Add presumptive Apple Silicon support * Add arm64 iphonesimulator target * Fix xcframework build * Working on arm64 iOS simulator * Support 2.7 (replace run with check_output) * Correctly check output of uname_m against arch * Clean up * Use lipo for intermediate frameworks, add python script Remove unneeded __init__.py * Simplify python xcframework build script * Add --only-64-bit flag * Add --framework-name flag * Document * Commit to f-strings, improve console output * Add i386 to iphonesimulator platform in xcframework generator * Enable objc for non-Catalyst frameworks * Fix xcframework builder for paths with spaces * Use arch when specifying Catalyst build platform in build command * Fix incorrect settings for framework_name argparse configuration * Prefer underscores instead of hyphens in new flags * Move Catalyst flags to where they'll actually get used * Use --without=objc on Catalyst target for now * Remove get_or_create_folder and simplify logic * Remove unused import * Tighten up help text * Document * Move common functions into cv_build_utils * Improve documentation * Remove old build script * Add readme * Check for required CMake and Xcode versions * Clean up TODOs and re-enable `copy_samples()` Remove TODO Fixup * Add missing print_function import * Clarify CMake dependency documentation * Revert python2 change in gen_objc * Remove unnecessary builtins imports * Remove trailing whitespace * Avoid building Catalyst unless specified This makes Catalyst support a non-breaking change, though defaults should be specified when a breaking change is possible. * Prevent lipoing for the same archs on different platforms before build * Rename build-xcframework.py to build_xcframework.py * Check for duplicate archs more carefully * Prevent sample copying error when directory already exists This can happen when building multiple architectures for the same platform. * Simplify code for checking for default archs * Improve build_xcframework.py header text * Correctly resolve Python script paths * Parse only known args in ios/osx build_framework.py * Pass through uncaptured args in build_xcframework to osx/ios build * Fix typo * Fix typo * Fix unparameterized build path for intermediate frameworks * Fix dyanmic info.plist path for catalyst * Fix utf-8 Python 3 issue * Add dynamic flag to osx script * Rename platform to platforms, remove armv7s and i386 * Fix creation of dynamic framework on maccatalyst and macos * Update platforms/apple/readme.md * Add `macos_archs` flag and deprecate `archs` flag * Allow specification of archs when generating xcframework from terminal * Change xcframework platform argument names to match archs flag names * Remove platforms as a concept and shadow archs flags from ios/osx .py * Improve documentation * Fix building of objc module on Catalyst, excluding Swift * Clean up build folder logic a bit * Fix framework_name flag * Drop passthrough_args, use unknown_args instead * minor: coding style changes Co-authored-by: Chris Ballinger <[email protected]>
- fix opencv#18906 - unable to add related test cases as there is no public access to Context:Impl refcounts
xrange was abandoned and doesn't exist in Python 3. range() works just the same
(4.x) build: Xcode 12 support * build: xcode 12 support, cmake fixes * ts: eliminate clang 11 warnigns * 3rdparty: clang 11 warnings * features2d: eliminate build warnings * test: warnings * gapi: warnings from 18928
…new_stream_call
[G-API] Wrap GArray * Wrap GArray for output * Collect in/out info in graph * Add imgproc tests * Add cv::Point2f * Update test_gapi_imgproc.py * Fix comments to review
This was referenced Nov 27, 2020
|
@vpisarev Please take a look on ongoing calid3d changes: |
|
👍 |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#17077 from i386x:check-negative-values
#17839 from malliaridis:master
#18003 from APrigarina:curved_qrcodes_decoding
#18068 from lionkunonly:gsoc_2020_simd
#18145 from sl-sergei:fix_17914
#18158 from legrosbuffle:3.4-vectorize-dft-radix
#18220 from Omar-AE:hddl-supported
#18285 from YashasSamaga:cuda4dnn-update-tests
#18296 from sl-sergei:fix_16783
#18335 from chargerKong:master
#18338 from anna-khakimova:ak/opt_arithm_kernel
#18371 from nathanrgodwin:sqpnp_dev
#18419 from TolyaTalamanov:at/generic-inference
#18426 from Varvrar:add-HEVC-codec-iOS-Mac
#18476 from dmatveev:dm/gapi_text_detection
#18491 from TolyaTalamanov:at/wrap-inference
#18493 from TolyaTalamanov:at/wrap-streaming
#18496 from AsyaPronina:comp_args_serialization
#18499 from RidgeRun:optional-gstreamer-mainloop
#18510 from OrestChura:oc/boundingRect
#18516 from anna-khakimova:ak/bgr2rgb
#18527 from alalek:dnn_test_openvino
#18533 from paroj:imwritemulti
#18534 from alalek:build_opencv_winpack_dldt_2021.1.0
#18536 from alalek:backport_doxygen_style_18195
#18539 from mshabunin:fix-doc-warnings
#18542 from TolyaTalamanov:at/import-network
#18545 from alalek:enable_tests_17953
#18547 from mtfrctl:objc-conversions-macosx
#18551 from alalek:issue_17964
#18554 from alalek:issue_17945
#18557 from alalek:cuda_cmake_fix_auto
#18559 from maxint:fix-rang-loop-construct-warnings
#18564 from alalek:dnn_test_openvino_4.x
#18566 from mtfrctl:mat-objc-swift-data-pointer
#18568 from catree:fix_deepgreen_colormap_fig
#18581 from alalek:winpack_dldt_videoio_plugins
#18582 from weltonrodrigo:remap_inter_doc
#18583 from weltonrodrigo:remap_inter_doc_4
#18584 from smirnov-alexey:as/rmat_s11n
#18588 from damonmo:fix-issue-18553
#18589 from alalek:issue_13328
#18590 from krush11:master
#18593 from masa-iwm:master
#18598 from aleromar:Issue18595_UsacParams_PythonBinding
#18600 from TolyaTalamanov:at/implement-render-using-stateful
#18602 from alalek:issue_18597
#18605 from komakai:fix-swift-binding
#18607 from zteffi:warp-point-backward
#18614 from ZhiyuanChen:patch-1
#18621 from dbudniko:gapi_ww43_2020_KW_fixes
#18622 from TolyaTalamanov:at/fix-namespace
#18624 from qchateau:similarity-mask
#18628 from innerlee:patch-1
#18633 from laelath:master
#18637 from komakai:build-for-distribution
#18640 from alalek:core_cleanup_inline_code
#18641 from rtimpe:fix_cuda_stubs
#18646 from qchateau:wave-auto
#18651 from AsyaPronina:asyadev/add_possibility_to_check_that_gcompilearg_has_serialize
#18652 from OrestChura:oc/morphologyEx
#18658 from JackBoosY:master
#18663 from alalek:core_cleanup_inline_code_4.x
#18664 from ackbar345:mikkel/fix-manual-page-size
#18671 from rgarnov:rg/rmat_and_s11n_fixes
#18672 from alalek:cmake_3rdparty_exclude_from_all
#18673 from dmatveev:dm/upstream_desync
#18675 from sturkmen72:update-documentation
#18685 from APrigarina:fix_curved_qrcodes
#18688 from rgarnov:rg/add_gmatdesc_s11n_nd_test
#18699 from alalek:support_ceres_2.0.0
#18701 from TolyaTalamanov:at/introduce-config-for-ie-params
#18711 from alalek:dnn_fix_model_public_api
#18716 from dmatveev:dm/upstream_onnx
#18719 from dmatveev:dm/upstream_desync_fix
#18720 from rgarnov:rg/nd_rmat_view
#18724 from S-o-T:fix_confusing_naming_for_keypoints_comparator
#18729 from rgarnov:rg/extend_parse_yolo
#18732 from junxnone:master
#18736 from mshabunin:mfx-frame-size-34
#18740 from rgarnov:rg/fix_rmat_media_missing_in_standalone
#18741 from rkazants:fix/rkazants/39665_unsqueeze
#18742 from AsyaPronina:asyadev/fix_preprocessing_for_import_network
#18744 from mpashchenkov:mp/onnx-dynamic-input-tensor
#18746 from alalek:backport_18741
#18752 from alalek:dnn_defines_openvino_2021.1.0
#18753 from catree:fix_FindOpenBLAS_typo
#18756 from andy-held:add_ueye_capture
#18762 from TolyaTalamanov:at/support-garray
#18763 from GArik:orbbec
#18764 from alalek:doxygen_image_path
#18765 from GArik:tutorials
#18770 from mshabunin:fix-kw-1
#18771 from chrisballinger:xcode-12-fixes
#18774 from alalek:bindings_namespace_inline
#18782 from alalek:issue_18779
#18783 from sl-sergei:fix_conv1d
#18786 from mshabunin:fix-kw-2
#18790 from OrestChura:oc/fitLine
#18793 from dmatveev:dm/in_graph_metadata
#18795 from aitikgupta:stiching-bug
#18798 from alalek:java_robust_binding_code
#18801 from alalek:java_improve_nested_classes_namespaces
#18802 from aitikgupta:typo
#18805 from alalek:cmake_objc_generator
#18806 from quaresmajose:cmake
#18808 from alalek:objc_robust_binding_code
#18809 from alalek:objc_string
#18810 from AntonVeselskyi:bugfix-18807
#18811 from alalek:objc_headers_import
#18817 from alalek:fixup_objc_tests
#18818 from alalek:objc_skip_nested_classes_namespaces
#18819 from mpashchenkov:mp/ocv-gapi-skip-centos-tests
#18822 from alalek:java_workaround_base_class_issue
#18823 from alalek:issue_contrib_2750
#18824 from alalek:update_version_3.4.13-pre
#18825 from alalek:update_version_4.5.1-pre
#18826 from Rightpoint:feature/colejd/build-catalyst-xcframework
#18828 from ichisadashioko:fix-calibration-sample-typo
#18830 from l-bat:issue_18785
#18833 from sl-sergei:disable_conv1d_wb_test
#18834 from l-bat:update_reducemax
#18838 from alalek:video_tracking_api
#18839 from alalek:update_libjpeg-turbo
#18840 from alalek:dnn_test_skip_myriad_gather_multi_output
#18841 from JulienMaille:patch-2
#18845 from joegeisbauer:fix_reduce_mean_index_error
#18848 from IanMaquignaz:fixEpipolarGeometryTutorial
#18849 from IanMaquignaz:fix_findFundamentalMat_parameters
#18854 from GArik:orbbec
#18855 from Rightpoint:feature/colejd/add-apple-conversions-to-framework-builds
#18858 from fegorsch:improve-persistence-doc
#18862 from sl-sergei:support_pool1d
#18863 from l-bat:lb/fix_test
#18868 from mpashchenkov:mp/onnx-small-cmake-fix
#18882 from alalek:build_warning_calib3d_drop_register
#18887 from HollowMan6:patch-1
#18895 from oravital7:flip-module
#18896 from alalek:cmake_fix_eigen_detection
#18904 from mpashchenkov:mp/ocv-gapi-skip-gm-tests
#18905 from alalek:objc_fix_return_type_handling
#18907 from diablodale:exec_context_create_addref
#18914 from alalek:videoio_fix_missing_get_capture_domain
#18918 from gabrielnhn:patch-2
#18922 from alalek:3.4-xcode12
#18924 from alalek:4.x-xcode12
#18929 from alalek:gapi_test_eliminate_rand
#18935 from rgarnov:rg/remove_double_handle_new_stream_call
#18938 from alalek:issue_18865
#18939 from alalek:unstable_test_18937
5.x (next) branch PR: #18555