Merge pull request #297 from leondavi/nerlplanner

leondavi · web-flow · commit 07ee1efddb19 · 2024-03-27T08:46:23.000+02:00
Rename CNN layer to Conv layer
diff --git a/src_cpp/common/nerlWorker.cpp b/src_cpp/common/nerlWorker.cpp
@@ -67,7 +67,7 @@ std::shared_ptr<NerlLayer> NerlWorker::parse_layers_input(std::string &layer_siz
                 pooling_dims, stride_dims,padding_dims);
                 break;  
             }
-            case LAYER_TYPE_CNN:
+            case LAYER_TYPE_CONV:
             {
                 LayerSizingParams_t params = layer_sizes_params[i];
                 std::vector<int>kernel_dims = params.get_ext_params(params.KERNEL_SIZE);
diff --git a/src_cpp/common/worker_definitions_ag.h b/src_cpp/common/worker_definitions_ag.h
@@ -1,11 +1,11 @@
 #pragma once
 
 // This file was auto generated
-// Generated by Nerlplanner version: 1.0.0
+// Generated by Nerlplanner version: 1.0.1
 
 namespace nerlnet {
 
-enum LayerTypeEnum{LAYER_TYPE_DEFAULT=0,LAYER_TYPE_SCALING=1,LAYER_TYPE_CNN=2,LAYER_TYPE_PERCEPTRON=3,LAYER_TYPE_POOLING=4,LAYER_TYPE_PROBABILISTIC=5,LAYER_TYPE_LSTM=6,LAYER_TYPE_RECCURRENT=7,LAYER_TYPE_UNSCALING=8,LAYER_TYPE_BOUNDING=9};
+enum LayerTypeEnum{LAYER_TYPE_DEFAULT=0,LAYER_TYPE_SCALING=1,LAYER_TYPE_CONV=2,LAYER_TYPE_PERCEPTRON=3,LAYER_TYPE_POOLING=4,LAYER_TYPE_PROBABILISTIC=5,LAYER_TYPE_LSTM=6,LAYER_TYPE_RECCURRENT=7,LAYER_TYPE_UNSCALING=8,LAYER_TYPE_BOUNDING=9};
 enum ProbabilisticActivationEnum{PROBABILISTIC_ACTIVATION_BINARY=1,PROBABILISTIC_ACTIVATION_LOGISTIC=2,PROBABILISTIC_ACTIVATION_COMPETITIVE=3,PROBABILISTIC_ACTIVATION_SOFTMAX=4};
 enum ScalingEnum{SCALING_NONE=1,SCALING_MINMAX=2,SCALING_MEANSTD=3,SCALING_STD=4,SCALING_LOG=5};
 enum BoundingEnum{BOUNDING_NONE=1,BOUNDING_BOUNDING=2};
diff --git a/src_cpp/opennnBridge/nerlWorkerOpenNN.cpp b/src_cpp/opennnBridge/nerlWorkerOpenNN.cpp
@@ -312,7 +312,7 @@ namespace nerlnet
             int layer_type = curr_layer->get_layer_type();
             switch(layer_type)
             {
-                case LAYER_TYPE_CNN: 
+                case LAYER_TYPE_CONV:
                 {
                    // std::shared_ptr<NerlLayer> prev_layer = curr_layer->get_prev_layer_ptr();
                     int layer_rows_num     = curr_layer->get_dim_size(DIM_X_IDX);
@@ -521,7 +521,7 @@ namespace nerlnet
         {
             case LAYER_TYPE_DEFAULT:      { res = translate_activation_function_int(layer_functionality); break;} // PERCEPTRON
             case LAYER_TYPE_SCALING:      { res = translate_scaling_method_int(layer_functionality);      break;}
-            case LAYER_TYPE_CNN:          { res = translate_activation_function_int(layer_functionality); break;}
+            case LAYER_TYPE_CONV:          { res = translate_activation_function_int(layer_functionality); break;}
             case LAYER_TYPE_PERCEPTRON:   { res = translate_activation_function_int(layer_functionality); break;}
             case LAYER_TYPE_POOLING:      { res = translate_pooling_method_int(layer_functionality);      break;}
             case LAYER_TYPE_PROBABILISTIC:{ res = translate_activation_function_int(layer_functionality); break;}
@@ -540,7 +540,7 @@ namespace nerlnet
         {
             case LAYER_TYPE_DEFAULT:      { res = (int)opennn::Layer::Type::Perceptron;          break;}
             case LAYER_TYPE_SCALING:      { res = (int)opennn::Layer::Type::Scaling;             break;}
-            case LAYER_TYPE_CNN:          { res = (int)opennn::Layer::Type::Convolutional;       break;}
+            case LAYER_TYPE_CONV:          { res = (int)opennn::Layer::Type::Convolutional;       break;}
             case LAYER_TYPE_PERCEPTRON:   { res = (int)opennn::Layer::Type::Perceptron;          break;}
             case LAYER_TYPE_POOLING:      { res = (int)opennn::Layer::Type::Pooling;             break;}
             case LAYER_TYPE_PROBABILISTIC:{ res = (int)opennn::Layer::Type::Probabilistic;       break;}
diff --git a/src_erl/NerlnetApp/src/Bridge/layers_types_ag.hrl b/src_erl/NerlnetApp/src/Bridge/layers_types_ag.hrl
@@ -1,9 +1,9 @@
 % This is an auto generated .hrl file
-% DC Fields Generated by Nerlplanner version: 1.0.0
+% DC Fields Generated by Nerlplanner version: 1.0.1
 
 -define(LAYERS_TYPE_DEFAULT_IDX,"0").
 -define(LAYERS_TYPE_SCALING_IDX,"1").
--define(LAYERS_TYPE_CNN_IDX,"2").
+-define(LAYERS_TYPE_CONV_IDX,"2").
 -define(LAYERS_TYPE_PERCEPTRON_IDX,"3").
 -define(LAYERS_TYPE_POOLING_IDX,"4").
 -define(LAYERS_TYPE_PROBABILISTIC_IDX,"5").
diff --git a/src_erl/NerlnetApp/src/Bridge/models_types_ag.hrl b/src_erl/NerlnetApp/src/Bridge/models_types_ag.hrl
@@ -1,5 +1,5 @@
 % This is an auto generated .hrl file
-% DC Fields Generated by Nerlplanner version: 1.0.0
+% DC Fields Generated by Nerlplanner version: 1.0.1
 
 -define(MODEL_TYPE_NN_IDX,"0").
 -define(MODEL_TYPE_APPROXIMATION_IDX,"1").
diff --git a/src_erl/NerlnetApp/src/Bridge/nerlTests.erl b/src_erl/NerlnetApp/src/Bridge/nerlTests.erl
@@ -246,7 +246,7 @@ nerlworker_test_generate_data(LayersSizes, LayerTypes, NumOfSamples) -> %% Ask D
                   ?LAYERS_TYPE_SCALING_IDX -> {FirstLayerSizeInt,_} = string:to_integer(FirstLayerSize),
                                               {LastLayerSizeInt,_} = string:to_integer(LastLayerSize), 
                                               {NumOfSamples,LastLayerSizeInt+FirstLayerSizeInt, 1};
-                  ?LAYERS_TYPE_CNN_IDX    ->  [DimXComplex, DimYComplex, DimZComplex | _] = re:split(FirstLayerSize,"x",[{return,list}]),
+                  ?LAYERS_TYPE_CONV_IDX    ->  [DimXComplex, DimYComplex, DimZComplex | _] = re:split(FirstLayerSize,"x",[{return,list}]),
                                               {DimXComplexInt,_} = string:to_integer(DimXComplex),
                                               {DimYComplexInt,_} = string:to_integer(DimYComplex),
                                               {DimZComplexInt,_} = string:to_integer(DimZComplex),
diff --git a/src_erl/NerlnetApp/src/Bridge/neural_networks_testing_models.hrl b/src_erl/NerlnetApp/src/Bridge/neural_networks_testing_models.hrl
@@ -20,7 +20,7 @@
                                 _LayersTypesCNN = "2,4,2,3,5",
                                 _LayersFunctionalityCodesCNN = "6,2,6,6,4", % change scaler functionality to 6 to check exception handling
                                 _LearningRateCNN = "0.01",
-                                _EpochsCNN = "100",
+                                _EpochsCNN = "50",
                                 _OptimizerTypeCNN = "5",
                                 _OptimizerArgsCNN = "",
                                 _LossMethodCNN = "2",
@@ -33,7 +33,7 @@
                                 _LayersTypesAEC = "1,3,3,3,3,3,3,9",
                                 _LayersFunctionalityCodesAEC = "1,11,11,11,11,11,11,1", 
                                 _LearningRateAEC = "0.01",
-                                _EpochsAEC = "100",
+                                _EpochsAEC = "50",
                                 _OptimizerTypeAEC = "5",
                                 _OptimizerArgsAEC = "",
                                 _LossMethodAEC = "2",
diff --git a/src_erl/NerlnetApp/src/dc_definitions_ag.hrl b/src_erl/NerlnetApp/src/dc_definitions_ag.hrl
@@ -1,5 +1,5 @@
 % This is an auto generated .hrl file
-% DC Fields Generated by Nerlplanner version: 1.0.0
+% DC Fields Generated by Nerlplanner version: 1.0.1
 
 -define(DC_KEY_NERLNET_SETTINGS_ATOM,nerlnetSettings).
 -define(DC_KEY_FREQUENCY_ATOM,frequency).
diff --git a/src_erl/NerlnetApp/src/nerlnetApp_app.erl b/src_erl/NerlnetApp/src/nerlnetApp_app.erl
@@ -20,8 +20,8 @@
 -behaviour(application).
 -include("nerl_tools.hrl").
 
--define(NERLNET_APP_VERSION, "1.4.0").
--define(NERLPLANNER_TESTED_VERSION,"1.0.0").
+-define(NERLNET_APP_VERSION, "1.4.1").
+-define(NERLPLANNER_TESTED_VERSION,"1.0.1").
 
 -export([start/2, stop/1]).
 
diff --git a/src_erl/NerlnetApp/src/router_definitions_ag.hrl b/src_erl/NerlnetApp/src/router_definitions_ag.hrl
@@ -1,5 +1,5 @@
 % This is an auto generated .hrl file
-% Source Fields Generated by Nerlplanner version: 1.0.0
+% Source Fields Generated by Nerlplanner version: 1.0.1
 
 -define(ROUTER_POLICY_ROUTINGTABLE_IDX,"0").
 
diff --git a/src_erl/NerlnetApp/src/source_definitions_ag.hrl b/src_erl/NerlnetApp/src/source_definitions_ag.hrl
@@ -1,5 +1,5 @@
 % This is an auto generated .hrl file
-% Source Fields Generated by Nerlplanner version: 1.0.0
+% Source Fields Generated by Nerlplanner version: 1.0.1
 
 -define(SOURCE_POLICY_CASTING_IDX,"0").
 -define(SOURCE_POLICY_ROUNDROBIN_IDX,"1").
diff --git a/src_erl/NerlnetApp/src/worker_definitions_ag.hrl b/src_erl/NerlnetApp/src/worker_definitions_ag.hrl
@@ -1,5 +1,5 @@
 % This is an auto generated .hrl file
-% Worker Fields Generated by Nerlplanner version: 1.0.0
+% Worker Fields Generated by Nerlplanner version: 1.0.1
 
 -define(WORKER_FIELD_KEY_MODEL_TYPE,modelType).
 -define(WORKER_FIELD_KEY_LAYER_SIZES_LIST,layersSizes).
diff --git a/src_py/nerlPlanner/Definitions.py b/src_py/nerlPlanner/Definitions.py
@@ -1,8 +1,8 @@
 import subprocess
 from logger import *
 
-VERSION = "1.0.0"
-NERLNET_VERSION_TESTED_WITH = "1.2.0"
+VERSION = "1.0.1"
+NERLNET_VERSION_TESTED_WITH = "1.4.1"
 NERLNET_TMP_PATH = "/tmp/nerlnet"
 NERLNET_GRAPHVIZ_OUTPUT_DIR = f"{NERLNET_TMP_PATH}/nerlplanner"
 NERLNET_GLOBAL_PATH = "/usr/local/lib/nerlnet-lib/NErlNet"
diff --git a/src_py/nerlPlanner/JsonElementWorkerDefinitions.py b/src_py/nerlPlanner/JsonElementWorkerDefinitions.py
@@ -8,7 +8,7 @@
 LayerTypeMap = OrderedDict([
     ("Default" , "0"),
     ("Scaling" , "1"),
-    ("CNN" , "2"),
+    ("Conv" , "2"),
     ("Perceptron" , "3"),
     ("Pooling" , "4"),
     ("Probabilistic" , "5"),

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ std::shared_ptr<NerlLayer> NerlWorker::parse_layers_input(std::string &layer_siz`
`67`	`67`	`pooling_dims, stride_dims,padding_dims);`
`68`	`68`	`break;`
`69`	`69`	`}`
`70`		`- case LAYER_TYPE_CNN:`
	`70`	`+ case LAYER_TYPE_CONV:`
`71`	`71`	`{`
`72`	`72`	`LayerSizingParams_t params = layer_sizes_params[i];`
`73`	`73`	`std::vector<int>kernel_dims = params.get_ext_params(params.KERNEL_SIZE);`