From 214808f4caafdcebd8bf1bcbb932244ab71b0bc5 Mon Sep 17 00:00:00 2001 From: Gines Hidalgo Date: Mon, 8 Apr 2019 13:16:08 -0400 Subject: [PATCH] Avoided duplicated function names --- include/openpose/gpu/cuda.hu | 42 +++++++++++----------- include/openpose/utilities/render.hu | 2 +- src/openpose/face/renderFace.cu | 4 +-- src/openpose/hand/renderHand.cu | 4 +-- src/openpose/pose/renderPose.cu | 54 ++++++++++++++-------------- 5 files changed, 53 insertions(+), 53 deletions(-) diff --git a/include/openpose/gpu/cuda.hu b/include/openpose/gpu/cuda.hu index a039791a..b837dab5 100644 --- a/include/openpose/gpu/cuda.hu +++ b/include/openpose/gpu/cuda.hu @@ -14,77 +14,77 @@ namespace op // Round functions // Signed template - inline __device__ char positiveCharRound(const T a) + inline __device__ char positiveCharRoundCuda(const T a) { return char(a+0.5f); } template - inline __device__ signed char positiveSCharRound(const T a) + inline __device__ signed char positiveSCharRoundCuda(const T a) { return (signed char)(a+0.5f); } template - inline __device__ int positiveIntRound(const T a) + inline __device__ int positiveIntRoundCuda(const T a) { return int(a+0.5f); } template - inline __device__ long positiveLongRound(const T a) + inline __device__ long positiveLongRoundCuda(const T a) { return long(a+0.5f); } template - inline __device__ long long positiveLongLongRound(const T a) + inline __device__ long long positiveLongLongRoundCuda(const T a) { return (long long)(a+0.5f); } // Unsigned template - inline __device__ unsigned char uCharRound(const T a) + inline __device__ unsigned char uCharRoundCuda(const T a) { return (unsigned char)(a+0.5f); } template - inline __device__ unsigned int uIntRound(const T a) + inline __device__ unsigned int uIntRoundCuda(const T a) { return (unsigned int)(a+0.5f); } template - inline __device__ unsigned long ulongRound(const T a) + inline __device__ unsigned long ulongRoundCuda(const T a) { return (unsigned long)(a+0.5f); } template - inline __device__ unsigned long long uLongLongRound(const T a) + inline __device__ unsigned long long uLongLongRoundCuda(const T a) { return (unsigned long long)(a+0.5f); } // Max/min functions template - inline __device__ T fastMax(T a, T b) + inline __device__ T fastMaxCuda(T a, T b) { return (a > b ? a : b); } template - inline __device__ T fastMin(T a, T b) + inline __device__ T fastMinCuda(T a, T b) { return (a < b ? a : b); } template - inline __device__ T fastTruncate(T value, T min = 0, T max = 1) + inline __device__ T fastTruncateCuda(T value, T min = 0, T max = 1) { - return fastMin(max, fastMax(min, value)); + return fastMinCuda(max, fastMaxCuda(min, value)); } // Cubic interpolation @@ -92,16 +92,16 @@ namespace op inline __device__ void cubicSequentialData(int* xIntArray, int* yIntArray, T& dx, T& dy, const T xSource, const T ySource, const int width, const int height) { - xIntArray[1] = fastTruncate(int(xSource + 1e-5), 0, width - 1); - xIntArray[0] = fastMax(0, xIntArray[1] - 1); - xIntArray[2] = fastMin(width - 1, xIntArray[1] + 1); - xIntArray[3] = fastMin(width - 1, xIntArray[2] + 1); + xIntArray[1] = fastTruncateCuda(int(xSource + 1e-5), 0, width - 1); + xIntArray[0] = fastMaxCuda(0, xIntArray[1] - 1); + xIntArray[2] = fastMinCuda(width - 1, xIntArray[1] + 1); + xIntArray[3] = fastMinCuda(width - 1, xIntArray[2] + 1); dx = xSource - xIntArray[1]; - yIntArray[1] = fastTruncate(int(ySource + 1e-5), 0, height - 1); - yIntArray[0] = fastMax(0, yIntArray[1] - 1); - yIntArray[2] = fastMin(height - 1, yIntArray[1] + 1); - yIntArray[3] = fastMin(height - 1, yIntArray[2] + 1); + yIntArray[1] = fastTruncateCuda(int(ySource + 1e-5), 0, height - 1); + yIntArray[0] = fastMaxCuda(0, yIntArray[1] - 1); + yIntArray[2] = fastMinCuda(height - 1, yIntArray[1] + 1); + yIntArray[3] = fastMinCuda(height - 1, yIntArray[2] + 1); dy = ySource - yIntArray[1]; } diff --git a/include/openpose/utilities/render.hu b/include/openpose/utilities/render.hu index 66eee7e7..4948f373 100644 --- a/include/openpose/utilities/render.hu +++ b/include/openpose/utilities/render.hu @@ -44,7 +44,7 @@ namespace op const auto averageX = sharedMaxs[globalIdx].x - sharedMins[globalIdx].x; const auto averageY = sharedMaxs[globalIdx].y - sharedMins[globalIdx].y; // (averageX + averageY) / 2.f / 400.f - sharedScaleF[globalIdx] = fastTruncate((averageX + averageY) / 400.f, 0.33f, 1.f); + sharedScaleF[globalIdx] = fastTruncateCuda((averageX + averageY) / 400.f, 0.33f, 1.f); const auto constantToAdd = 50.f; sharedMaxs[globalIdx].x += constantToAdd; sharedMaxs[globalIdx].y += constantToAdd; diff --git a/src/openpose/face/renderFace.cu b/src/openpose/face/renderFace.cu index 7a4d0602..898a3392 100644 --- a/src/openpose/face/renderFace.cu +++ b/src/openpose/face/renderFace.cu @@ -27,8 +27,8 @@ namespace op const auto numberPartPairs = sizeof(PART_PAIRS_GPU) / (2*sizeof(PART_PAIRS_GPU[0])); const auto numberScales = sizeof(SCALES) / sizeof(SCALES[0]); const auto numberColors = sizeof(COLORS) / (3*sizeof(COLORS[0])); - const auto radius = fastMin(targetWidth, targetHeight) / 120.f; - const auto lineWidth = fastMin(targetWidth, targetHeight) / 250.f; + const auto radius = fastMinCuda(targetWidth, targetHeight) / 120.f; + const auto lineWidth = fastMinCuda(targetWidth, targetHeight) / 250.f; // Render key points renderKeypoints(targetPtr, sharedMaxs, sharedMins, sharedScaleF, globalIdx, x, y, targetWidth, targetHeight, diff --git a/src/openpose/hand/renderHand.cu b/src/openpose/hand/renderHand.cu index 4f9e74d9..8564ee16 100644 --- a/src/openpose/hand/renderHand.cu +++ b/src/openpose/hand/renderHand.cu @@ -27,8 +27,8 @@ namespace op const auto numberPartPairs = sizeof(PART_PAIRS_GPU) / (2*sizeof(PART_PAIRS_GPU[0])); const auto numberScales = sizeof(SCALES) / sizeof(SCALES[0]); const auto numberColors = sizeof(COLORS) / (3*sizeof(COLORS[0])); - const auto radius = fastMin(targetWidth, targetHeight) / 100.f; - const auto lineWidth = fastMin(targetWidth, targetHeight) / 80.f; + const auto radius = fastMinCuda(targetWidth, targetHeight) / 100.f; + const auto lineWidth = fastMinCuda(targetWidth, targetHeight) / 80.f; // Render key points renderKeypoints(targetPtr, sharedMaxs, sharedMins, sharedScaleF, globalIdx, x, y, targetWidth, targetHeight, diff --git a/src/openpose/pose/renderPose.cu b/src/openpose/pose/renderPose.cu index 12d333a1..4afc1ff4 100644 --- a/src/openpose/pose/renderPose.cu +++ b/src/openpose/pose/renderPose.cu @@ -49,7 +49,7 @@ namespace op inline __device__ void getColorHeatMap(float* colorPtr, float v, const float vmin, const float vmax) { - v = fastTruncate(v, vmin, vmax); + v = fastTruncateCuda(v, vmin, vmax); const auto dv = vmax - vmin; if (v < (vmin + 0.125f * dv)) @@ -93,7 +93,7 @@ namespace op const auto BM = 13; const auto MR = 6; const auto summed = RY+YG+GC+CB+BM+MR; // 55 - v = fastTruncate(v, vmin, vmax) * summed; + v = fastTruncateCuda(v, vmin, vmax) * summed; if (v < RY) colorPtr = {255.f, 255.f*(v/(RY)), 0.f}; @@ -113,7 +113,7 @@ namespace op inline __device__ void getColorXYAffinity(float3& colorPtr, const float x, const float y) { - const auto rad = fastMin(1.f, sqrt( x*x + y*y ) ); + const auto rad = fastMinCuda(1.f, sqrt( x*x + y*y ) ); const float a = atan2(-y,-x)/PI; auto fk = (a+1.f)/2.f; // 0 to 1 if (::isnan(fk)) @@ -142,8 +142,8 @@ namespace op const auto numberPartPairs = sizeof(COCO_PAIRS_GPU) / (2*sizeof(COCO_PAIRS_GPU[0])); const auto numberScales = sizeof(COCO_SCALES) / sizeof(COCO_SCALES[0]); const auto numberColors = sizeof(COCO_COLORS) / (3*sizeof(COCO_COLORS[0])); - const auto radius = fastMin(targetWidth, targetHeight) / 100.f; - const auto lineWidth = fastMin(targetWidth, targetHeight) / 120.f; + const auto radius = fastMinCuda(targetWidth, targetHeight) / 100.f; + const auto lineWidth = fastMinCuda(targetWidth, targetHeight) / 120.f; // Render key points renderKeypoints(targetPtr, sharedMaxs, sharedMins, sharedScaleF, globalIdx, x, y, targetWidth, targetHeight, @@ -170,8 +170,8 @@ namespace op const auto numberPartPairs = sizeof(BODY_19_PAIRS_GPU) / (2*sizeof(BODY_19_PAIRS_GPU[0])); const auto numberScales = sizeof(BODY_19_SCALES) / sizeof(BODY_19_SCALES[0]); const auto numberColors = sizeof(BODY_19_COLORS) / (3*sizeof(BODY_19_COLORS[0])); - const auto radius = fastMin(targetWidth, targetHeight) / 100.f; - const auto lineWidth = fastMin(targetWidth, targetHeight) / 120.f; + const auto radius = fastMinCuda(targetWidth, targetHeight) / 100.f; + const auto lineWidth = fastMinCuda(targetWidth, targetHeight) / 120.f; // Render key points renderKeypoints(targetPtr, sharedMaxs, sharedMins, sharedScaleF, globalIdx, x, y, targetWidth, targetHeight, @@ -198,8 +198,8 @@ namespace op const auto numberPartPairs = sizeof(BODY_23_PAIRS_GPU) / (2*sizeof(BODY_23_PAIRS_GPU[0])); const auto numberScales = sizeof(BODY_23_SCALES) / sizeof(BODY_23_SCALES[0]); const auto numberColors = sizeof(BODY_23_COLORS) / (3*sizeof(BODY_23_COLORS[0])); - const auto radius = fastMin(targetWidth, targetHeight) / 100.f; - const auto lineWidth = fastMin(targetWidth, targetHeight) / 120.f; + const auto radius = fastMinCuda(targetWidth, targetHeight) / 100.f; + const auto lineWidth = fastMinCuda(targetWidth, targetHeight) / 120.f; // Render key points renderKeypoints(targetPtr, sharedMaxs, sharedMins, sharedScaleF, globalIdx, x, y, targetWidth, targetHeight, @@ -226,8 +226,8 @@ namespace op const auto numberPartPairs = sizeof(BODY_25_PAIRS_GPU) / (2*sizeof(BODY_25_PAIRS_GPU[0])); const auto numberScales = sizeof(BODY_25_SCALES) / sizeof(BODY_25_SCALES[0]); const auto numberColors = sizeof(BODY_25_COLORS) / (3*sizeof(BODY_25_COLORS[0])); - const auto radius = fastMin(targetWidth, targetHeight) / 100.f; - const auto lineWidth = fastMin(targetWidth, targetHeight) / 120.f; + const auto radius = fastMinCuda(targetWidth, targetHeight) / 100.f; + const auto lineWidth = fastMinCuda(targetWidth, targetHeight) / 120.f; // Render key points renderKeypoints(targetPtr, sharedMaxs, sharedMins, sharedScaleF, globalIdx, x, y, targetWidth, targetHeight, @@ -254,8 +254,8 @@ namespace op const auto numberPartPairs = sizeof(BODY_25B_PAIRS_GPU) / (2*sizeof(BODY_25B_PAIRS_GPU[0])); const auto numberScales = sizeof(BODY_25B_SCALES) / sizeof(BODY_25B_SCALES[0]); const auto numberColors = sizeof(BODY_25B_COLORS) / (3*sizeof(BODY_25B_COLORS[0])); - const auto radius = fastMin(targetWidth, targetHeight) / 100.f; - const auto lineWidth = fastMin(targetWidth, targetHeight) / 120.f; + const auto radius = fastMinCuda(targetWidth, targetHeight) / 100.f; + const auto lineWidth = fastMinCuda(targetWidth, targetHeight) / 120.f; // Render key points renderKeypoints(targetPtr, sharedMaxs, sharedMins, sharedScaleF, globalIdx, x, y, targetWidth, targetHeight, @@ -282,8 +282,8 @@ namespace op const auto numberPartPairs = sizeof(BODY_65_PAIRS_GPU) / (2*sizeof(BODY_65_PAIRS_GPU[0])); const auto numberScales = sizeof(BODY_65_SCALES) / sizeof(BODY_65_SCALES[0]); const auto numberColors = sizeof(BODY_65_COLORS) / (3*sizeof(BODY_65_COLORS[0])); - const auto radius = fastMin(targetWidth, targetHeight) / 100.f; - const auto lineWidth = fastMin(targetWidth, targetHeight) / 120.f; + const auto radius = fastMinCuda(targetWidth, targetHeight) / 100.f; + const auto lineWidth = fastMinCuda(targetWidth, targetHeight) / 120.f; // Render key points renderKeypoints(targetPtr, sharedMaxs, sharedMins, sharedScaleF, globalIdx, x, y, targetWidth, targetHeight, @@ -310,8 +310,8 @@ namespace op const auto numberPartPairs = sizeof(BODY_95_PAIRS_GPU) / (2*sizeof(BODY_95_PAIRS_GPU[0])); const auto numberScales = sizeof(BODY_95_SCALES) / sizeof(BODY_95_SCALES[0]); const auto numberColors = sizeof(BODY_95_COLORS) / (3*sizeof(BODY_95_COLORS[0])); - const auto radius = fastMin(targetWidth, targetHeight) / 100.f; - const auto lineWidth = fastMin(targetWidth, targetHeight) / 120.f; + const auto radius = fastMinCuda(targetWidth, targetHeight) / 100.f; + const auto lineWidth = fastMinCuda(targetWidth, targetHeight) / 120.f; // Render key points renderKeypoints(targetPtr, sharedMaxs, sharedMins, sharedScaleF, globalIdx, x, y, targetWidth, targetHeight, @@ -338,8 +338,8 @@ namespace op const auto numberPartPairs = sizeof(BODY_135_PAIRS_GPU) / (2*sizeof(BODY_135_PAIRS_GPU[0])); const auto numberScales = sizeof(BODY_135_SCALES) / sizeof(BODY_135_SCALES[0]); const auto numberColors = sizeof(BODY_135_COLORS) / (3*sizeof(BODY_135_COLORS[0])); - const auto radius = fastMin(targetWidth, targetHeight) / 100.f; - const auto lineWidth = fastMin(targetWidth, targetHeight) / 120.f; + const auto radius = fastMinCuda(targetWidth, targetHeight) / 100.f; + const auto lineWidth = fastMinCuda(targetWidth, targetHeight) / 120.f; // Render key points renderKeypoints(targetPtr, sharedMaxs, sharedMins, sharedScaleF, globalIdx, x, y, targetWidth, targetHeight, @@ -365,8 +365,8 @@ namespace op const auto numberPartPairs = sizeof(MPI_PAIRS_GPU) / (2*sizeof(MPI_PAIRS_GPU[0])); const auto numberScales = sizeof(MPI_SCALES) / sizeof(MPI_SCALES[0]); const auto numberColors = sizeof(MPI_COLORS) / (3*sizeof(MPI_COLORS[0])); - const auto radius = fastMin(targetWidth, targetHeight) / 100.f; - const auto lineWidth = fastMin(targetWidth, targetHeight) / 120.f; + const auto radius = fastMinCuda(targetWidth, targetHeight) / 100.f; + const auto lineWidth = fastMinCuda(targetWidth, targetHeight) / 120.f; // Render key points renderKeypoints(targetPtr, sharedMaxs, sharedMins, sharedScaleF, globalIdx, x, y, targetWidth, targetHeight, @@ -392,8 +392,8 @@ namespace op const auto numberPartPairs = sizeof(CAR_12_PAIRS_GPU) / (2*sizeof(CAR_12_PAIRS_GPU[0])); const auto numberScales = sizeof(CAR_12_SCALES) / sizeof(CAR_12_SCALES[0]); const auto numberColors = sizeof(CAR_12_COLORS) / (3*sizeof(CAR_12_COLORS[0])); - const auto radius = fastMin(targetWidth, targetHeight) / 100.f; - const auto lineWidth = fastMin(targetWidth, targetHeight) / 120.f; + const auto radius = fastMinCuda(targetWidth, targetHeight) / 100.f; + const auto lineWidth = fastMinCuda(targetWidth, targetHeight) / 120.f; // Render key points renderKeypoints(targetPtr, sharedMaxs, sharedMins, sharedScaleF, globalIdx, x, y, targetWidth, targetHeight, @@ -420,8 +420,8 @@ namespace op const auto numberPartPairs = sizeof(CAR_22_PAIRS_GPU) / (2*sizeof(CAR_22_PAIRS_GPU[0])); const auto numberScales = sizeof(CAR_22_SCALES) / sizeof(CAR_22_SCALES[0]); const auto numberColors = sizeof(CAR_22_COLORS) / (3*sizeof(CAR_22_COLORS[0])); - const auto radius = fastMin(targetWidth, targetHeight) / 100.f; - const auto lineWidth = fastMin(targetWidth, targetHeight) / 120.f; + const auto radius = fastMinCuda(targetWidth, targetHeight) / 100.f; + const auto lineWidth = fastMinCuda(targetWidth, targetHeight) / 120.f; // Render key points renderKeypoints(targetPtr, sharedMaxs, sharedMins, sharedScaleF, globalIdx, x, y, targetWidth, targetHeight, @@ -445,8 +445,8 @@ namespace op float rgbColor [3] = {0.f,0.f,0.f}; const auto xSource = (x + 0.5f) / scaleToKeepRatio - 0.5f; const auto ySource = (y + 0.5f) / scaleToKeepRatio - 0.5f; - const auto xHeatMap = fastTruncate(int(xSource + 1e-5), 0, widthHeatMap); - const auto yHeatMap = fastTruncate(int(ySource + 1e-5), 0, heightHeatMap); + const auto xHeatMap = fastTruncateCuda(int(xSource + 1e-5), 0, widthHeatMap); + const auto yHeatMap = fastTruncateCuda(int(ySource + 1e-5), 0, heightHeatMap); const auto heatMapArea = widthHeatMap * heightHeatMap; for (auto part = 0u ; part < numberBodyParts ; part++) {