Browse Source

named all enum types (#1570)

tags/20200413
Cai Shanli GitHub 6 years ago
parent
commit
0281e51fe5
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 9 additions and 9 deletions
  1. +1
    -1
      src/layer/binaryop.h
  2. +1
    -1
      src/layer/eltwise.h
  3. +1
    -1
      src/layer/lrn.h
  4. +1
    -1
      src/layer/pooling.h
  5. +1
    -1
      src/layer/reduction.h
  6. +1
    -1
      src/layer/spp.h
  7. +1
    -1
      src/layer/unaryop.h
  8. +1
    -1
      src/layer_type.h
  9. +1
    -1
      src/mat.h

+ 1
- 1
src/layer/binaryop.h View File

@@ -32,7 +32,7 @@ public:

virtual int forward_inplace(Mat& bottom_top_blob, const Option& opt) const;

enum {
enum OperationType {
Operation_ADD = 0,
Operation_SUB = 1,
Operation_MUL = 2,


+ 1
- 1
src/layer/eltwise.h View File

@@ -28,7 +28,7 @@ public:

virtual int forward(const std::vector<Mat>& bottom_blobs, std::vector<Mat>& top_blobs, const Option& opt) const;

enum { Operation_PROD = 0, Operation_SUM = 1, Operation_MAX = 2 };
enum OperationType { Operation_PROD = 0, Operation_SUM = 1, Operation_MAX = 2 };

public:
// param


+ 1
- 1
src/layer/lrn.h View File

@@ -28,7 +28,7 @@ public:

virtual int forward_inplace(Mat& bottom_top_blob, const Option& opt) const;

enum { NormRegion_ACROSS_CHANNELS = 0, NormRegion_WITHIN_CHANNEL = 1 };
enum NormRegionType { NormRegion_ACROSS_CHANNELS = 0, NormRegion_WITHIN_CHANNEL = 1 };

public:
// param


+ 1
- 1
src/layer/pooling.h View File

@@ -28,7 +28,7 @@ public:

virtual int forward(const Mat& bottom_blob, Mat& top_blob, const Option& opt) const;

enum { PoolMethod_MAX = 0, PoolMethod_AVE = 1 };
enum PoolMethod { PoolMethod_MAX = 0, PoolMethod_AVE = 1 };

public:
// param


+ 1
- 1
src/layer/reduction.h View File

@@ -28,7 +28,7 @@ public:

virtual int forward(const Mat& bottom_blob, Mat& top_blob, const Option& opt) const;

enum {
enum ReductionOp {
ReductionOp_SUM = 0,
ReductionOp_ASUM = 1,
ReductionOp_SUMSQ = 2,


+ 1
- 1
src/layer/spp.h View File

@@ -28,7 +28,7 @@ public:

virtual int forward(const Mat& bottom_blob, Mat& top_blob, const Option& opt) const;

enum { PoolMethod_MAX = 0, PoolMethod_AVE = 1 };
enum PoolMethod { PoolMethod_MAX = 0, PoolMethod_AVE = 1 };

public:
// param


+ 1
- 1
src/layer/unaryop.h View File

@@ -28,7 +28,7 @@ public:

virtual int forward_inplace(Mat& bottom_top_blob, const Option& opt) const;

enum {
enum OperationType {
Operation_ABS = 0,
Operation_NEG = 1,
Operation_FLOOR = 2,


+ 1
- 1
src/layer_type.h View File

@@ -18,7 +18,7 @@
namespace ncnn {

namespace LayerType {
enum
enum LayerType
{
#include "layer_type_enum.h"
CustomBit = (1<<8),


+ 1
- 1
src/mat.h View File

@@ -477,7 +477,7 @@ void kanna_rotate_yuv420sp(const unsigned char* src, int srcw, int srch, unsigne
#endif // NCNN_PIXEL_ROTATE

// mat process
enum
enum BorderType
{
BORDER_CONSTANT = 0,
BORDER_REPLICATE = 1,


Loading…
Cancel
Save