Slight speed up: NMS only on body parts

lg12170226 · Jan 9, 2018 · 07870d7 · 07870d7
1 parent 6e81592
commit 07870d7
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/doc/release_notes.md b/doc/release_notes.md
@@ -169,3 +169,7 @@ OpenPose Library - Release Notes
 
 
 ## Current version (future OpenPose 1.3.0)
+1. Main improvements:
+    1. Output of `--write_json` uses less hard disk space (enters and tabs removed).
+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.
diff --git a/include/openpose/core/nmsCaffe.hpp b/include/openpose/core/nmsCaffe.hpp
@@ -19,7 +19,7 @@ namespace op
         virtual void LayerSetUp(const std::vector<caffe::Blob<T>*>& bottom, const std::vector<caffe::Blob<T>*>& top);
 
         virtual void Reshape(const std::vector<caffe::Blob<T>*>& bottom, const std::vector<caffe::Blob<T>*>& top,
-                             const int maxPeaks);
+                             const int maxPeaks, const int outputChannels = -1);
 
         virtual inline const char* type() const { return "Nms"; }
 

diff --git a/include/openpose/filestream/wPeopleJsonSaver.hpp b/include/openpose/filestream/wPeopleJsonSaver.hpp
@@ -58,7 +58,7 @@ namespace op
                 const auto& tDatumFirst = (*tDatums)[0];
                 const auto baseFileName = (!tDatumFirst.name.empty() ? tDatumFirst.name
                                             : std::to_string(tDatumFirst.id)) + "_keypoints";
-                const bool humanReadable = true;
+                const bool humanReadable = false;
                 for (auto i = 0u ; i < tDatums->size() ; i++)
                 {
                     const auto& tDatum = (*tDatums)[i];

diff --git a/src/openpose/core/nmsCaffe.cpp b/src/openpose/core/nmsCaffe.cpp
@@ -63,7 +63,7 @@ namespace op
 
     template <typename T>
     void NmsCaffe<T>::Reshape(const std::vector<caffe::Blob<T>*>& bottom, const std::vector<caffe::Blob<T>*>& top,
-                              const int maxPeaks)
+                              const int maxPeaks, const int outputChannels)
     {
         try
         {
@@ -76,7 +76,7 @@ namespace op
 
                 // Top shape
                 std::vector<int> topShape{bottomShape};
-                topShape[1] = bottomShape[1]-1; // Number parts + bck - 1
+                topShape[1] = (outputChannels > 0 ? outputChannels : bottomShape[1]);
                 topShape[2] = maxPeaks+1; // # maxPeaks + 1
                 topShape[3] = 3;  // X, Y, score
                 topBlob->Reshape(topShape);

diff --git a/src/openpose/pose/poseExtractorCaffe.cpp b/src/openpose/pose/poseExtractorCaffe.cpp
@@ -84,7 +84,8 @@ namespace op
                 resizeAndMergeCaffe->Reshape(caffeNetOutputBlobs, {heatMapsBlob.get()},
                                              getPoseNetDecreaseFactor(poseModel), 1.f/scaleInputToNetInput);
                 // Pose extractor blob and layer
-                nmsCaffe->Reshape({heatMapsBlob.get()}, {peaksBlob.get()}, getPoseMaxPeaks(poseModel));
+                nmsCaffe->Reshape({heatMapsBlob.get()}, {peaksBlob.get()}, getPoseMaxPeaks(poseModel),
+                                  getPoseNumberBodyParts(poseModel));
                 // Pose extractor blob and layer
                 bodyPartConnectorCaffe->Reshape({heatMapsBlob.get(), peaksBlob.get()});
                 // Cuda check