Fixed Windows bugs

d80fd22c · Gines · de54408c · d80fd22c · d80fd22c · d80fd22c
5 changed file
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -78,19 +78,19 @@ The instructions in this section describe the steps to build OpenPose using CMak


 ### Prerequisites
-1. Download and install CMake GUI.
+1. Download and install CMake GUI:
    - Ubuntu: run the command `sudo apt-get install cmake-qt-gui`. Note: If you prefer to use CMake through the command line, see [Cmake Command Line Build](#cmake-command-line-build-ubuntu-only).
    - Windows: download and install the latest CMake win64-x64 msi installer from the [CMake website](https://cmake.org/download/), called `cmake-X.X.X-win64-x64.msi`.
-2. [**CUDA 8**](https://developer.nvidia.com/cuda-80-ga2-download-archive).
+2. [**CUDA 8**](https://developer.nvidia.com/cuda-80-ga2-download-archive):
    - Ubuntu: Run `ubuntu/install_cuda.sh` or alternatively download and install it from their website.
    - Windows: Install CUDA 8.0 after Visual Studio 2015 is installed to assure that the CUDA installation will generate all necessary files for VS. If CUDA was already installed, re-install CUDA after installing VS!
 3. [**cuDNN 5.1**](https://developer.nvidia.com/cudnn):
    - Ubuntu: Run `ubuntu/install_cudnn.sh` or alternatively download and install it from their website.
    - Windows (and Ubuntu if manual installation): In order to manually install it, just unzip it and copy (merge) the contents on the CUDA folder, usually `/usr/local/cuda/` in Ubuntu and `C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v8.0` in Windows.
-3. (Ubuntu):
+3. Ubuntu - Other prerequisites:
    - Caffe prerequisites: By default, OpenPose uses Caffe under the hood. If you have not used Caffe previously, install its dependencies by running `bash ./ubuntu/install_cmake.sh`.
    - OpenCV must be already installed on your machine. It can be installed with `apt-get install libopencv-dev`. You can also use your own compiled OpenCV version.
-4. (Windows): **Microsoft Visual Studio (VS) 2015 Enterprise Update 3**.
+4. Windows - **Microsoft Visual Studio (VS) 2015 Enterprise Update 3**:
    - If **Visual Studio 2017 Community** is desired, we do not officially support it, but it might be compiled by firstly [enabling CUDA 8.0 in VS2017](https://stackoverflow.com/questions/43745099/using-cuda-with-visual-studio-2017?answertab=active#tab-top) or use **VS2017 with CUDA 9** by checking the `.vcxproj` file and changing the necessary paths from CUDA 8 to 9.
    - VS 2015 Enterprise Update 1 will give some compiler errors and VS 2015 Community has not been tested.


--- a/doc/release_notes.md
+++ b/doc/release_notes.md
@@ -180,6 +180,7 @@ OpenPose Library - Release Notes
    8. Lighter Caffe version compiled by CMake in Ubuntu: disabled Caffe extra support (e.g., OpenCV, Python) and doc.
    9. Renamed CMake binaries (Ubuntu) to match old Makefile format: `_bin` by `.bin`.
    10. 3-D Reconstruction demo cleaned, implemented in Ubuntu too, and now defined as experimental module of OpenPose rather than just a demo.
+    11. CMake as default installer in documentation.
 2. Main bugs fixed:
    1. Slight speed up (~1%) for performing the non-maximum suppression stage only in the body part heatmaps channels, and not also in the PAF channels.
    2. Fixed core-dumped in PoseRenderer with GUI when changed element to be rendered to something else than skeleton.

--- a/include/openpose/wrapper/wrapperAuxiliary.hpp
+++ b/include/openpose/wrapper/wrapperAuxiliary.hpp
-#ifndef OPENPOSE_WRAPPER_AUXILIARY_HPP
-#define OPENPOSE_WRAPPER_AUXILIARY_HPP
+#ifndef OPENPOSE_WRAPPER_WRAPPER_AUXILIARY_HPP
+#define OPENPOSE_WRAPPER_WRAPPER_AUXILIARY_HPP

 #include <openpose/wrapper/wrapperStructFace.hpp>
 #include <openpose/wrapper/wrapperStructHand.hpp>
@@ -20,14 +20,14 @@ namespace op
     * @param userOutputWsEmpty
     * @param threadManagerMode
     */
-    void wrapperConfigureSecurityChecks(const WrapperStructPose& wrapperStructPose,
-                                        const WrapperStructFace& wrapperStructFace,
-                                        const WrapperStructHand& wrapperStructHand,
-                                        const WrapperStructInput& wrapperStructInput,
-                                        const WrapperStructOutput& wrapperStructOutput,
-                                        const bool renderOutput,
-                                        const bool userOutputWsEmpty,
-                                        const ThreadManagerMode threadManagerMode);
+	OP_API void wrapperConfigureSecurityChecks(const WrapperStructPose& wrapperStructPose,
+                                               const WrapperStructFace& wrapperStructFace,
+                                               const WrapperStructHand& wrapperStructHand,
+                                               const WrapperStructInput& wrapperStructInput,
+                                               const WrapperStructOutput& wrapperStructOutput,
+                                               const bool renderOutput,
+                                               const bool userOutputWsEmpty,
+                                               const ThreadManagerMode threadManagerMode);
 }

-#endif // OPENPOSE_WRAPPER_AUXILIARY_HPP
+#endif // OPENPOSE_WRAPPER_WRAPPER_AUXILIARY_HPP
--- a/windows/OpenPose/OpenPose.vcxproj
+++ b/windows/OpenPose/OpenPose.vcxproj
@@ -168,6 +168,10 @@
    <ClInclude Include="..\..\include\openpose\filestream\wPeopleJsonSaver.hpp" />
    <ClInclude Include="..\..\include\openpose\filestream\wPoseSaver.hpp" />
    <ClInclude Include="..\..\include\openpose\filestream\wVideoSaver.hpp" />
+    <ClInclude Include="..\..\include\openpose\gpu\cuda.hpp" />
+    <ClInclude Include="..\..\include\openpose\gpu\enumClasses.hpp" />
+    <ClInclude Include="..\..\include\openpose\gpu\gpu.hpp" />
+    <ClInclude Include="..\..\include\openpose\gpu\headers.hpp" />
    <ClInclude Include="..\..\include\openpose\gui\enumClasses.hpp" />
    <ClInclude Include="..\..\include\openpose\gui\frameDisplayer.hpp" />
    <ClInclude Include="..\..\include\openpose\gui\gui.hpp" />
@@ -234,7 +238,6 @@
    <ClInclude Include="..\..\include\openpose\thread\workerProducer.hpp" />
    <ClInclude Include="..\..\include\openpose\thread\wQueueOrderer.hpp" />
    <ClInclude Include="..\..\include\openpose\utilities\check.hpp" />
-    <ClInclude Include="..\..\include\openpose\utilities\cuda.hpp" />
    <ClInclude Include="..\..\include\openpose\utilities\enumClasses.hpp" />
    <ClInclude Include="..\..\include\openpose\utilities\errorAndLog.hpp" />
    <ClInclude Include="..\..\include\openpose\utilities\fastMath.hpp" />
@@ -249,6 +252,7 @@
    <ClInclude Include="..\..\include\openpose\utilities\string.hpp" />
    <ClInclude Include="..\..\include\openpose\wrapper\headers.hpp" />
    <ClInclude Include="..\..\include\openpose\wrapper\wrapper.hpp" />
+    <ClInclude Include="..\..\include\openpose\wrapper\wrapperAuxiliary.hpp" />
    <ClInclude Include="..\..\include\openpose\wrapper\wrapperStructFace.hpp" />
    <ClInclude Include="..\..\include\openpose\wrapper\wrapperStructHand.hpp" />
    <ClInclude Include="..\..\include\openpose\wrapper\wrapperStructInput.hpp" />
@@ -256,7 +260,7 @@
    <ClInclude Include="..\..\include\openpose\wrapper\wrapperStructPose.hpp" />
  </ItemGroup>
  <ItemGroup>
-    <None Include="..\..\include\openpose\utilities\cuda.hu" />
+    <None Include="..\..\include\openpose\gpu\cuda.hu" />
    <None Include="..\..\include\openpose\utilities\render.hu" />
  </ItemGroup>
  <ItemGroup>
@@ -303,6 +307,8 @@
    <ClCompile Include="..\..\src\openpose\filestream\keypointSaver.cpp" />
    <ClCompile Include="..\..\src\openpose\filestream\peopleJsonSaver.cpp" />
    <ClCompile Include="..\..\src\openpose\filestream\videoSaver.cpp" />
+    <ClCompile Include="..\..\src\openpose\gpu\cuda.cpp" />
+    <ClCompile Include="..\..\src\openpose\gpu\gpu.cpp" />
    <ClCompile Include="..\..\src\openpose\gui\defineTemplates.cpp" />
    <ClCompile Include="..\..\src\openpose\gui\frameDisplayer.cpp" />
    <ClCompile Include="..\..\src\openpose\gui\gui.cpp" />
@@ -334,7 +340,6 @@
    <ClCompile Include="..\..\src\openpose\producer\videoReader.cpp" />
    <ClCompile Include="..\..\src\openpose\producer\webcamReader.cpp" />
    <ClCompile Include="..\..\src\openpose\thread\defineTemplates.cpp" />
-    <ClCompile Include="..\..\src\openpose\utilities\cuda.cpp" />
    <ClCompile Include="..\..\src\openpose\utilities\errorAndLog.cpp" />
    <ClCompile Include="..\..\src\openpose\utilities\fileSystem.cpp" />
    <ClCompile Include="..\..\src\openpose\utilities\flagsToOpenPose.cpp" />
@@ -343,6 +348,7 @@
    <ClCompile Include="..\..\src\openpose\utilities\profiler.cpp" />
    <ClCompile Include="..\..\src\openpose\utilities\string.cpp" />
    <ClCompile Include="..\..\src\openpose\wrapper\defineTemplates.cpp" />
+    <ClCompile Include="..\..\src\openpose\wrapper\wrapperAuxiliary.cpp" />
    <ClCompile Include="..\..\src\openpose\wrapper\wrapperStructFace.cpp" />
    <ClCompile Include="..\..\src\openpose\wrapper\wrapperStructHand.cpp" />
    <ClCompile Include="..\..\src\openpose\wrapper\wrapperStructInput.cpp" />

--- a/windows/OpenPose/OpenPose.vcxproj.filters
+++ b/windows/OpenPose/OpenPose.vcxproj.filters
@@ -90,6 +90,12 @@
    <Filter Include="Header Files\experimental\3d">
      <UniqueIdentifier>{080754ef-07d7-41ed-a363-509c1202f108}</UniqueIdentifier>
    </Filter>
+    <Filter Include="Header Files\gpu">
+      <UniqueIdentifier>{01b90523-3151-4008-9799-3e664b523dc4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\gpu">
+      <UniqueIdentifier>{ffd0a630-de3e-4857-93d1-b78ed7a56c4c}</UniqueIdentifier>
+    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\include\openpose\headers.hpp">
@@ -482,9 +488,6 @@
    <ClInclude Include="..\..\include\openpose\utilities\check.hpp">
      <Filter>Header Files\utilities</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\include\openpose\utilities\cuda.hpp">
-      <Filter>Header Files\utilities</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\include\openpose\utilities\enumClasses.hpp">
      <Filter>Header Files\utilities</Filter>
    </ClInclude>
@@ -569,10 +572,25 @@
    <ClInclude Include="..\..\include\openpose\experimental\3d\renderer.hpp">
      <Filter>Header Files\experimental\3d</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\include\openpose\wrapper\wrapperAuxiliary.hpp">
+      <Filter>Header Files\wrapper</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\openpose\gpu\cuda.hpp">
+      <Filter>Header Files\gpu</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\openpose\gpu\enumClasses.hpp">
+      <Filter>Header Files\gpu</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\openpose\gpu\gpu.hpp">
+      <Filter>Header Files\gpu</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\openpose\gpu\headers.hpp">
+      <Filter>Header Files\gpu</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
-    <None Include="..\..\include\openpose\utilities\cuda.hu">
-      <Filter>Header Files\utilities</Filter>
+    <None Include="..\..\include\openpose\gpu\cuda.hu">
+      <Filter>Header Files\gpu</Filter>
    </None>
    <None Include="..\..\include\openpose\utilities\render.hu">
      <Filter>Header Files\utilities</Filter>
@@ -636,6 +654,18 @@
    <ClCompile Include="..\..\src\openpose\core\scaleAndSizeExtractor.cpp">
      <Filter>Source Files\core</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\src\openpose\experimental\3d\cameraParameters.cpp">
+      <Filter>Source Files\experimental\3d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\openpose\experimental\3d\pointGrey.cpp">
+      <Filter>Source Files\experimental\3d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\openpose\experimental\3d\reconstruction3D.cpp">
+      <Filter>Source Files\experimental\3d</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\openpose\experimental\3d\renderer.cpp">
+      <Filter>Source Files\experimental\3d</Filter>
+    </ClCompile>
    <ClCompile Include="..\..\src\openpose\face\defineTemplates.cpp">
      <Filter>Source Files\face</Filter>
    </ClCompile>
@@ -702,6 +732,12 @@
    <ClCompile Include="..\..\src\openpose\gui\guiInfoAdder.cpp">
      <Filter>Source Files\gui</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\src\openpose\gpu\cuda.cpp">
+      <Filter>Source Files\gpu</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\openpose\gpu\gpu.cpp">
+      <Filter>Source Files\gpu</Filter>
+    </ClCompile>
    <ClCompile Include="..\..\src\openpose\hand\defineTemplates.cpp">
      <Filter>Source Files\hand</Filter>
    </ClCompile>
@@ -783,9 +819,6 @@
    <ClCompile Include="..\..\src\openpose\thread\defineTemplates.cpp">
      <Filter>Source Files\thread</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\openpose\utilities\cuda.cpp">
-      <Filter>Source Files\utilities</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\src\openpose\utilities\errorAndLog.cpp">
      <Filter>Source Files\utilities</Filter>
    </ClCompile>
@@ -810,6 +843,9 @@
    <ClCompile Include="..\..\src\openpose\wrapper\defineTemplates.cpp">
      <Filter>Source Files\wrapper</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\src\openpose\wrapper\wrapperAuxiliary.cpp">
+      <Filter>Source Files\wrapper</Filter>
+    </ClCompile>
    <ClCompile Include="..\..\src\openpose\wrapper\wrapperStructFace.cpp">
      <Filter>Source Files\wrapper</Filter>
    </ClCompile>
@@ -831,18 +867,6 @@
    <ClCompile Include="..\..\src\openpose\experimental\tracking\personIdExtractor.cpp">
      <Filter>Source Files\experimental\tracking</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\src\openpose\experimental\3d\pointGrey.cpp">
-      <Filter>Source Files\experimental\3d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\openpose\experimental\3d\reconstruction3D.cpp">
-      <Filter>Source Files\experimental\3d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\openpose\experimental\3d\renderer.cpp">
-      <Filter>Source Files\experimental\3d</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\openpose\experimental\3d\cameraParameters.cpp">
-      <Filter>Source Files\experimental\3d</Filter>
-    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <CudaCompile Include="..\..\src\openpose\core\maximumBase.cu">