Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 16 Jul 2021 10:35:42 +0000 (10:35 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 16 Jul 2021 10:35:42 +0000 (10:35 +0000)
1  2 
CMakeLists.txt
modules/core/src/parallel.cpp
modules/core/src/system.cpp
modules/dnn/src/dnn.cpp
modules/dnn/src/ie_ngraph.cpp
modules/dnn/src/onnx/onnx_importer.cpp
modules/dnn/test/test_ie_models.cpp
modules/dnn/test/test_onnx_importer.cpp
modules/python/src2/cv2.cpp
platforms/winpack_dldt/build_package.py

diff --cc CMakeLists.txt
Simple merge
Simple merge
@@@ -116,10 -114,14 +116,14 @@@ void* allocSingletonNewBuffer(size_t si
  #include <cstdlib>        // std::abort
  #endif
  
- #if defined __ANDROID__ || defined __linux__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __HAIKU__ || defined __Fuchsia__
 -#if defined __ANDROID__ || defined __unix__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __HAIKU__
++#if defined __ANDROID__ || defined __unix__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __HAIKU__ || defined __Fuchsia__
  #  include <unistd.h>
  #  include <fcntl.h>
+ #if defined __QNXNTO__
+ #  include <sys/elf.h>
+ #else
  #  include <elf.h>
+ #endif
  #if defined __ANDROID__ || defined __linux__
  #  include <linux/auxvec.h>
  #endif
Simple merge
Simple merge
@@@ -349,9 -417,9 +417,11 @@@ TEST_P(DNNTestOpenVINO, models
      // Single Myriad device cannot be shared across multiple processes.
      if (targetId == DNN_TARGET_MYRIAD)
          resetMyriadDevice();
 +    if (targetId == DNN_TARGET_HDDL)
 +        releaseHDDLPlugin();
      EXPECT_NO_THROW(runIE(targetId, xmlPath, binPath, inputsMap, ieOutputsMap)) << "runIE";
+     if (targetId == DNN_TARGET_MYRIAD)
+         resetMyriadDevice();
      EXPECT_NO_THROW(runCV(backendId, targetId, xmlPath, binPath, inputsMap, cvOutputsMap)) << "runCV";
  
      double eps = 0;
Simple merge