You need to sign in or sign up before continuing.
提交 968ee0c0 编写于 作者: L liuqi

Remove static keyword in header files.

上级 c63ba922
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
namespace mace { namespace mace {
namespace kernels { namespace kernels {
static constexpr int kCostPerGroup = 1024; constexpr int kCostPerGroup = 1024;
template <DeviceType D, typename T> template <DeviceType D, typename T>
struct AddNFunctor { struct AddNFunctor {
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
namespace mace { namespace mace {
namespace kernels { namespace kernels {
static inline std::vector<float> WHCenters(const std::vector<float> &anchor) { inline std::vector<float> WHCenters(const std::vector<float> &anchor) {
// width, height, width_center, height_center // width, height, width_center, height_center
std::vector<float> window(4); std::vector<float> window(4);
window[0] = anchor[2] - anchor[0] + 1; window[0] = anchor[2] - anchor[0] + 1;
...@@ -25,7 +25,7 @@ static inline std::vector<float> WHCenters(const std::vector<float> &anchor) { ...@@ -25,7 +25,7 @@ static inline std::vector<float> WHCenters(const std::vector<float> &anchor) {
return window; return window;
} }
static inline std::vector<std::vector<float>> GenerateAnchors( inline std::vector<std::vector<float>> GenerateAnchors(
const std::vector<int> &scales, const std::vector<int> &scales,
const std::vector<float> &ratios, const std::vector<float> &ratios,
const int base_size) { const int base_size) {
...@@ -65,10 +65,10 @@ static inline std::vector<std::vector<float>> GenerateAnchors( ...@@ -65,10 +65,10 @@ static inline std::vector<std::vector<float>> GenerateAnchors(
return anchors; return anchors;
} }
static inline std::vector<int> nms(const float *bboxes_ptr, inline std::vector<int> nms(const float *bboxes_ptr,
const index_t num_bboxes, const index_t num_bboxes,
const float thresh, const float thresh,
const int post_nms_top_n) { const int post_nms_top_n) {
std::vector<int> keep; std::vector<int> keep;
std::vector<int> suppressed(num_bboxes, 0); std::vector<int> suppressed(num_bboxes, 0);
......
...@@ -23,15 +23,15 @@ struct CachedInterpolation { ...@@ -23,15 +23,15 @@ struct CachedInterpolation {
float lerp; float lerp;
}; };
static inline float CalculateResizeScale(index_t in_size, inline float CalculateResizeScale(index_t in_size,
index_t out_size, index_t out_size,
bool align_corners) { bool align_corners) {
return (align_corners && out_size > 1) return (align_corners && out_size > 1)
? (in_size - 1) / static_cast<float>(out_size - 1) ? (in_size - 1) / static_cast<float>(out_size - 1)
: in_size / static_cast<float>(out_size); : in_size / static_cast<float>(out_size);
} }
static inline void ComputeInterpolationWeights( inline void ComputeInterpolationWeights(
const index_t out_size, const index_t out_size,
const index_t in_size, const index_t in_size,
const float scale, const float scale,
...@@ -46,12 +46,12 @@ static inline void ComputeInterpolationWeights( ...@@ -46,12 +46,12 @@ static inline void ComputeInterpolationWeights(
} }
} }
static inline float ComputeLerp(const float top_left, inline float ComputeLerp(const float top_left,
const float top_right, const float top_right,
const float bottom_left, const float bottom_left,
const float bottom_right, const float bottom_right,
const float x_lerp, const float x_lerp,
const float y_lerp) { const float y_lerp) {
const float top = top_left + (top_right - top_left) * x_lerp; const float top = top_left + (top_right - top_left) * x_lerp;
const float bottom = bottom_left + (bottom_right - bottom_left) * x_lerp; const float bottom = bottom_left + (bottom_right - bottom_left) * x_lerp;
return top + (bottom - top) * y_lerp; return top + (bottom - top) * y_lerp;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册