MKL to fixed version

CMakeLists.txt

@@ -434,7 +434,8 @@ if (UNIX AND NOT APPLE)
         execute_process(COMMAND git checkout master WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/caffe)
       elseif (${GPU_MODE} MATCHES "CPU_ONLY")
         if (USE_MKL)
-          execute_process(COMMAND git checkout intel WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/caffe)
+          #execute_process(COMMAND git checkout intel WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/caffe)
+          execute_process(COMMAND git checkout b6712ce WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/caffe)
           execute_process(COMMAND sh prepare_mkl.sh WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/caffe/external/mkl
               OUTPUT_VARIABLE rv)
           set( MLIST ${rv} )
@@ -446,12 +447,23 @@ if (UNIX AND NOT APPLE)
             )
           file(COPY ${MKL_SO} DESTINATION ${CMAKE_BINARY_DIR}/caffe)
 
+          # New MLSL Lib
+          #execute_process(COMMAND sh prepare_mlsl.sh WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/caffe/external/mlsl
+          #    OUTPUT_VARIABLE rv)
+          #set( MLIST ${rv} )
+          #separate_arguments(MLIST)
+          #list(GET MLIST 0 MLSL_PATH)
+          #message(STATUS ${MLSL_PATH})
+          #file(GLOB MLSL_SO
+          #  "${MLSL_PATH}/intel64/lib/*"
+          #  )
+          #file(COPY ${MLSL_SO} DESTINATION ${CMAKE_BINARY_DIR}/caffe)
+
           set(MKL_LIBS
+            #"${CMAKE_BINARY_DIR}/caffe/libmlsl.so"
             "${CMAKE_BINARY_DIR}/caffe/libiomp5.so"
             "${CMAKE_BINARY_DIR}/caffe/libmklml_intel.so"
-            "${CMAKE_BINARY_DIR}/caffe/lib/libmkldnn.so.0"
             "${CMAKE_BINARY_DIR}/caffe/lib/libmkldnn.so"
-            "${CMAKE_BINARY_DIR}/caffe/lib/libmkldnn.so.0.12.0"
             )
         else ()
           execute_process(COMMAND git checkout master WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/3rdparty/caffe)

README.md

@@ -132,7 +132,7 @@ Just comment on GitHub or make a pull request and we will answer as soon as poss
 
 
 ## Authors and Contributors
-OpenPose is authored by [Gines Hidalgo](https://www.gineshidalgo.com/), [Zhe Cao](http://www.andrew.cmu.edu/user/zhecao), [Tomas Simon](http://www.cs.cmu.edu/~tsimon/), [Shih-En Wei](https://scholar.google.com/citations?user=sFQD3k4AAAAJ&hl=en), [Hanbyul Joo](http://www.cs.cmu.edu/~hanbyulj/), and [Yaser Sheikh](http://www.cs.cmu.edu/~yaser/). Currently, it is being maintained by [Gines Hidalgo](https://www.gineshidalgo.com/), [Bikramjot Hanzra](https://www.linkedin.com/in/bikz05), and [Yaadhav Raaj](https://www.linkedin.com/in/yaadhavraaj). The [original CVPR 2017 repo](https://github.com/ZheC/Multi-Person-Pose-Estimation) includes Matlab and Python versions, as well as the training code. The body pose estimation work is based on [the original ECCV 2016 demo](https://github.com/CMU-Perceptual-Computing-Lab/caffe_rtpose).
+OpenPose is authored by [Gines Hidalgo](https://www.gineshidalgo.com/), [Zhe Cao](http://www.andrew.cmu.edu/user/zhecao), [Tomas Simon](http://www.cs.cmu.edu/~tsimon/), [Shih-En Wei](https://scholar.google.com/citations?user=sFQD3k4AAAAJ&hl=en), [Hanbyul Joo](http://www.cs.cmu.edu/~hanbyulj/), and [Yaser Sheikh](http://www.cs.cmu.edu/~yaser/). Currently, it is being maintained by [Gines Hidalgo](https://www.gineshidalgo.com/) and [Yaadhav Raaj](https://www.linkedin.com/in/yaadhavraaj). The [original CVPR 2017 repo](https://github.com/ZheC/Multi-Person-Pose-Estimation) includes Matlab and Python versions, as well as the training code. The body pose estimation work is based on [the original ECCV 2016 demo](https://github.com/CMU-Perceptual-Computing-Lab/caffe_rtpose).
 
 In addition, OpenPose would not be possible without the [CMU Panoptic Studio dataset](http://domedb.perception.cs.cmu.edu/).
 

doc/contributors.md

@@ -11,6 +11,6 @@ OpenPose is authored by [Gines Hidalgo](https://www.gineshidalgo.com/), [Zhe Cao
 ### Contributors
 We would also like to thank the following people who have highly contributed to OpenPose:
 
-1. [Bikramjot Hanzra](https://www.linkedin.com/in/bikz05): OpenPose maintainer, CMake (Ubuntu and Windows) version, and Travis Build.
-2. [Yaadhav Raaj](https://www.linkedin.com/in/yaadhavraaj): OpenPose maintainer, CPU version, and OpenCL version.
+1. [Yaadhav Raaj](https://www.linkedin.com/in/yaadhavraaj): OpenPose maintainer, CPU version, and OpenCL version.
+2. [Bikramjot Hanzra](https://www.linkedin.com/in/bikz05): former OpenPose maintainer, CMake (Ubuntu and Windows) version, and Travis Build.
 3. [Helen Medina](https://github.com/helen-medina): Initial Windows version.

doc/faq.md

@@ -7,7 +7,7 @@ OpenPose - Frequently Asked Question (FAQ)
     2. [Speed Up and Benchmark](#speed-up-and-benchmark)
     3. [Estimating FPS without Display](#estimating-fps-without-display)
     4. [Webcam Slower than Images](#webcam-slower-than-images)
-    5. [Vide/Webcam Not Working](#video-webcam-not-working)
+    5. [Video/Webcam Not Working](#videowebcam-not-working)
     6. [Cannot Find OpenPose.dll Error](#cannot-find-openpose.dll-error-windows)
     7. [Free Invalid Pointer Error](#free-invalid-pointer-error)
     8. [Source Directory does not Contain CMakeLists.txt (Windows)](#source-directory-does-not-contain-cmakelists.txt-windows)