[NERLPLANNER] AG update

leondavi · Aug 7, 2024 · e52f44f · e52f44f
1 parent a7b77d5
commit e52f44f
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 13 deletions.
diff --git a/src_cpp/common/worker_definitions_ag.h b/src_cpp/common/worker_definitions_ag.h
@@ -1,7 +1,7 @@
 #pragma once
 
 // This file was auto generated
-// Generated by Nerlplanner version: 1.0.3
+// Generated by Nerlplanner version: 1.0.4
 
 namespace nerlnet {
 

diff --git a/src_erl/NerlnetApp/src/Bridge/layers_types_ag.hrl b/src_erl/NerlnetApp/src/Bridge/layers_types_ag.hrl
@@ -1,5 +1,5 @@
 % This is an auto generated .hrl file
-% DC Fields Generated by Nerlplanner version: 1.0.3
+% DC Fields Generated by Nerlplanner version: 1.0.4
 
 -define(LAYERS_TYPE_DEFAULT_IDX,"0").
 -define(LAYERS_TYPE_SCALING_IDX,"1").

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.3
+% DC Fields Generated by Nerlplanner version: 1.0.4
 
 -define(MODEL_TYPE_NN_IDX,"0").
 -define(MODEL_TYPE_APPROXIMATION_IDX,"1").

diff --git a/src_erl/NerlnetApp/src/Bridge/onnWorkers/workerGeneric.erl b/src_erl/NerlnetApp/src/Bridge/onnWorkers/workerGeneric.erl
@@ -52,7 +52,7 @@ init({WorkerName , WorkerArgs , DistributedBehaviorFunc , DistributedWorkerData
   nerl_tools:setup_logger(?MODULE),
   {ModelID , ModelType , ModelArgs , LayersSizes,
   LayersTypes, LayersFunctionalityCodes, LearningRate , Epochs, 
-  OptimizerType, OptimizerArgs , LossMethod , DistributedSystemType ,
+  OptimizerType, OptimizerArgs , LossMethod , LossArgs, DistributedSystemType ,
   DistributedSystemToken, DistributedSystemArgs} = WorkerArgs,
   GenWorkerEts = ets:new(generic_worker,[set, public]),
   put(generic_worker_ets, GenWorkerEts),
@@ -70,6 +70,7 @@ init({WorkerName , WorkerArgs , DistributedBehaviorFunc , DistributedWorkerData
   ets:insert(GenWorkerEts,{layers_sizes, LayersSizes}),
   ets:insert(GenWorkerEts,{layers_functionality_codes, LayersFunctionalityCodes}),
   ets:insert(GenWorkerEts,{loss_method, LossMethod}),
+  ets:insert(GenWorkerEts,{loss_args, LossArgs}),
   ets:insert(GenWorkerEts,{learning_rate, LearningRate}),
   ets:insert(GenWorkerEts,{epochs, Epochs}),
   ets:insert(GenWorkerEts,{optimizer, OptimizerType}),

diff --git a/src_erl/NerlnetApp/src/Init/jsonParser.erl b/src_erl/NerlnetApp/src/Init/jsonParser.erl
@@ -84,6 +84,7 @@ get_models(ShaToModelMaps) ->
     LayersTypes = binary_to_list(maps:get(?WORKER_FIELD_KEY_LAYER_TYPES_LIST_BIN,ModelParams)),
     LayersFunctions = binary_to_list(maps:get(?WORKER_FIELD_KEY_LAYERS_FUNCTIONS_BIN,ModelParams)),
     LossMethod = binary_to_list(maps:get(?WORKER_FIELD_KEY_LOSS_METHOD_BIN,ModelParams)),
+    LossArgs = binary_to_list(maps:get(?WORKER_FIELD_KEY_LOSS_ARGS_BIN,ModelParams)),
     LearningRate = binary_to_list(maps:get(?WORKER_FIELD_KEY_LEARNING_RATE_BIN,ModelParams)),
     Epochs = binary_to_list(maps:get(?WORKER_FIELD_KEY_EPOCHS_BIN,ModelParams)),
     Optimizer = binary_to_list(maps:get(?WORKER_FIELD_KEY_OPTIMIZER_TYPE_BIN,ModelParams)),

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.3
+% DC Fields Generated by Nerlplanner version: 1.0.4
 
 -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.5.2").
--define(NERLPLANNER_TESTED_VERSION,"1.0.3").
+-define(NERLNET_APP_VERSION, "1.5.3").
+-define(NERLPLANNER_TESTED_VERSION,"1.0.4").
 
 -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.3
+% Source Fields Generated by Nerlplanner version: 1.0.4
 
 -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.3
+% Source Fields Generated by Nerlplanner version: 1.0.4
 
 -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,12 +1,13 @@
 % This is an auto generated .hrl file
-% Worker Fields Generated by Nerlplanner version: 1.0.3
+% Worker Fields Generated by Nerlplanner version: 1.0.4
 
 -define(WORKER_FIELD_KEY_MODEL_TYPE,modelType).
 -define(WORKER_FIELD_KEY_MODEL_ARGS,modelArgs).
 -define(WORKER_FIELD_KEY_LAYER_SIZES_LIST,layersSizes).
 -define(WORKER_FIELD_KEY_LAYER_TYPES_LIST,layerTypesList).
 -define(WORKER_FIELD_KEY_LAYERS_FUNCTIONS,layers_functions).
 -define(WORKER_FIELD_KEY_LOSS_METHOD,lossMethod).
+-define(WORKER_FIELD_KEY_LOSS_ARGS,lossArgs).
 -define(WORKER_FIELD_KEY_LEARNING_RATE,lr).
 -define(WORKER_FIELD_KEY_EPOCHS,epochs).
 -define(WORKER_FIELD_KEY_OPTIMIZER_TYPE,optimizer).
@@ -22,6 +23,7 @@
 -define(WORKER_FIELD_KEY_LAYER_TYPES_LIST_BIN,<<"layerTypesList">>).
 -define(WORKER_FIELD_KEY_LAYERS_FUNCTIONS_BIN,<<"layers_functions">>).
 -define(WORKER_FIELD_KEY_LOSS_METHOD_BIN,<<"lossMethod">>).
+-define(WORKER_FIELD_KEY_LOSS_ARGS_BIN,<<"lossArgs">>).
 -define(WORKER_FIELD_KEY_LEARNING_RATE_BIN,<<"lr">>).
 -define(WORKER_FIELD_KEY_EPOCHS_BIN,<<"epochs">>).
 -define(WORKER_FIELD_KEY_OPTIMIZER_TYPE_BIN,<<"optimizer">>).

diff --git a/src_py/nerlPlanner/Definitions.py b/src_py/nerlPlanner/Definitions.py
@@ -1,7 +1,7 @@
 import subprocess
 from logger import *
 
-VERSION = "1.0.3"
+VERSION = "1.0.4"
 NERLNET_VERSION_TESTED_WITH = "1.5.2"
 NERLNET_TMP_PATH = "/tmp/nerlnet"
 NERLNET_GRAPHVIZ_OUTPUT_DIR = f"{NERLNET_TMP_PATH}/nerlplanner"

diff --git a/src_py/nerlPlanner/ErlHeadersExporter.py b/src_py/nerlPlanner/ErlHeadersExporter.py
@@ -29,12 +29,12 @@ def gen_worker_fields_hrl(header_path : str, debug : bool = False):
 
     fields_list_vals = [KEY_MODEL_TYPE, KEY_MODEL_ARGS , KEY_LAYER_SIZES_LIST,
                    KEY_LAYER_TYPES_LIST, KEY_LAYERS_FUNCTIONS,
-                   KEY_LOSS_METHOD, KEY_LEARNING_RATE,
+                   KEY_LOSS_METHOD, KEY_LOSS_ARGS, KEY_LEARNING_RATE,
                    KEY_EPOCHS, KEY_OPTIMIZER_TYPE, KEY_OPTIMIZER_ARGS, KEY_INFRA_TYPE,
                    KEY_DISTRIBUTED_SYSTEM_TYPE, KEY_DISTRIBUTED_SYSTEM_TOKEN, KEY_DISTRIBUTED_SYSTEM_ARGS]
     fields_list_strs = ['KEY_MODEL_TYPE', 'KEY_MODEL_ARGS', 'KEY_LAYER_SIZES_LIST',
                    'KEY_LAYER_TYPES_LIST', 'KEY_LAYERS_FUNCTIONS',
-                   'KEY_LOSS_METHOD', 'KEY_LEARNING_RATE',
+                   'KEY_LOSS_METHOD', 'KEY_LOSS_ARGS', 'KEY_LEARNING_RATE',
                    'KEY_EPOCHS', 'KEY_OPTIMIZER_TYPE', 'KEY_OPTIMIZER_ARGS', 'KEY_INFRA_TYPE',
                    'KEY_DISTRIBUTED_SYSTEM_TYPE', 'KEY_DISTRIBUTED_SYSTEM_TOKEN', 'KEY_DISTRIBUTED_SYSTEM_ARGS']
     fields_list_strs = [f'WORKER_FIELD_{x}' for x in fields_list_strs]