Net module created from core

doc/release_notes.md

@@ -200,6 +200,7 @@ OpenPose Library - Release Notes
     2. 3-D reconstruction demo is now inside the OpenPose demo binary.
     3. Renamed `*_keypoints` by `*_keypoints_2d` to avoid confusion with 3d ones in `--write_json` output file.
     4. CvMatToOpInput requires PoseModel to know the normalization to be performed.
+    5. Created `net/` module in order to reduce `core/` number of classes and files and for future scalability.
 3. 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.

examples/tests/resizeTest.cpp

@@ -8,11 +8,11 @@
 namespace gflags = google;
 #endif
 #include <openpose/headers.hpp>
-#include <openpose/core/resizeAndMergeBase.hpp>
-#ifdef USE_CUDA
-#include <caffe/net.hpp>
-#endif
 #include <openpose/gpu/cuda.hpp>
+#ifdef USE_CAFFE
+    #include <caffe/net.hpp>
+#endif
+#include <openpose/net/resizeAndMergeBase.hpp>
 
 DEFINE_string(image_path,               "examples/media/COCO_val2014_000000000192.jpg",     "Process the desired image.");
 

include/openpose/core/headers.hpp

@@ -12,16 +12,10 @@
 #include <openpose/core/keepTopNPeople.hpp>
 #include <openpose/core/keypointScaler.hpp>
 #include <openpose/core/macros.hpp>
-#include <openpose/core/net.hpp>
-#include <openpose/core/netCaffe.hpp>
-#include <openpose/core/nmsBase.hpp>
-#include <openpose/core/nmsCaffe.hpp>
 #include <openpose/core/opOutputToCvMat.hpp>
 #include <openpose/core/point.hpp>
 #include <openpose/core/rectangle.hpp>
 #include <openpose/core/renderer.hpp>
-#include <openpose/core/resizeAndMergeBase.hpp>
-#include <openpose/core/resizeAndMergeCaffe.hpp>
 #include <openpose/core/scaleAndSizeExtractor.hpp>
 #include <openpose/core/wCvMatToOpInput.hpp>
 #include <openpose/core/wCvMatToOpOutput.hpp>

include/openpose/headers.hpp

@@ -22,6 +22,9 @@
 // hand module
 #include <openpose/hand/headers.hpp>
 
+// net module
+#include <openpose/net/headers.hpp>
+
 // pose module
 #include <openpose/pose/headers.hpp>
 

include/openpose/net/headers.hpp

+#ifndef OPENPOSE_NET_HEADERS_HPP
+#define OPENPOSE_NET_HEADERS_HPP
+
+// net module
+#include <openpose/net/maximumBase.hpp>
+#include <openpose/net/maximumCaffe.hpp>
+#include <openpose/net/net.hpp>
+#include <openpose/net/netCaffe.hpp>
+#include <openpose/net/nmsBase.hpp>
+#include <openpose/net/nmsCaffe.hpp>
+#include <openpose/net/resizeAndMergeBase.hpp>
+#include <openpose/net/resizeAndMergeCaffe.hpp>
+
+#endif // OPENPOSE_NET_HEADERS_HPP

include/openpose/core/maximumBase.hpp → include/openpose/net/maximumBase.hpp

-#ifndef OPENPOSE_CORE_MAXIMUM_BASE_HPP
-#define OPENPOSE_CORE_MAXIMUM_BASE_HPP
+#ifndef OPENPOSE_NET_MAXIMUM_BASE_HPP
+#define OPENPOSE_NET_MAXIMUM_BASE_HPP
 
 #include <openpose/core/common.hpp>
 
@@ -14,4 +14,4 @@ namespace op
                            const std::array<int, 4>& sourceSize);
 }
 
-#endif // OPENPOSE_CORE_MAXIMUM_BASE_HPP
+#endif // OPENPOSE_NET_MAXIMUM_BASE_HPP

include/openpose/core/maximumCaffe.hpp → include/openpose/net/maximumCaffe.hpp

