From 64b268c45640aba7e7b3cdb4765b72744a8d3a98 Mon Sep 17 00:00:00 2001 From: noa Date: Sun, 14 Jul 2024 16:21:40 +0300 Subject: [PATCH 1/3] [show_model_with_bounding] fix issue --- .../DistributedConfig/dc_AEC_1d_2c_1s_4r_4w.json | 2 +- src_py/nerlPlanner/JsonElementWorkerDefinitions.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/inputJsonsFiles/DistributedConfig/dc_AEC_1d_2c_1s_4r_4w.json b/inputJsonsFiles/DistributedConfig/dc_AEC_1d_2c_1s_4r_4w.json index a4985e435..db45eb3c3 100644 --- a/inputJsonsFiles/DistributedConfig/dc_AEC_1d_2c_1s_4r_4w.json +++ b/inputJsonsFiles/DistributedConfig/dc_AEC_1d_2c_1s_4r_4w.json @@ -88,7 +88,7 @@ "layersSizes": "8,4,2,4,8,8", "_doc_layersSizes": "List of postive integers [L0, L1, ..., LN]", "layerTypesList": "1,3,3,3,3,10", - "_doc_LayerTypes": " Default:0 | Scaling:1 | CNN:2 | Perceptron:3 | Pooling:4 | Probabilistic:5 | LSTM:6 | Reccurrent:7 | Unscaling:8 |", + "_doc_LayerTypes": " Default:0 | Scaling:1 | CNN:2 | Perceptron:3 | Pooling:4 | Probabilistic:5 | LSTM:6 | Reccurrent:7 | Unscaling:8 | Flatten:9 | Bounding:10 |", "layers_functions": "1,6,6,6,6,1", "_doc_layers_functions_activation": " Threshold:1 | Sign:2 | Logistic:3 | Tanh:4 | Linear:5 | ReLU:6 | eLU:7 | SeLU:8 | Soft-plus:9 | Soft-sign:10 | Hard-sigmoid:11 |", "_doc_layer_functions_pooling": " none:1 | Max:2 | Avg:3 |", diff --git a/src_py/nerlPlanner/JsonElementWorkerDefinitions.py b/src_py/nerlPlanner/JsonElementWorkerDefinitions.py index b427057d7..39cce23fa 100644 --- a/src_py/nerlPlanner/JsonElementWorkerDefinitions.py +++ b/src_py/nerlPlanner/JsonElementWorkerDefinitions.py @@ -8,7 +8,7 @@ LayerTypeMap = OrderedDict([ ("Default" , "0"), ("Scaling" , "1"), - ("Conv" , "2"), + ("CNN" , "2"), ("Perceptron" , "3"), ("Pooling" , "4"), ("Probabilistic" , "5"), @@ -81,7 +81,9 @@ ("Probabilistic" , ProbabilisticActivationFunctionMap), ("LSTM" , None), ("Reccurrent" , None), - ("Unscaling" , UnScalingMethodMap)] + ("Unscaling" , UnScalingMethodMap), + ("Flatten" , FlattenMethodMap), + ("Bounding" , BoundingMethodMap)] ) # Model type name should be suitable with erlang atoms convention! From 6b662126e1039d836bf1e721780a0d3d514caf77 Mon Sep 17 00:00:00 2001 From: noa Date: Sun, 14 Jul 2024 17:15:27 +0300 Subject: [PATCH 2/3] [show_model_with_bounding] --- src_py/nerlPlanner/JsonElementWorkerDefinitions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src_py/nerlPlanner/JsonElementWorkerDefinitions.py b/src_py/nerlPlanner/JsonElementWorkerDefinitions.py index 39cce23fa..1de2c4d70 100644 --- 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"), From 3a24fcef3c6159be7ce2c301c6e2b0be720e7c75 Mon Sep 17 00:00:00 2001 From: noa Date: Sun, 14 Jul 2024 17:22:45 +0300 Subject: [PATCH 3/3] [show_model_with_bounding] fix the problem also for model with conv layer --- src_py/nerlPlanner/JsonElementWorkerDefinitions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src_py/nerlPlanner/JsonElementWorkerDefinitions.py b/src_py/nerlPlanner/JsonElementWorkerDefinitions.py index 1de2c4d70..5e1bc975e 100644 --- a/src_py/nerlPlanner/JsonElementWorkerDefinitions.py +++ b/src_py/nerlPlanner/JsonElementWorkerDefinitions.py @@ -75,7 +75,7 @@ # Maps from layer type to the functionality of layer mapping LayerTypeToFunctionalMap = OrderedDict([ ("Scaling" , ScalingMethodMap), - ("CNN" , None), + ("Conv" , None), ("Perceptron" , ActivationFunctionsMap), ("Pooling" , PoolingMethodMap), ("Probabilistic" , ProbabilisticActivationFunctionMap),