diff --git a/src_erl/Communication_Layer/http_Nerlserver/src/jsonParser.erl b/src_erl/Communication_Layer/http_Nerlserver/src/jsonParser.erl index 6c3f8a85..7210ad76 100644 --- a/src_erl/Communication_Layer/http_Nerlserver/src/jsonParser.erl +++ b/src_erl/Communication_Layer/http_Nerlserver/src/jsonParser.erl @@ -11,7 +11,7 @@ -export([getDeviceEntities/3]). -define(ARCH_ADDR, "/usr/local/lib/nerlnet-lib/NErlNet/src_erl/Communication_Layer/http_Nerlserver/arch.json"). -define(COMM_ADDR, "/usr/local/lib/nerlnet-lib/NErlNet/src_erl/Communication_Layer/http_Nerlserver/conn.json"). --define(FILE_IDENTIFIER,"[jsonParder] "). +-define(FILE_IDENTIFIER,"[jsonParser] "). getDeviceEntities(_ArchitectureAdderess,_CommunicationMapAdderess, HostName)-> @@ -275,7 +275,7 @@ addDeviceToGraph(G,ArchitectureMap, HostName)-> OnDeviceEntities1 = getOnDeviceEntities(maps:get(<<"devices">>,ArchitectureMap),HostName), OnDeviceEntities =re:split(binary_to_list(OnDeviceEntities1),",",[{return,list}]), - logger:notice(?FILE_IDENTIFIER++"OnDeviceEntities:~n~p~n",[OnDeviceEntities]), + logger:notice(?FILE_IDENTIFIER++"adding device ~p to graph~n",[OnDeviceEntities]), %%ADD THIS TO NERLNET: diff --git a/src_erl/Communication_Layer/http_Nerlserver/src/source/sourceStatem.erl b/src_erl/Communication_Layer/http_Nerlserver/src/source/sourceStatem.erl index 9849c35e..21caf34e 100644 --- a/src_erl/Communication_Layer/http_Nerlserver/src/source/sourceStatem.erl +++ b/src_erl/Communication_Layer/http_Nerlserver/src/source/sourceStatem.erl @@ -205,7 +205,7 @@ sendSamples(ListOfSamples,CSVPath,ChunkSize,LengthOfSample, Ms,Pid,Triplets,Coun %%this http request will be splitted at client's state machine by the following order: %% Body: ClientName#WorkerName#CSVName#BatchNumber#BatchOfSamples if NumOfBatchesToSend rem 10 == 0 -> - logger:info("~p samples left to send~n", [NumOfBatchesToSend]); true -> skip end, + io:format("~p samples left to send~n", [NumOfBatchesToSend]); true -> skip end, if Method == ?SENDALL -> %%sending batch to all clients" diff --git a/src_erl/erlBridge/nerlNetStatem.erl b/src_erl/erlBridge/nerlNetStatem.erl index 63773fb2..44ab719c 100755 --- a/src_erl/erlBridge/nerlNetStatem.erl +++ b/src_erl/erlBridge/nerlNetStatem.erl @@ -53,8 +53,7 @@ start_link(ARGS) -> %% process to initialize. init({WorkerName,ModelId, ModelType, ScalingMethod,LayerTypesList,LayersSizes,LayersActivationFunctions,FederatedMode,CountLimit,Optimizer, Features, Labels, LossMethod, LearningRate, ClientPID}) -> - logger:notice(?FILE_IDENTIFIER++"start module_create ~n"), - logger:notice(?FILE_IDENTIFIER++"WorkerName: ~p ,ModelId: ~p , ModelType: ~p , ScalingMethod: ~p ,LayerTypesList: ~p ,LayersSizes: ~p ,LayersActivationFunctions: ~p ,FederatedMode: ~p ,CountLimit: ~p ,Optimizer: ~p , Features: ~p , Labels: ~p , ClientPID: ~p~n" + logger:notice(?FILE_IDENTIFIER++"Creating: WorkerName: ~p ,ModelId: ~p , ModelType: ~p , ScalingMethod: ~p ,LayerTypesList: ~p ,LayersSizes: ~p ,LayersActivationFunctions: ~p ,FederatedMode: ~p ,CountLimit: ~p ,Optimizer: ~p , Features: ~p , Labels: ~p , ClientPID: ~p~n" ,[WorkerName,ModelId, ModelType, ScalingMethod,LayerTypesList,LayersSizes,LayersActivationFunctions,FederatedMode,CountLimit,Optimizer, Features, Labels, ClientPID]), %%^^^^^^^^^^^^^^^^^^^^^^^^^^ Res=nerlNIF:create_nif(ModelId, ModelType , ScalingMethod , LayerTypesList , LayersSizes , LayersActivationFunctions),