-#ifndef OPENPOSE_CORE_MAXIMUM_CAFFE_HPP
-#define OPENPOSE_CORE_MAXIMUM_CAFFE_HPP
+#ifndef OPENPOSE_NET_MAXIMUM_CAFFE_HPP
+#define OPENPOSE_NET_MAXIMUM_CAFFE_HPP
 
 #include <openpose/core/common.hpp>
 
@@ -36,4 +36,4 @@ namespace op
     };
 }
 
-#endif // OPENPOSE_CORE_MAXIMUM_CAFFE_HPP
+#endif // OPENPOSE_NET_MAXIMUM_CAFFE_HPP

include/openpose/core/net.hpp → include/openpose/net/net.hpp

-#ifndef OPENPOSE_CORE_NET_HPP
-#define OPENPOSE_CORE_NET_HPP
+#ifndef OPENPOSE_NET_NET_HPP
+#define OPENPOSE_NET_NET_HPP
 
 #include <openpose/core/common.hpp>
 
@@ -14,4 +14,4 @@ namespace op
     };
 }
 
-#endif // OPENPOSE_CORE_NET_HPP
+#endif // OPENPOSE_NET_NET_HPP

include/openpose/core/netCaffe.hpp → include/openpose/net/netCaffe.hpp

-#ifndef OPENPOSE_CORE_NET_CAFFE_HPP
-#define OPENPOSE_CORE_NET_CAFFE_HPP
+#ifndef OPENPOSE_NET_NET_CAFFE_HPP
+#define OPENPOSE_NET_NET_CAFFE_HPP
 
 #include <openpose/core/common.hpp>
-#include <openpose/core/net.hpp>
+#include <openpose/net/net.hpp>
 
 namespace op
 {
@@ -32,4 +32,4 @@ namespace op
     };
 }
 
-#endif // OPENPOSE_CORE_NET_CAFFE_HPP
+#endif // OPENPOSE_NET_NET_CAFFE_HPP

include/openpose/core/nmsBase.hpp → include/openpose/net/nmsBase.hpp

-#ifndef OPENPOSE_CORE_NMS_BASE_HPP
-#define OPENPOSE_CORE_NMS_BASE_HPP
+#ifndef OPENPOSE_NET_NMS_BASE_HPP
+#define OPENPOSE_NET_NMS_BASE_HPP
 
 #include <openpose/core/common.hpp>
 
@@ -19,4 +19,4 @@ namespace op
                        const int gpuID = 0);
 }
 
-#endif // OPENPOSE_CORE_NMS_BASE_HPP
+#endif // OPENPOSE_NET_NMS_BASE_HPP

include/openpose/core/nmsCaffe.hpp → include/openpose/net/nmsCaffe.hpp

-#ifndef OPENPOSE_CORE_NMS_CAFFE_HPP
-#define OPENPOSE_CORE_NMS_CAFFE_HPP
+#ifndef OPENPOSE_NET_NMS_CAFFE_HPP
+#define OPENPOSE_NET_NMS_CAFFE_HPP
 
 #include <openpose/core/common.hpp>
 
@@ -52,4 +52,4 @@ namespace op
     };
 }
 
-#endif // OPENPOSE_CORE_NMS_CAFFE_HPP
+#endif // OPENPOSE_NET_NMS_CAFFE_HPP

include/openpose/core/resizeAndMergeBase.hpp → include/openpose/net/resizeAndMergeBase.hpp

-#ifndef OPENPOSE_CORE_RESIZE_AND_MERGE_BASE_HPP
-#define OPENPOSE_CORE_RESIZE_AND_MERGE_BASE_HPP
+#ifndef OPENPOSE_NET_RESIZE_AND_MERGE_BASE_HPP
+#define OPENPOSE_NET_RESIZE_AND_MERGE_BASE_HPP
 
 #include <openpose/core/common.hpp>
 
@@ -25,4 +25,4 @@ namespace op
                                   const int gpuID = 0);
 }
 
