files changed for successful build of openpose and caffe

franzcrs · Jun 4, 2024 · e0e5833 · e0e5833
1 parent e03ad73
commit e0e5833
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 8 deletions.
diff --git a/3rdparty/caffe/CMakeLists.txt b/3rdparty/caffe/CMakeLists.txt
@@ -1,3 +1,8 @@
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_VERBOSE_MAKEFILE ON)
+
 cmake_minimum_required(VERSION 2.8.7)
 if(POLICY CMP0046)
   cmake_policy(SET CMP0046 NEW)
@@ -50,7 +55,7 @@ include(cmake/Dependencies.cmake)
 
 # ---[ Flags
 if(UNIX OR APPLE)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall -std=c++11")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall")
 endif()
 
 caffe_set_caffe_link()

diff --git a/3rdparty/caffe/Makefile b/3rdparty/caffe/Makefile
@@ -41,7 +41,7 @@ DYNAMIC_VERSIONED_NAME_SHORT := $(DYNAMIC_NAME_SHORT).$(DYNAMIC_VERSION_MAJOR).$
 DYNAMIC_NAME := $(LIB_BUILD_DIR)/$(DYNAMIC_VERSIONED_NAME_SHORT)
 COMMON_FLAGS += -DCAFFE_VERSION=$(DYNAMIC_VERSION_MAJOR).$(DYNAMIC_VERSION_MINOR).$(DYNAMIC_VERSION_REVISION)
 # OpenPose: added C++11 flag to avoid crashing in some old GCC compilers
-COMMON_FLAGS += -std=c++11
+#COMMON_FLAGS += -std=c++11
 # OpenPose: end modified
 
 ##############################

diff --git a/3rdparty/caffe/cmake/Modules/FindvecLib.cmake b/3rdparty/caffe/cmake/Modules/FindvecLib.cmake
@@ -20,6 +20,8 @@ find_path(vecLib_INCLUDE_DIR vecLib.h
                 ${CMAKE_XCODE_DEVELOPER_DIR}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/Accelerate.framework/Versions/Current/Frameworks/vecLib.framework/Headers/
           NO_DEFAULT_PATH)
 
+set(vecLib_INCLUDE_DIR "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/Accelerate.framework/Versions/Current/Frameworks/vecLib.framework/Headers/")
+
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(vecLib DEFAULT_MSG vecLib_INCLUDE_DIR)
 

diff --git a/3rdparty/caffe/src/caffe/layers/hdf5_data_layer.cpp b/3rdparty/caffe/src/caffe/layers/hdf5_data_layer.cpp
@@ -10,6 +10,8 @@
 #include <fstream>  // NOLINT(readability/streams)
 #include <string>
 #include <vector>
+#include <algorithm>
+#include <random>
 
 #include "hdf5.h"
 #include "hdf5_hl.h"
