Alpha CPU_ONLY version (CMU-Perceptual-Computing-Lab#394)

* Converted Caffe to submodule git * added support for display of .hpp files in qtcreator * added function to display as a string array size * added logging code * added a caffeutil function class to display blob size * wip resize cpu * implemented resizeAndMerge cpu * completion of cpu nms and resize functions * added warp affine function. but its very slow so kept commented * WIP. Intel Caffe compile * wip. cpu version * wip. intel mkl * Bug fix revert cpu gpu on resize * NMS Border Patrol * Bug fix for cmake to check if caffe pulled * hands extractor cpu * Face extractor cpu made to work * Removed caffeutil * changed array toString function * cleanup * added explanation for logic nms * update installation text for cpu prelim * Removed duplicated `if (BUILD_DOCS)` * Removed duplicated include(cmake/Utils.cmake) * Recovered deleted text from OP master branch * Removed duplicated `find_package(CuDNN)` * Update CMakeLists.txt * Update CMakeLists.txt * OpenCL not available yet (removed) * Updated spacing * Recovering original format * Fixed typo * Fixed messages bug * Fixed message bug * printSize working on Windows * updates to doc on cpu version * OpenMP only on CPU_ONLY. Cout override, std::memcpy instead of memcpy * additional fixes to profiler cmake. change to std::copy * Fixed pthread leftovers * Fixed minor typos and format * NMS remove if 18, resize convert to smart pointer * update of mkl lib for new mkl version * Fix to select cpu only if no cuda available * Some updates to the Doc for CPU Version * moved ostream to cpp. remove mkl from util * Add gines CMake * remove cpu doc (temp) * add try catch to print blocks * move cout overload outside class * Bug fix to cout overload. Not possible to use error function as its outside scope * More clean cout and fixed typo
lg12170226 · Jan 23, 2018 · d8c5dfc · d8c5dfc
1 parent 8096df3
commit d8c5dfc
Show file tree

Hide file tree

Showing 29 changed files with 559 additions and 258 deletions.
diff --git a/doc/installation_cmake.md b/doc/installation_cmake.md
@@ -10,11 +10,11 @@ OpenPose - Installation using CMake
 6. [Uninstallation](#uninstallation)
 7. [Optional Settings](#optional-settings)
     1. [MPI Model](#mpi-model)
-    2. [Custom Caffe (Ubuntu Only)](#custom-caffe-ubuntu-only)
-    3. [Custom OpenCV (Ubuntu Only)](#custom-opencv-ubuntu-only)
-    4. [OpenPose 3D Reconstruction Demo (Windows Only)](#openpose-3d-reconstruction-demo-windows-only)
-    5. [Doxygen Documentation Autogeneration (Ubuntu Only)](#doxygen-documentation-autogeneration-ubuntu-only)
-    6. [CMake Command Line Configuration (Ubuntu Only)](#cmake-command-line-configuration-ubuntu-only)
+    3. [Custom Caffe (Ubuntu Only)](#custom-caffe-ubuntu-only)
+    4. [Custom OpenCV (Ubuntu Only)](#custom-opencv-ubuntu-only)
+    5. [OpenPose 3D Reconstruction Demo (Windows Only)](#openpose-3d-reconstruction-demo-windows-only)
+    6. [Doxygen Documentation Autogeneration (Ubuntu Only)](#doxygen-documentation-autogeneration-ubuntu-only)
+    7. [CMake Command Line Configuration (Ubuntu Only)](#cmake-command-line-configuration-ubuntu-only)
 
 
 
@@ -216,3 +216,4 @@ If Caffe is not already present but OpenCV is, then use the below command.
 ```bash
 cmake -DOpenCV_DIR=/home/"${USER}"/softwares/opencv/build
 ```
+
diff --git a/examples/openpose/CMakeLists.txt b/examples/openpose/CMakeLists.txt
@@ -13,12 +13,12 @@ foreach(EXAMPLE_FILE ${EXAMPLE_FILES})
 
   message(STATUS "Adding Example ${EXE_NAME}")
   add_executable(${EXE_NAME} ${EXAMPLE_FILE})
-  target_link_libraries( ${EXE_NAME} openpose ${GLOG_LIBRARY} ${GFLAGS_LIBRARY} ${Caffe_LIBS})
+  target_link_libraries( ${EXE_NAME} openpose ${GLOG_LIBRARY} ${GFLAGS_LIBRARY} ${Caffe_LIBS} ${MKL_LIBS})
 
   if (WIN32)
     set_property(TARGET ${EXE_NAME} PROPERTY FOLDER "Examples")
     configure_file(${CMAKE_SOURCE_DIR}/cmake/OpenPose.vcxproj.user 
         ${CMAKE_CURRENT_BINARY_DIR}/${EXE_NAME}.vcxproj.user @ONLY) 
   endif (WIN32)
 
-endforeach()
+endforeach()
diff --git a/examples/tests/CMakeLists.txt b/examples/tests/CMakeLists.txt
@@ -13,7 +13,7 @@ foreach(EXAMPLE_FILE ${EXAMPLE_FILES})
 
   message(STATUS "Adding Example ${EXE_NAME}")
   add_executable(${EXE_NAME} ${EXAMPLE_FILE})
-  target_link_libraries( ${EXE_NAME} openpose ${GLOG_LIBRARY} ${GFLAGS_LIBRARY} ${Caffe_LIBS})
+  target_link_libraries( ${EXE_NAME} openpose ${GLOG_LIBRARY} ${GFLAGS_LIBRARY} ${Caffe_LIBS} ${MKL_LIBS})
 
   if (WIN32)
     set_property(TARGET ${EXE_NAME} PROPERTY FOLDER "Examples/Tutorial/Tests")
@@ -22,3 +22,4 @@ foreach(EXAMPLE_FILE ${EXAMPLE_FILES})
   endif (WIN32)
 
 endforeach()
+
diff --git a/examples/tutorial_add_module/CMakeLists.txt b/examples/tutorial_add_module/CMakeLists.txt
@@ -1,12 +1,12 @@
-set(EXAMPLE_FILES 
+set(EXAMPLE_FILES
     1_custom_post_processing.cpp)
 
 include(${CMAKE_SOURCE_DIR}/cmake/Utils.cmake)
 
 foreach(EXAMPLE_FILE ${EXAMPLE_FILES})
 
   get_filename_component(SOURCE_NAME ${EXAMPLE_FILE} NAME_WE)
-  
+
   if (UNIX AND NOT APPLE)
     set(EXE_NAME "${SOURCE_NAME}.bin")
   elseif (WIN32)
@@ -15,13 +15,13 @@ foreach(EXAMPLE_FILE ${EXAMPLE_FILES})
 
   message(STATUS "Adding Example ${EXE_NAME}")
   add_executable(${EXE_NAME} ${EXAMPLE_FILE})
-  target_link_libraries( ${EXE_NAME} openpose ${GLOG_LIBRARY} ${GFLAGS_LIBRARY} 
-      ${Caffe_LIBS})
-  
+  target_link_libraries( ${EXE_NAME} openpose ${GLOG_LIBRARY} ${GFLAGS_LIBRARY}
+      ${Caffe_LIBS} ${MKL_LIBS})
+
   if (WIN32)
     set_property(TARGET ${EXE_NAME} PROPERTY FOLDER "Examples/Tutorial/AddModule")
-    configure_file(${CMAKE_SOURCE_DIR}/cmake/OpenPose.vcxproj.user 
-        ${CMAKE_CURRENT_BINARY_DIR}/${EXE_NAME}.vcxproj.user @ONLY) 
+    configure_file(${CMAKE_SOURCE_DIR}/cmake/OpenPose.vcxproj.user
+        ${CMAKE_CURRENT_BINARY_DIR}/${EXE_NAME}.vcxproj.user @ONLY)
   endif (WIN32)
 
-endforeach()
+endforeach()
diff --git a/examples/tutorial_pose/CMakeLists.txt b/examples/tutorial_pose/CMakeLists.txt
@@ -14,12 +14,12 @@ foreach(EXAMPLE_FILE ${EXAMPLE_FILES})
 
   message(STATUS "Adding Example ${EXE_NAME}")
   add_executable(${EXE_NAME} ${EXAMPLE_FILE})
-  target_link_libraries(${EXE_NAME} openpose ${GLOG_LIBRARY} ${GFLAGS_LIBRARY} ${Caffe_LIBS})
+  target_link_libraries(${EXE_NAME} openpose ${GLOG_LIBRARY} ${GFLAGS_LIBRARY} ${Caffe_LIBS} ${MKL_LIBS})
 
   if (WIN32)
     set_property(TARGET ${EXE_NAME} PROPERTY FOLDER "Examples/Tutorial/Pose")
     configure_file(${CMAKE_SOURCE_DIR}/cmake/OpenPose.vcxproj.user 
         ${CMAKE_CURRENT_BINARY_DIR}/${EXE_NAME}.vcxproj.user @ONLY) 
   endif (WIN32)
 
-endforeach()
+endforeach()
diff --git a/examples/tutorial_thread/CMakeLists.txt b/examples/tutorial_thread/CMakeLists.txt
@@ -16,12 +16,12 @@ foreach(EXAMPLE_FILE ${EXAMPLE_FILES})
 
   message(STATUS "Adding Example ${EXE_NAME}")
   add_executable(${EXE_NAME} ${EXAMPLE_FILE})
-  target_link_libraries( ${EXE_NAME} openpose ${GLOG_LIBRARY} ${GFLAGS_LIBRARY} ${Caffe_LIBS})
+  target_link_libraries( ${EXE_NAME} openpose ${GLOG_LIBRARY} ${GFLAGS_LIBRARY} ${Caffe_LIBS} ${MKL_LIBS})
 
   if (WIN32)
     set_property(TARGET ${EXE_NAME} PROPERTY FOLDER "Examples/Tutorial/Thread")
     configure_file(${CMAKE_SOURCE_DIR}/cmake/OpenPose.vcxproj.user 
         ${CMAKE_CURRENT_BINARY_DIR}/${EXE_NAME}.vcxproj.user @ONLY) 
   endif (WIN32)
 
-endforeach()
+endforeach()
diff --git a/examples/tutorial_wrapper/CMakeLists.txt b/examples/tutorial_wrapper/CMakeLists.txt
@@ -17,12 +17,12 @@ foreach(EXAMPLE_FILE ${EXAMPLE_FILES})
 
   message(STATUS "Adding Example ${EXE_NAME}")
   add_executable(${EXE_NAME} ${EXAMPLE_FILE})
-  target_link_libraries( ${EXE_NAME} openpose ${GLOG_LIBRARY} ${GFLAGS_LIBRARY} ${Caffe_LIBS})
+  target_link_libraries( ${EXE_NAME} openpose ${GLOG_LIBRARY} ${GFLAGS_LIBRARY} ${Caffe_LIBS} ${MKL_LIBS})
 
   if (WIN32)
     set_property(TARGET ${EXE_NAME} PROPERTY FOLDER "Examples/Tutorial/Wrapper")
     configure_file(${CMAKE_SOURCE_DIR}/cmake/OpenPose.vcxproj.user 
         ${CMAKE_CURRENT_BINARY_DIR}/${EXE_NAME}.vcxproj.user @ONLY) 
   endif (WIN32)
 
-endforeach()
+endforeach()