-#endif // OPENPOSE_CORE_RESIZE_AND_MERGE_BASE_HPP
+#endif // OPENPOSE_NET_RESIZE_AND_MERGE_BASE_HPP

include/openpose/core/resizeAndMergeCaffe.hpp → include/openpose/net/resizeAndMergeCaffe.hpp

-#ifndef OPENPOSE_CORE_RESIZE_AND_MERGE_CAFFE_HPP
-#define OPENPOSE_CORE_RESIZE_AND_MERGE_CAFFE_HPP
+#ifndef OPENPOSE_NET_RESIZE_AND_MERGE_CAFFE_HPP
+#define OPENPOSE_NET_RESIZE_AND_MERGE_CAFFE_HPP
 
 #include <openpose/core/common.hpp>
 
@@ -53,4 +53,4 @@ namespace op
     };
 }
 
-#endif // OPENPOSE_CORE_RESIZE_AND_MERGE_CAFFE_HPP
+#endif // OPENPOSE_NET_RESIZE_AND_MERGE_CAFFE_HPP

src/openpose/core/CMakeLists.txt

@@ -8,22 +8,10 @@ set(SOURCES_OP_CORE
     gpuRenderer.cpp
     keepTopNPeople.cpp
     keypointScaler.cpp
-    maximumBase.cpp
-    maximumBase.cu
-    maximumCaffe.cpp
-    netCaffe.cpp
-    nmsBase.cpp
-    nmsBase.cu
-    nmsBaseCL.cpp
-    nmsCaffe.cpp
     opOutputToCvMat.cpp
     point.cpp
     rectangle.cpp
     renderer.cpp
-    resizeAndMergeBase.cpp
-    resizeAndMergeBase.cu
-    resizeAndMergeBaseCL.cpp
-    resizeAndMergeCaffe.cpp
     scaleAndSizeExtractor.cpp)
 
 include(${CMAKE_SOURCE_DIR}/cmake/Utils.cmake)
@@ -38,10 +26,6 @@ if (UNIX AND NOT APPLE)
     add_library(openpose_core ${SOURCES_OP_CORE})
   endif ()
 
-  add_library(caffe SHARED IMPORTED)
-  set_property(TARGET caffe PROPERTY IMPORTED_LOCATION ${Caffe_LIBS}) 
-  target_link_libraries(openpose_core caffe ${MKL_LIBS})
-
   if (BUILD_CAFFE)
     add_dependencies(openpose_core openpose_caffe)
   endif (BUILD_CAFFE)

src/openpose/face/faceExtractorCaffe.cpp

@@ -2,11 +2,11 @@
     #include <caffe/blob.hpp>
 #endif
 #include <opencv2/opencv.hpp> // CV_WARP_INVERSE_MAP, CV_INTER_LINEAR
-#include <openpose/core/maximumCaffe.hpp>
-#include <openpose/core/netCaffe.hpp>
-#include <openpose/core/resizeAndMergeCaffe.hpp>
 #include <openpose/face/faceParameters.hpp>
 #include <openpose/gpu/cuda.hpp>
+#include <openpose/net/maximumCaffe.hpp>
+#include <openpose/net/netCaffe.hpp>
+#include <openpose/net/resizeAndMergeCaffe.hpp>
 #include <openpose/utilities/fastMath.hpp>
 #include <openpose/utilities/openCv.hpp>
 #include <openpose/face/faceExtractorCaffe.hpp>

src/openpose/hand/handExtractorCaffe.cpp

@@ -2,11 +2,11 @@
     #include <caffe/blob.hpp>
 #endif
 #include <opencv2/opencv.hpp> // CV_WARP_INVERSE_MAP, CV_INTER_LINEAR
-#include <openpose/core/maximumCaffe.hpp>
-#include <openpose/core/netCaffe.hpp>
-#include <openpose/core/resizeAndMergeCaffe.hpp>
 #include <openpose/gpu/cuda.hpp>
 #include <openpose/hand/handParameters.hpp>
