From 19c02f92234499c71d3a32bdf3572ff901867d5b Mon Sep 17 00:00:00 2001 From: Travis CI Date: Fri, 21 Sep 2018 14:30:17 +0000 Subject: [PATCH] Deploy code docs to GitHub Pages Travis build: 385 Commit: c03fbda5eb2682c1ecd123212b515b050a9ba509 --- doxygen.log | 2 +- html/body_part_connector_base_8hpp.html | 34 +- html/body_part_connector_base_8hpp.js | 10 +- .../body_part_connector_base_8hpp_source.html | 61 ++- html/namespacemembers_c.html | 7 +- html/namespacemembers_func_c.html | 9 +- html/namespacemembers_func_g.html | 8 +- html/namespacemembers_func_p.html | 9 + html/namespacemembers_func_r.html | 6 +- html/namespacemembers_func_s.html | 5 +- html/namespacemembers_g.html | 8 +- html/namespacemembers_p.html | 9 + html/namespacemembers_r.html | 6 +- html/namespacemembers_s.html | 3 - html/namespaceop.html | 516 ++++++++++-------- html/navtree.js | 18 +- html/navtreeindex0.js | 14 +- html/navtreeindex1.js | 6 +- html/navtreeindex2.js | 6 +- html/navtreeindex3.js | 6 +- html/navtreeindex4.js | 6 +- html/navtreeindex5.js | 6 +- html/navtreeindex6.js | 6 +- html/navtreeindex7.js | 18 +- html/navtreeindex8.js | 4 +- html/navtreeindex9.js | 1 + html/pose_parameters_8hpp.html | 2 - html/pose_parameters_8hpp.js | 1 - html/pose_parameters_8hpp_source.html | 38 +- html/search/all_11.js | 2 +- html/search/all_12.js | 7 +- html/search/all_2.js | 5 +- html/search/all_6.js | 4 +- html/search/all_f.js | 3 + html/search/functions_11.js | 2 +- html/search/functions_12.js | 1 - html/search/functions_2.js | 3 +- html/search/functions_6.js | 2 - html/search/functions_f.js | 3 + 39 files changed, 476 insertions(+), 381 deletions(-) diff --git a/doxygen.log b/doxygen.log index fa64c013..c5bcc171 100644 --- a/doxygen.log +++ b/doxygen.log @@ -1215,5 +1215,5 @@ Generating file index... Generating file member index... Generating example index... finalizing index lists... -lookup cache used 4881/65536 hits=37412 misses=5221 +lookup cache used 4882/65536 hits=37480 misses=5222 finished... diff --git a/html/body_part_connector_base_8hpp.html b/html/body_part_connector_base_8hpp.html index bb800bd9..7e2fe2ee 100644 --- a/html/body_part_connector_base_8hpp.html +++ b/html/body_part_connector_base_8hpp.html @@ -125,19 +125,27 @@ Functions template<typename T > OP_API void op::connectBodyPartsCpu (Array< T > &poseKeypoints, Array< T > &poseScores, const T *const heatMapPtr, const T *const peaksPtr, const PoseModel poseModel, const Point< int > &heatMapSize, const int maxPeaks, const T interMinAboveThreshold, const T interThreshold, const int minSubsetCnt, const T minSubsetScore, const T scaleFactor=1.f)   -template<typename T > -OP_API void op::connectBodyPartsGpu (Array< T > &poseKeypoints, Array< T > &poseScores, const T *const heatMapGpuPtr, const T *const peaksPtr, const PoseModel poseModel, const Point< int > &heatMapSize, const int maxPeaks, const T interMinAboveThreshold, const T interThreshold, const int minSubsetCnt, const T minSubsetScore, const T scaleFactor=1.f, Array< T > finalOutputCpu=Array< T >{}, T *finalOutputGpuPtr=nullptr, const unsigned int *const bodyPartPairsGpuPtr=nullptr, const unsigned int *const mapIdxGpuPtr=nullptr, const T *const peaksGpuPtr=nullptr) -  -template<typename T > -OP_API std::vector< std::pair
-< std::vector< int >, double > > op::generateInitialSubsets (const T *const heatMapPtr, const T *const peaksPtr, const PoseModel poseModel, const Point< int > &heatMapSize, const int maxPeaks, const T interThreshold, const T interMinAboveThreshold, const std::vector< unsigned int > &bodyPartPairs, const unsigned int numberBodyParts, const unsigned int numberBodyPartPairs, const unsigned int subsetCounterIndex, const Array< T > &precomputedPAFs=Array< T >()) -  -template<typename T > -OP_API void op::removeSubsetsBelowThresholds (std::vector< int > &validSubsetIndexes, int &numberPeople, const std::vector< std::pair< std::vector< int >, double >> &subsets, const unsigned int subsetCounterIndex, const unsigned int numberBodyParts, const int minSubsetCnt, const T minSubsetScore, const int maxPeaks) -  -template<typename T > -OP_API void op::subsetsToPoseKeypointsAndScores (Array< T > &poseKeypoints, Array< T > &poseScores, const T scaleFactor, const std::vector< std::pair< std::vector< int >, double >> &subsets, const std::vector< int > &validSubsetIndexes, const T *const peaksPtr, const int numberPeople, const unsigned int numberBodyParts, const unsigned int numberBodyPartPairs) -  +template<typename T > +OP_API void op::connectBodyPartsGpu (Array< T > &poseKeypoints, Array< T > &poseScores, const T *const heatMapGpuPtr, const T *const peaksPtr, const PoseModel poseModel, const Point< int > &heatMapSize, const int maxPeaks, const T interMinAboveThreshold, const T interThreshold, const int minSubsetCnt, const T minSubsetScore, const T scaleFactor=1.f, Array< T > pairScoresCpu=Array< T >{}, T *pairScoresGpuPtr=nullptr, const unsigned int *const bodyPartPairsGpuPtr=nullptr, const unsigned int *const mapIdxGpuPtr=nullptr, const T *const peaksGpuPtr=nullptr) +  +template<typename T > +OP_API std::vector< std::pair
+< std::vector< int >, T > > op::createPeopleVector (const T *const heatMapPtr, const T *const peaksPtr, const PoseModel poseModel, const Point< int > &heatMapSize, const int maxPeaks, const T interThreshold, const T interMinAboveThreshold, const std::vector< unsigned int > &bodyPartPairs, const unsigned int numberBodyParts, const unsigned int numberBodyPartPairs, const Array< T > &precomputedPAFs=Array< T >()) +  +template<typename T > +OP_API void op::removePeopleBelowThresholds (std::vector< int > &validSubsetIndexes, int &numberPeople, const std::vector< std::pair< std::vector< int >, T >> &subsets, const unsigned int numberBodyParts, const int minSubsetCnt, const T minSubsetScore, const int maxPeaks) +  +template<typename T > +OP_API void op::peopleVectorToPeopleArray (Array< T > &poseKeypoints, Array< T > &poseScores, const T scaleFactor, const std::vector< std::pair< std::vector< int >, T >> &subsets, const std::vector< int > &validSubsetIndexes, const T *const peaksPtr, const int numberPeople, const unsigned int numberBodyParts, const unsigned int numberBodyPartPairs) +  +template<typename T > +OP_API std::vector< std::tuple
+< T, T, int, int, int > > op::pafPtrIntoVector (const Array< T > &pairScores, const T *const peaksPtr, const int maxPeaks, const std::vector< unsigned int > &bodyPartPairs, const unsigned int numberBodyPartPairs) +  +template<typename T > +OP_API std::vector< std::pair
+< std::vector< int >, T > > op::pafVectorIntoPeopleVector (const std::vector< std::tuple< T, T, int, int, int >> &pairScores, const T *const peaksPtr, const int maxPeaks, const std::vector< unsigned int > &bodyPartPairs, const unsigned int numberBodyParts) +  diff --git a/html/body_part_connector_base_8hpp.js b/html/body_part_connector_base_8hpp.js index 7ffec9a0..a651fa02 100644 --- a/html/body_part_connector_base_8hpp.js +++ b/html/body_part_connector_base_8hpp.js @@ -1,8 +1,10 @@ var body_part_connector_base_8hpp = [ [ "connectBodyPartsCpu", "body_part_connector_base_8hpp.html#a708e05033d5c51c3a3ff5d4ed621ebbf", null ], - [ "connectBodyPartsGpu", "body_part_connector_base_8hpp.html#a9277202c8aa9f50591d2da8f46708482", null ], - [ "generateInitialSubsets", "body_part_connector_base_8hpp.html#a4ada5e56ab4773b99b3a29ba2fafc385", null ], - [ "removeSubsetsBelowThresholds", "body_part_connector_base_8hpp.html#afa14183f5226b602154559fc94d49dff", null ], - [ "subsetsToPoseKeypointsAndScores", "body_part_connector_base_8hpp.html#a7840872b74edcb234b70e396fa35d7d6", null ] + [ "connectBodyPartsGpu", "body_part_connector_base_8hpp.html#af0729592a064c2d73c0905def90ecaad", null ], + [ "createPeopleVector", "body_part_connector_base_8hpp.html#ac4c0c08d800a5af6e1e9d3778fb01d3b", null ], + [ "pafPtrIntoVector", "body_part_connector_base_8hpp.html#a53027f965d0135a14454d9a1d88fc975", null ], + [ "pafVectorIntoPeopleVector", "body_part_connector_base_8hpp.html#a15fe0812436c48a912e0382c5c42a9b4", null ], + [ "peopleVectorToPeopleArray", "body_part_connector_base_8hpp.html#aefbab71714231e993354f8174e6d1124", null ], + [ "removePeopleBelowThresholds", "body_part_connector_base_8hpp.html#a42480d27998e91461610be265e1a954b", null ] ]; \ No newline at end of file diff --git a/html/body_part_connector_base_8hpp_source.html b/html/body_part_connector_base_8hpp_source.html index 6d3ed16f..7767d25b 100644 --- a/html/body_part_connector_base_8hpp_source.html +++ b/html/body_part_connector_base_8hpp_source.html @@ -122,49 +122,60 @@ $(document).ready(function(){initNavTree('body_part_connector_base_8hpp_source.h
13  const int minSubsetCnt, const T minSubsetScore, const T scaleFactor = 1.f);
14 
15  template <typename T>
-
16  OP_API void connectBodyPartsGpu(Array<T>& poseKeypoints, Array<T>& poseScores, const T* const heatMapGpuPtr,
+
16  OP_API void connectBodyPartsGpu(Array<T>& poseKeypoints, Array<T>& poseScores, const T* const heatMapGpuPtr,
17  const T* const peaksPtr, const PoseModel poseModel, const Point<int>& heatMapSize,
18  const int maxPeaks, const T interMinAboveThreshold, const T interThreshold,
19  const int minSubsetCnt, const T minSubsetScore, const T scaleFactor = 1.f,
-
20  Array<T> finalOutputCpu = Array<T>{}, T* finalOutputGpuPtr = nullptr,
+
20  Array<T> pairScoresCpu = Array<T>{}, T* pairScoresGpuPtr = nullptr,
21  const unsigned int* const bodyPartPairsGpuPtr = nullptr,
22  const unsigned int* const mapIdxGpuPtr = nullptr,
23  const T* const peaksGpuPtr = nullptr);
24 
25  // Private functions used by the 2 above functions
26  template <typename T>
-
27  OP_API std::vector<std::pair<std::vector<int>, double>> generateInitialSubsets(
+
27  OP_API std::vector<std::pair<std::vector<int>, T>> createPeopleVector(
28  const T* const heatMapPtr, const T* const peaksPtr, const PoseModel poseModel, const Point<int>& heatMapSize,
29  const int maxPeaks, const T interThreshold, const T interMinAboveThreshold,
30  const std::vector<unsigned int>& bodyPartPairs, const unsigned int numberBodyParts,
-
31  const unsigned int numberBodyPartPairs, const unsigned int subsetCounterIndex,
-
32  const Array<T>& precomputedPAFs = Array<T>());
-
33 
-
34  template <typename T>
-
35  OP_API void removeSubsetsBelowThresholds(std::vector<int>& validSubsetIndexes, int& numberPeople,
-
36  const std::vector<std::pair<std::vector<int>, double>>& subsets,
-
37  const unsigned int subsetCounterIndex, const unsigned int numberBodyParts,
-
38  const int minSubsetCnt, const T minSubsetScore, const int maxPeaks);
-
39 
-
40  template <typename T>
-
41  OP_API void subsetsToPoseKeypointsAndScores(Array<T>& poseKeypoints, Array<T>& poseScores, const T scaleFactor,
-
42  const std::vector<std::pair<std::vector<int>, double>>& subsets,
-
43  const std::vector<int>& validSubsetIndexes, const T* const peaksPtr,
-
44  const int numberPeople, const unsigned int numberBodyParts,
-
45  const unsigned int numberBodyPartPairs);
-
46 }
-
47 
-
48 #endif // OPENPOSE_POSE_BODY_PARTS_CONNECTOR_HPP
+
31  const unsigned int numberBodyPartPairs, const Array<T>& precomputedPAFs = Array<T>());
+
32 
+
33  template <typename T>
+
34  OP_API void removePeopleBelowThresholds(std::vector<int>& validSubsetIndexes, int& numberPeople,
+
35  const std::vector<std::pair<std::vector<int>, T>>& subsets,
+
36  const unsigned int numberBodyParts, const int minSubsetCnt,
+
37  const T minSubsetScore, const int maxPeaks);
+
38 
+
39  template <typename T>
+
40  OP_API void peopleVectorToPeopleArray(Array<T>& poseKeypoints, Array<T>& poseScores, const T scaleFactor,
+
41  const std::vector<std::pair<std::vector<int>, T>>& subsets,
+
42  const std::vector<int>& validSubsetIndexes, const T* const peaksPtr,
+
43  const int numberPeople, const unsigned int numberBodyParts,
+
44  const unsigned int numberBodyPartPairs);
+
45 
+
46  template <typename T>
+
47  OP_API std::vector<std::tuple<T, T, int, int, int>> pafPtrIntoVector(
+
48  const Array<T>& pairScores, const T* const peaksPtr, const int maxPeaks,
+
49  const std::vector<unsigned int>& bodyPartPairs, const unsigned int numberBodyPartPairs);
+
50 
+
51  template <typename T>
+
52  OP_API std::vector<std::pair<std::vector<int>, T>> pafVectorIntoPeopleVector(
+
53  const std::vector<std::tuple<T, T, int, int, int>>& pairScores, const T* const peaksPtr, const int maxPeaks,
+
54  const std::vector<unsigned int>& bodyPartPairs, const unsigned int numberBodyParts);
+
55 }
+
56 
+
57 #endif // OPENPOSE_POSE_BODY_PARTS_CONNECTOR_HPP
enumClasses.hpp
-
op::connectBodyPartsGpu
OP_API void connectBodyPartsGpu(Array< T > &poseKeypoints, Array< T > &poseScores, const T *const heatMapGpuPtr, const T *const peaksPtr, const PoseModel poseModel, const Point< int > &heatMapSize, const int maxPeaks, const T interMinAboveThreshold, const T interThreshold, const int minSubsetCnt, const T minSubsetScore, const T scaleFactor=1.f, Array< T > finalOutputCpu=Array< T >{}, T *finalOutputGpuPtr=nullptr, const unsigned int *const bodyPartPairsGpuPtr=nullptr, const unsigned int *const mapIdxGpuPtr=nullptr, const T *const peaksGpuPtr=nullptr)
+
op::createPeopleVector
OP_API std::vector< std::pair< std::vector< int >, T > > createPeopleVector(const T *const heatMapPtr, const T *const peaksPtr, const PoseModel poseModel, const Point< int > &heatMapSize, const int maxPeaks, const T interThreshold, const T interMinAboveThreshold, const std::vector< unsigned int > &bodyPartPairs, const unsigned int numberBodyParts, const unsigned int numberBodyPartPairs, const Array< T > &precomputedPAFs=Array< T >())
op::PoseModel
PoseModel
Definition: enumClasses.hpp:9
-
op::generateInitialSubsets
OP_API std::vector< std::pair< std::vector< int >, double > > generateInitialSubsets(const T *const heatMapPtr, const T *const peaksPtr, const PoseModel poseModel, const Point< int > &heatMapSize, const int maxPeaks, const T interThreshold, const T interMinAboveThreshold, const std::vector< unsigned int > &bodyPartPairs, const unsigned int numberBodyParts, const unsigned int numberBodyPartPairs, const unsigned int subsetCounterIndex, const Array< T > &precomputedPAFs=Array< T >())
+
op::removePeopleBelowThresholds
OP_API void removePeopleBelowThresholds(std::vector< int > &validSubsetIndexes, int &numberPeople, const std::vector< std::pair< std::vector< int >, T >> &subsets, const unsigned int numberBodyParts, const int minSubsetCnt, const T minSubsetScore, const int maxPeaks)
op::connectBodyPartsCpu
OP_API void connectBodyPartsCpu(Array< T > &poseKeypoints, Array< T > &poseScores, const T *const heatMapPtr, const T *const peaksPtr, const PoseModel poseModel, const Point< int > &heatMapSize, const int maxPeaks, const T interMinAboveThreshold, const T interThreshold, const int minSubsetCnt, const T minSubsetScore, const T scaleFactor=1.f)
+
op::pafPtrIntoVector
OP_API std::vector< std::tuple< T, T, int, int, int > > pafPtrIntoVector(const Array< T > &pairScores, const T *const peaksPtr, const int maxPeaks, const std::vector< unsigned int > &bodyPartPairs, const unsigned int numberBodyPartPairs)
common.hpp
-
op::removeSubsetsBelowThresholds
OP_API void removeSubsetsBelowThresholds(std::vector< int > &validSubsetIndexes, int &numberPeople, const std::vector< std::pair< std::vector< int >, double >> &subsets, const unsigned int subsetCounterIndex, const unsigned int numberBodyParts, const int minSubsetCnt, const T minSubsetScore, const int maxPeaks)
-
op::subsetsToPoseKeypointsAndScores
OP_API void subsetsToPoseKeypointsAndScores(Array< T > &poseKeypoints, Array< T > &poseScores, const T scaleFactor, const std::vector< std::pair< std::vector< int >, double >> &subsets, const std::vector< int > &validSubsetIndexes, const T *const peaksPtr, const int numberPeople, const unsigned int numberBodyParts, const unsigned int numberBodyPartPairs)
+
op::peopleVectorToPeopleArray
OP_API void peopleVectorToPeopleArray(Array< T > &poseKeypoints, Array< T > &poseScores, const T scaleFactor, const std::vector< std::pair< std::vector< int >, T >> &subsets, const std::vector< int > &validSubsetIndexes, const T *const peaksPtr, const int numberPeople, const unsigned int numberBodyParts, const unsigned int numberBodyPartPairs)
+
op::pafVectorIntoPeopleVector
OP_API std::vector< std::pair< std::vector< int >, T > > pafVectorIntoPeopleVector(const std::vector< std::tuple< T, T, int, int, int >> &pairScores, const T *const peaksPtr, const int maxPeaks, const std::vector< unsigned int > &bodyPartPairs, const unsigned int numberBodyParts)
cl::vector
std::vector< T, Alloc > vector
Definition: cl2.hpp:567
OP_API
#define OP_API
Definition: macros.hpp:16
+
op::connectBodyPartsGpu
OP_API void connectBodyPartsGpu(Array< T > &poseKeypoints, Array< T > &poseScores, const T *const heatMapGpuPtr, const T *const peaksPtr, const PoseModel poseModel, const Point< int > &heatMapSize, const int maxPeaks, const T interMinAboveThreshold, const T interThreshold, const int minSubsetCnt, const T minSubsetScore, const T scaleFactor=1.f, Array< T > pairScoresCpu=Array< T >{}, T *pairScoresGpuPtr=nullptr, const unsigned int *const bodyPartPairsGpuPtr=nullptr, const unsigned int *const mapIdxGpuPtr=nullptr, const T *const peaksGpuPtr=nullptr)
diff --git a/html/namespacemembers_c.html b/html/namespacemembers_c.html index fccc6c80..2981202f 100644 --- a/html/namespacemembers_c.html +++ b/html/namespacemembers_c.html @@ -194,7 +194,7 @@ $(document).ready(function(){initNavTree('namespacemembers_c.html','');}); : op
  • connectBodyPartsGpu() -: op +: op
  • ConnectInterMinAboveThreshold : op @@ -209,11 +209,14 @@ $(document).ready(function(){initNavTree('namespacemembers_c.html','');}); : op
  • copy() -: cl +: cl
  • Cpu : op
    • +
  • createPeopleVector() +: op +
  • Cuda : op
    • diff --git a/html/namespacemembers_func_c.html b/html/namespacemembers_func_c.html index 6fe2ab56..2ae19f4e 100644 --- a/html/namespacemembers_func_c.html +++ b/html/namespacemembers_func_c.html @@ -166,16 +166,19 @@ $(document).ready(function(){initNavTree('namespacemembers_func_c.html','');}); : op
  • COMPILE_TEMPLATE_DATUM() -: op +: op
  • connectBodyPartsCpu() : op
  • connectBodyPartsGpu() -: op +: op
  • copy() -: cl +: cl +
    • +
  • createPeopleVector() +: op
  • cudaCheck() : op diff --git a/html/namespacemembers_func_g.html b/html/namespacemembers_func_g.html index 2015f5bf..0732a2b1 100644 --- a/html/namespacemembers_func_g.html +++ b/html/namespacemembers_func_g.html @@ -138,9 +138,6 @@ $(document).ready(function(){initNavTree('namespacemembers_func_g.html','');});  

    - g -