Merge pull request #288 from deephealthproject/develop

Fixes (api + norms)

Author: salvacarrion

src/apis/eddl.cpp

@@ -1157,7 +1157,7 @@ namespace eddl {
     int h=parent->output->shape[2];
 
     if (name.empty()) { name = "GlobalMaxPool1D"; }  // Set default name
-    return MaxPool1D(parent, {h},{1}, name);
+    return MaxPool1D(parent, {h}, {1}, "none", name);
   }
 
   layer GlobalMaxPool2D(layer parent, string name){

src/layers/normalization/layer_norm.cpp

@@ -24,9 +24,9 @@ int LNorm::total_layers = 0;
 
 LNorm::LNorm(Layer *parent, float epsilon, string name, int dev, int mem) : LinLayer(name, dev, mem) {
 
-    vector<int> axis;
-    if (parent->output->ndim == 2) axis.push_back(1);
-    else if (parent->output->ndim == 4) {axis.push_back(1);axis.push_back(2);axis.push_back(3);}
+    vector<int> axis; // To store the axis to reduce (starting from the next dimension of the batch)
+    if (parent->output->ndim == 2) axis.push_back(0);
+    else if (parent->output->ndim == 4) {axis.push_back(0);axis.push_back(1);axis.push_back(2);}
     else msg("LNorm only works over 2D or 4D tensors", "LNorm");
 
     if(name.empty()) this->name = "norm" + to_string(++total_layers);

src/layers/normalization/layer_normmax.cpp

@@ -23,9 +23,9 @@ int LNormMax::total_layers = 0;
 
 LNormMax::LNormMax(Layer *parent, float epsilon, string name, int dev, int mem) : LinLayer(name, dev, mem) {
 
-    vector<int> axis;
-    if (parent->output->ndim == 2) axis.push_back(1);
-    else if (parent->output->ndim == 4) {axis.push_back(1);axis.push_back(2);axis.push_back(3);}
+    vector<int> axis; // To store the axis to reduce (starting from the next dimension of the batch)
+    if (parent->output->ndim == 2) axis.push_back(0);
+    else if (parent->output->ndim == 4) {axis.push_back(0);axis.push_back(1);axis.push_back(2);}
     else msg("LNormMax only works over 2D or 4D tensors", "LNormMax");
 
     if(name.empty()) this->name = "normmax" + to_string(++total_layers);

src/layers/normalization/layer_normminmax.cpp

@@ -23,9 +23,9 @@ int LNormMinMax::total_layers = 0;
 
 LNormMinMax::LNormMinMax(Layer *parent, float epsilon, string name, int dev, int mem) : LinLayer(name, dev, mem) {
 
-    vector<int> axis;
-    if (parent->output->ndim == 2) axis.push_back(1);
-    else if (parent->output->ndim == 4) {axis.push_back(1);axis.push_back(2);axis.push_back(3);}
+    vector<int> axis; // To store the axis to reduce (starting from the next dimension of the batch)
+    if (parent->output->ndim == 2) axis.push_back(0);
+    else if (parent->output->ndim == 4) {axis.push_back(0);axis.push_back(1);axis.push_back(2);}
     else msg("LNormMinMax only works over 2D or 4D tensors", "LNormMinMax");
 
     if(name.empty()) this->name = "normminmax" + to_string(++total_layers);