+#include <openpose/net/maximumCaffe.hpp>
+#include <openpose/net/netCaffe.hpp>
+#include <openpose/net/resizeAndMergeCaffe.hpp>
 #include <openpose/utilities/fastMath.hpp>
 #include <openpose/utilities/keypoint.hpp>
 #include <openpose/utilities/openCv.hpp>

src/openpose/net/CMakeLists.txt

+set(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;mm;CPP;cl)
+set(SOURCES_OP_NET
+    maximumBase.cpp
+    maximumBase.cu
+    maximumCaffe.cpp
+    netCaffe.cpp
+    nmsBase.cpp
+    nmsBase.cu
+    nmsBaseCL.cpp
+    nmsCaffe.cpp
+    resizeAndMergeBase.cpp
+    resizeAndMergeBase.cu
+    resizeAndMergeBaseCL.cpp
+    resizeAndMergeCaffe.cpp)
+
+include(${CMAKE_SOURCE_DIR}/cmake/Utils.cmake)
+prepend(SOURCES_OP_NET_WITH_CP ${CMAKE_CURRENT_SOURCE_DIR} ${SOURCES_OP_NET})
+set(SOURCES_OP_NET_WITH_CP ${SOURCES_OP_NET_WITH_CP} PARENT_SCOPE)
+set(SOURCES_OPENPOSE ${SOURCES_OPENPOSE} ${SOURCES_OP_NET_WITH_CP} PARENT_SCOPE)
+
+if (UNIX AND NOT APPLE)
+  if (${GPU_MODE} MATCHES "CUDA")
+    cuda_add_library(openpose_net ${SOURCES_OP_NET})
+  else()
+    add_library(openpose_net ${SOURCES_OP_NET})
+  endif ()
+
+  add_library(caffe SHARED IMPORTED)
+  set_property(TARGET caffe PROPERTY IMPORTED_LOCATION ${Caffe_LIBS}) 
+  target_link_libraries(openpose_net caffe ${MKL_LIBS})
+
+  if (BUILD_CAFFE)
+    add_dependencies(openpose_net openpose_caffe)
+  endif (BUILD_CAFFE)
+
+  install(TARGETS openpose_net
+      EXPORT OpenPose
+      RUNTIME DESTINATION bin
+      LIBRARY DESTINATION lib
+      ARCHIVE DESTINATION lib/openpose)
+endif (UNIX AND NOT APPLE)

src/openpose/core/maximumBase.cpp → src/openpose/net/maximumBase.cpp

 // #include <thrust/extrema.h>
