Fix pooling, add return code in each test, add return code handling in test_all_tests script

Signed-off-by: Micaela Verucchi <micaelaverucchi@gmail.com>
This commit is contained in:
Micaela Verucchi
2020-04-09 15:25:05 +02:00
parent ed0596a52c
commit 3502c5b676
31 changed files with 293 additions and 202 deletions
+5 -4
View File
@@ -407,8 +407,9 @@ protected:
*/
typedef enum {
POOLING_MAX = 0,
POOLING_AVERAGE = 1, // count for average includes padded values
POOLING_AVERAGE_EXCLUDE_PADDING = 2 // count for average does not include padded values
POOLING_AVERAGE = 1, // count for average includes padded values
POOLING_AVERAGE_EXCLUDE_PADDING = 2, // count for average does not include padded values
POOLING_MAX_FIXEDSIZE = 100 // max pool darknet fashion
} tkdnnPoolingMode_t;
/**
@@ -421,13 +422,13 @@ public:
int winH, winW;
int strideH, strideW;
int paddingH, paddingW;
bool maxpoolfixedsize;
bool size;
tkdnnPoolingMode_t pool_mode;
Pooling(Network *net, int winH, int winW,
int strideH, int strideW,
int paddingH = 0, int paddingW = 0,
tkdnnPoolingMode_t pool_mode = POOLING_MAX, bool final = false, bool test=false);
tkdnnPoolingMode_t pool_mode = POOLING_MAX, bool final = false);
virtual ~Pooling();
virtual layerType_t getLayerType() { return LAYER_POOLING; };