Skip to content

Commit 2d2e071

Browse files
Fixed Caffe warning with cuDNN7 & cleaner demo
1 parent b31ebb5 commit 2d2e071

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

3rdparty/caffe/include/caffe/util/cudnn.hpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ inline const char* cudnnGetErrorString(cudnnStatus_t status) {
4444
#if CUDNN_VERSION_MIN(6, 0, 0)
4545
case CUDNN_STATUS_RUNTIME_PREREQUISITE_MISSING:
4646
return "CUDNN_STATUS_RUNTIME_PREREQUISITE_MISSING";
47+
#endif
48+
#if CUDNN_VERSION_MIN(7, 0, 0)
49+
case CUDNN_STATUS_RUNTIME_IN_PROGRESS:
50+
return "CUDNN_STATUS_RUNTIME_IN_PROGRESS";
51+
case CUDNN_STATUS_RUNTIME_FP_OVERFLOW:
52+
return "CUDNN_STATUS_RUNTIME_FP_OVERFLOW";
4753
#endif
4854
}
4955
return "Unknown cudnn status";

examples/openpose/openpose.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@
1717

1818
// C++ std library dependencies
1919
#include <chrono> // `std::chrono::` functions and classes, e.g. std::chrono::milliseconds
20-
#include <string>
2120
#include <thread> // std::this_thread
22-
#include <vector>
2321
// Other 3rdparty dependencies
2422
#include <gflags/gflags.h> // DEFINE_bool, DEFINE_int32, DEFINE_int64, DEFINE_uint64, DEFINE_double, DEFINE_string
2523
#include <glog/logging.h> // google::InitGoogleLogging

include/openpose/wrapper/wrapperStructPose.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ namespace op
133133
WrapperStructPose(const Point<int>& netInputSize = Point<int>{656, 368},
134134
const Point<int>& outputSize = Point<int>{1280, 720},
135135
const ScaleMode keypointScale = ScaleMode::InputResolution,
136-
const int gpuNumber = 1, const int gpuNumberStart = 0, const int scalesNumber = 1,
136+
const int gpuNumber = -1, const int gpuNumberStart = 0, const int scalesNumber = 1,
137137
const float scaleGap = 0.15f, const RenderMode renderMode = RenderMode::None,
138138
const PoseModel poseModel = PoseModel::COCO_18, const bool blendOriginalFrame = true,
139139
const float alphaKeypoint = POSE_DEFAULT_ALPHA_KEYPOINT,

0 commit comments

Comments
 (0)