-#include <openpose/core/maximumBase.hpp>
+#include <openpose/net/maximumBase.hpp>
 
 namespace op
 {

src/openpose/core/maximumBase.cu → src/openpose/net/maximumBase.cu

@@ -2,7 +2,7 @@
 #include <thrust/extrema.h>
 #include <openpose/gpu/cuda.hpp>
 #include <openpose/gpu/cuda.hpp>
-#include <openpose/core/maximumBase.hpp>
+#include <openpose/net/maximumBase.hpp>
 
 namespace op
 {

src/openpose/core/maximumCaffe.cpp → src/openpose/net/maximumCaffe.cpp

 #ifdef USE_CAFFE
     #include <caffe/blob.hpp>
 #endif
-#include <openpose/core/maximumBase.hpp>
-#include <openpose/core/maximumCaffe.hpp>
+#include <openpose/net/maximumBase.hpp>
+#include <openpose/net/maximumCaffe.hpp>
 
 namespace op
 {

src/openpose/core/netCaffe.cpp → src/openpose/net/netCaffe.cpp

@@ -14,7 +14,7 @@
 #endif
 #include <openpose/utilities/fileSystem.hpp>
 #include <openpose/utilities/standard.hpp>
-#include <openpose/core/netCaffe.hpp>
+#include <openpose/net/netCaffe.hpp>
 
 namespace op
 {

src/openpose/core/nmsBase.cpp → src/openpose/net/nmsBase.cpp

-#include <openpose/core/nmsBase.hpp>
 #include <opencv2/opencv.hpp>
+#include <openpose/net/nmsBase.hpp>
 
 namespace op
 {

src/openpose/core/nmsBase.cu → src/openpose/net/nmsBase.cu

@@ -2,7 +2,7 @@
 #include <thrust/scan.h>
 #include <openpose/gpu/cuda.hpp>
 #include <openpose/gpu/cuda.hu>
-#include <openpose/core/nmsBase.hpp>
+#include <openpose/net/nmsBase.hpp>
 
 namespace op
 {

src/openpose/core/nmsBaseCL.cpp → src/openpose/net/nmsBaseCL.cpp

@@ -7,7 +7,7 @@
     #include <openpose/gpu/cl2.hpp>
 #endif
 #include <openpose/core/common.hpp>
-#include <openpose/core/nmsBase.hpp>
+#include <openpose/net/nmsBase.hpp>
 
 namespace op
 {

src/openpose/core/nmsCaffe.cpp → src/openpose/net/nmsCaffe.cpp

 #ifdef USE_CAFFE
     #include <caffe/blob.hpp>
 #endif
-#include <openpose/core/nmsBase.hpp>
-#include <openpose/core/nmsCaffe.hpp>
+#include <openpose/net/nmsBase.hpp>
+#include <openpose/net/nmsCaffe.hpp>
 
 namespace op
 {

src/openpose/core/resizeAndMergeBase.cpp → src/openpose/net/resizeAndMergeBase.cpp

@@ -2,7 +2,7 @@
 #include <opencv2/imgproc/imgproc.hpp>
 #include <openpose/utilities/fastMath.hpp>
 #include <openpose/utilities/openCv.hpp>
-#include <openpose/core/resizeAndMergeBase.hpp>
+#include <openpose/net/resizeAndMergeBase.hpp>
 
 namespace op
 {

src/openpose/core/resizeAndMergeBase.cu → src/openpose/net/resizeAndMergeBase.cu

 #include <openpose/gpu/cuda.hpp>
 #include <openpose/gpu/cuda.hu>
-#include <openpose/core/resizeAndMergeBase.hpp>
+#include <openpose/net/resizeAndMergeBase.hpp>
 
 namespace op
 {

src/openpose/core/resizeAndMergeBaseCL.cpp → src/openpose/net/resizeAndMergeBaseCL.cpp

@@ -3,7 +3,7 @@
     #include <openpose/gpu/cl2.hpp>
 #endif
 #include <openpose/core/common.hpp>
-#include <openpose/core/resizeAndMergeBase.hpp>
+#include <openpose/net/resizeAndMergeBase.hpp>
 
 namespace op
 {

src/openpose/core/resizeAndMergeCaffe.cpp → src/openpose/net/resizeAndMergeCaffe.cpp

 #ifdef USE_CAFFE
     #include <caffe/blob.hpp>
 #endif
-#include <openpose/core/resizeAndMergeBase.hpp>
+#include <openpose/net/resizeAndMergeBase.hpp>
 #include <openpose/utilities/fastMath.hpp>
-#include <openpose/core/resizeAndMergeCaffe.hpp>
+#include <openpose/net/resizeAndMergeCaffe.hpp>
 
 namespace op
 {

src/openpose/pose/poseExtractorCaffe.cpp

 #ifdef USE_CAFFE
     #include <caffe/blob.hpp>
 #endif
-#include <openpose/core/netCaffe.hpp>
-#include <openpose/core/nmsCaffe.hpp>
-#include <openpose/core/resizeAndMergeCaffe.hpp>
 #include <openpose/gpu/cuda.hpp>
-#ifdef USE_OPENCL
-    #include <openpose/gpu/opencl.hcl>
-#endif
+#include <openpose/net/netCaffe.hpp>
+#include <openpose/net/nmsCaffe.hpp>
+#include <openpose/net/resizeAndMergeCaffe.hpp>
 #include <openpose/pose/bodyPartConnectorCaffe.hpp>
 #include <openpose/pose/poseParameters.hpp>
 #include <openpose/utilities/check.hpp>