From be49ab30cd5c8bef2b8c00cda3537b1ca3e12aa7 Mon Sep 17 00:00:00 2001
From: Stefano Sinigardi <stesinigardi@hotmail.com>
Date: Mon, 27 Apr 2020 18:11:19 +0200
Subject: [PATCH] omp support on macOS

---
 .travis.yml    | 32 +++++++++++++++++++-------------
 CMakeLists.txt | 10 +++-------
 appveyor.yml   |  1 +
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fae61833..9a0630a7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -74,15 +74,22 @@ matrix:
         - additional_defines=""
         - MATRIX_EVAL="brew install opencv"
 
-#    - os: osx
-#      name: macOS - clang - vcpkg
-#      osx_image: xcode10.1
-#      env:
-#        - additional_defines="-DBUILD_SHARED_LIBS=OFF"
-#        - MATRIX_EVAL="brew install yasm && unset CC && unset CXX"
-#        - USE_VCPKG=true
-#        - VCPKG_DEFINES="-DCMAKE_TOOLCHAIN_FILE=$HOME/vcpkg/scripts/buildsystems/vcpkg.cmake"
-#
+    - os: osx
+      compiler: clang
+      name: macOS - clang - opencv(latest) - libomp
+      env:
+        - additional_defines=""
+        - MATRIX_EVAL="brew install opencv libomp"
+
+    - os: osx
+      name: macOS - clang - vcpkg
+      osx_image: xcode11.4
+      env:
+        - additional_defines="-DBUILD_SHARED_LIBS=OFF"
+        - MATRIX_EVAL="brew install yasm && unset CC && unset CXX"
+        - USE_VCPKG=true
+        - VCPKG_DEFINES="-DCMAKE_TOOLCHAIN_FILE=$HOME/vcpkg/scripts/buildsystems/vcpkg.cmake"
+
     - os: linux
       compiler: clang
       dist: bionic
@@ -201,10 +208,8 @@ matrix:
         - LD_LIBRARY_PATH="/usr/local/cuda-10.0/lib64:/usr/local/cuda-10.0/lib64/stubs:${LD_LIBRARY_PATH}"
         - MATRIX_EVAL="wget http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && sudo apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1404/x86_64/7fa2af80.pub && sudo dpkg -i cuda-repo-ubuntu1404_10.0.130-1_amd64.deb && wget http://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1404/x86_64/nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo dpkg -i nvidia-machine-learning-repo-ubuntu1404_4.0-2_amd64.deb && sudo apt-get -y update && sudo apt-get install -y --no-install-recommends cuda-compiler-10-0 cuda-libraries-dev-10-0 cuda-driver-dev-10-0 cuda-cudart-dev-10-0 cuda-cublas-dev-10-0 cuda-curand-dev-10-0 && sudo apt-get install -y --no-install-recommends libcudnn7-dev && sudo ln -s /usr/local/cuda-10.0/lib64/stubs/libcuda.so /usr/local/cuda-10.0/lib64/stubs/libcuda.so.1"
 
-#  allow_failures:
-#    - name: macOS - vcpkg
-#    - name: ubuntu 18.04 - gcc - vcpkg
-#    - name: ubuntu 18.04 - gcc - CUDA 10 - vcpkg
+  allow_failures:
+    - name: macOS - clang - vcpkg
 
 before_install:
   - travis_retry eval "${MATRIX_EVAL}"
@@ -222,6 +227,7 @@ install:
   - if [ "${USE_VCPKG}" = true ] ; then ./bootstrap-vcpkg.sh ; fi
   - if [ "${USE_VCPKG}" = true ] ; then echo "set(VCPKG_BUILD_TYPE release)" >> triplets/x64-osx.cmake ; fi
   - if [ "${USE_VCPKG}" = true ] ; then echo "set(VCPKG_BUILD_TYPE release)" >> triplets/x64-linux.cmake ; fi
+  - if [ "${USE_VCPKG}" = true ] ; then travis_wait 45 ./vcpkg upgrade --no-dry-run; fi
   - if [ "${USE_VCPKG}" = true ] ; then travis_wait ./vcpkg install stb pthreads --recurse; fi
   - if [ "${USE_VCPKG}" = true ] ; then travis_wait 45 ./vcpkg install ffmpeg --recurse; fi
   #- if [ "${USE_VCPKG}" = true ] && [[ ! -z "${CUDACXX}" ]] ; then travis_wait 45 ./vcpkg install opencv[ffmpeg,cuda] --recurse; fi
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0b354dc1..342e7da6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,9 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.12)
 
 set(Darknet_MAJOR_VERSION 0)
 set(Darknet_MINOR_VERSION 2)
 set(Darknet_PATCH_VERSION 5)
-set(Darknet_TWEAK_VERSION 1)
+set(Darknet_TWEAK_VERSION 2)
 set(Darknet_VERSION ${Darknet_MAJOR_VERSION}.${Darknet_MINOR_VERSION}.${Darknet_PATCH_VERSION}.${Darknet_TWEAK_VERSION})
 
 option(CMAKE_VERBOSE_MAKEFILE "Create verbose makefile" OFF)
@@ -127,11 +127,7 @@ if(ENABLE_OPENCV)
   endif()
 endif()
 find_package(Stb REQUIRED)
-if(${CMAKE_VERSION} VERSION_LESS "3.11.0")
-  message(WARNING "To build with OpenMP support you need CMake 3.11.0+")
-else()
-  find_package(OpenMP)
-endif()
+find_package(OpenMP)
 
 set(ADDITIONAL_CXX_FLAGS "-Wall -Wno-unused-result -Wno-unknown-pragmas -Wfatal-errors -Wno-deprecated-declarations -Wno-write-strings")
 set(ADDITIONAL_C_FLAGS "-Wall -Wno-unused-result -Wno-unknown-pragmas -Wfatal-errors -Wno-deprecated-declarations -Wno-write-strings")
diff --git a/appveyor.yml b/appveyor.yml
index 2abab7cd..fbfd7f62 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -61,6 +61,7 @@ install:
   - if [%COMPILER%]==[vs] if NOT [%USE_INTEGRATED_LIBS%]==[yes] git pull
   - if [%COMPILER%]==[vs] if NOT [%USE_INTEGRATED_LIBS%]==[yes] .\bootstrap-vcpkg.bat
   - if [%COMPILER%]==[vs] if NOT [%USE_INTEGRATED_LIBS%]==[yes] echo set(VCPKG_BUILD_TYPE release) >> triplets\%VCPKG_DEFAULT_TRIPLET%.cmake
+  - if [%COMPILER%]==[vs] if NOT [%USE_INTEGRATED_LIBS%]==[yes] vcpkg upgrade --no-dry-run
   - if [%COMPILER%]==[vs] if NOT [%USE_INTEGRATED_LIBS%]==[yes] if [%USE_CUDA%]==[yes] vcpkg install cuda --recurse
   - if [%COMPILER%]==[vs] if NOT [%USE_INTEGRATED_LIBS%]==[yes] vcpkg install stb pthreads --recurse
   - if [%COMPILER%]==[vs] if NOT [%USE_INTEGRATED_LIBS%]==[yes] vcpkg install ffmpeg --recurse