@@ -62,7 +64,13 @@ void HDF5DataLayer<Dtype>::LoadHDF5FileData(const char* filename) {
 
   // Shuffle if needed.
   if (this->layer_param_.hdf5_data_param().shuffle()) {
+#if __cplusplus < 201703L
     std::random_shuffle(data_permutation_.begin(), data_permutation_.end());
+#else
+    std::random_device rd;
+    std::mt19937 g(rd());
+    std::shuffle(data_permutation_.begin(), data_permutation_.end(), g);
+#endif
     DLOG(INFO) << "Successfully loaded " << hdf_blobs_[0]->shape(0)
                << " rows (shuffled)";
   } else {
@@ -105,7 +113,13 @@ void HDF5DataLayer<Dtype>::LayerSetUp(const vector<Blob<Dtype>*>& bottom,
 
   // Shuffle if needed.
   if (this->layer_param_.hdf5_data_param().shuffle()) {
+#if __cplusplus < 201703L
     std::random_shuffle(file_permutation_.begin(), file_permutation_.end());
+#else
+    std::random_device rd;
+    std::mt19937 g(rd());
+    std::shuffle(file_permutation_.begin(), file_permutation_.end(), g);
+#endif
   }
 
   // Load the first HDF5 file and initialize the line counter.
@@ -144,17 +158,30 @@ void HDF5DataLayer<Dtype>::Next() {
       if (current_file_ == num_files_) {
         current_file_ = 0;
         if (this->layer_param_.hdf5_data_param().shuffle()) {
+#if __cplusplus < 201703L
           std::random_shuffle(file_permutation_.begin(),
                               file_permutation_.end());
+#else
+          std::random_device rd;
+          std::mt19937 g(rd());
+          std::shuffle(file_permutation_.begin(), file_permutation_.end(), g);
+#endif
         }
         DLOG(INFO) << "Looping around to first file.";
       }
       LoadHDF5FileData(
         hdf_filenames_[file_permutation_[current_file_]].c_str());
     }
     current_row_ = 0;
-    if (this->layer_param_.hdf5_data_param().shuffle())
+    if (this->layer_param_.hdf5_data_param().shuffle()){
+#if __cplusplus < 201703L
       std::random_shuffle(data_permutation_.begin(), data_permutation_.end());
+#else
+      std::random_device rd;
+      std::mt19937 g(rd());
+      std::shuffle(data_permutation_.begin(), data_permutation_.end(), g);
+#endif
+    }
   }
   offset_++;
 }

diff --git a/3rdparty/caffe/src/caffe/util/io.cpp b/3rdparty/caffe/src/caffe/util/io.cpp
@@ -54,7 +54,11 @@ bool ReadProtoFromBinaryFile(const char* filename, Message* proto) {
   CHECK_NE(fd, -1) << "File not found: " << filename;
   ZeroCopyInputStream* raw_input = new FileInputStream(fd);
   CodedInputStream* coded_input = new CodedInputStream(raw_input);
+#if __cplusplus < 201703L
   coded_input->SetTotalBytesLimit(kProtoReadBytesLimit, 536870912);
+#else
+  coded_input->SetTotalBytesLimit(kProtoReadBytesLimit);
+#endif
 
   bool success = proto->ParseFromCodedStream(coded_input);
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,3 +1,8 @@
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_VERBOSE_MAKEFILE ON)
+
 ### VERSION INFO
 set(OpenPose_VERSION_MAJOR 1)
 set(OpenPose_VERSION_MINOR 7)
@@ -99,11 +104,11 @@ if (WIN32)
   set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG:incremental /OPT:REF /OPT:ICF")
 elseif (UNIX)
   # Turn on C++11
-  add_definitions(-std=c++11)
+  add_definitions(-std=c++17)
   set(CMAKE_CXX_FLAGS_RELEASE "-O3")
 elseif (APPLE)
   # Turn on C++11
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
   set(CMAKE_CXX_FLAGS_RELEASE "-O3")
 endif (WIN32)
 
@@ -867,6 +872,7 @@ endif (NOT ${WITH_EIGEN} MATCHES "NONE")
 
 if (APPLE)
   include_directories("/usr/local/opt/openblas/include")
+  include_directories("/opt/homebrew/opt/openblas/include")
 endif (APPLE)
 
 if (USE_MKL)

diff --git a/scripts/osx/install_deps.sh b/scripts/osx/install_deps.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-brew_packages="openblas snappy leveldb gflags glog szip lmdb hdf5 opencv protobuf boost cmake viennacl"
+brew_packages="openblas snappy leveldb gflags glog szip lmdb hdf5 opencv protobuf boost viennacl"
 for pkg in $brew_packages
 do
     echo "brew install $pkg || brew upgrade $pkg"
@@ -14,6 +14,6 @@ done
 pip_packages="numpy<1.17 opencv-python<4.3"
 for pkg in $pip_packages
 do
-    echo "sudo -H python2 -m pip install $pkg"
-    sudo -H python2 -m pip install "$pkg"
+    echo "sudo -H python -m pip install $pkg"
+    sudo -H python -m pip install "$pkg"
 done
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1 +1,5 @@
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_VERBOSE_MAKEFILE ON)
 add_subdirectory(openpose)
diff --git a/src/openpose/CMakeLists.txt b/src/openpose/CMakeLists.txt
@@ -1,3 +1,8 @@
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_VERBOSE_MAKEFILE ON)
+
 include(${CMAKE_SOURCE_DIR}/cmake/Utils.cmake)
 subdirlist(SUB_DIRS ${CMAKE_CURRENT_SOURCE_DIR})
 foreach (SUB_DIR ${SUB_DIRS})