Skip to content

Merge 3.4#16764

Merged
alalek merged 4 commits intoopencv:masterfrom
alalek:merge-3.4
Mar 9, 2020
Merged

Merge 3.4#16764
alalek merged 4 commits intoopencv:masterfrom
alalek:merge-3.4

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Mar 9, 2020 •
edited
Loading

#16724 from liqi-c:3.4-tengine
#16743 from alalek:ts_dump_exception_content

Previous "Merge 3.4": #16753

buildworker:Win64 OpenCL=windows-2
buildworker:Custom=linux-1,linux-2,linux-4
build_image:Docs=docs-js
build_image:Custom=javascript
#build_image:Custom=powerpc64le
#build_image:Custom=ubuntu-openvino-2019r3.0:16.04
#build_image:Custom=ubuntu-openvino-2020.1.0:16.04
#buildworker:Custom=linux-2
#build_image:Custom=ubuntu-vulkan:16.04
#buildworker:Custom=linux-4
#build_image:Custom=fedora:28
#build_image:Custom=ubuntu-cuda:16.04
#build_image:Custom=ubuntu-clang:18.04
#buildworker:Custom=linux-1
#build_image:Custom=javascript-simd
#build_image:Custom=mips64el
#build_image:Custom Mac=openvino-2019r3.0
build_image:Custom Mac=openvino-2020.1.0
#build_image:Custom Win=openvino-2019r3.0
build_image:Custom Win=openvino-2020.1.0
test_opencl:Custom Win=OFF
#build_image:Custom Win=msvs2017
#build_image:Custom Win=msvs2019
test_modules:Custom Mac=dnn,java,python3

alalek and others added 3 commits March 6, 2020 12:08
@alalek
ts(gtest): dump exception message from EXPECT_NO_THROW()
a55cc07
@alalek
Merge pull request opencv#16743 from alalek:ts_dump_exception_content
969cc3d
@liqi-c @vpisarev
Merge pull request opencv#16724 from liqi-c:3.4-tengine
0bcdf7d 
* Add Tengine support .

* Modify printf to CV_LOG_WARNING

* a few minor fixes in the code

* Renew Tengine version

* Add header file for CV_LOG_WARNING

* Add #ifdef HAVE_TENGINE in tengine_graph_convolution.cpp

* remove trailing whitespace

* Remove trailing whitespace

* Modify for compile problem

* Modify some code style error

* remove whitespace

* Move some code style problem

* test

* add ios limit and build problem

* Modified as alalek suggested

* Add cmake 2.8 support

* modify cmake 3.5.1 problem

* test and set BUILD_ANDROID_PROJECTS OFF

* remove some compile error

* remove some extra code in tengine

* close test.

* Test again

* disable android.

* delete ndk version judgement

* Remove setenv() call . and add License information

* Set tengine default OFF. Close test .

Co-authored-by: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
This was referenced Mar 9, 2020
Merged
Merged
@alalek
Copy link
Copy Markdown
Member Author

alalek commented Mar 9, 2020

👍

@alalek alalek merged commit 9b3be01 into opencv:master Mar 9, 2020
@dkurt dkurt mentioned this pull request Mar 10, 2020
Merged
@alalek alalek mentioned this pull request Mar 10, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alalek alalek

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@alalek @liqi-c