Skip to content

Commit

Permalink
Merge branch 'master' of github.com:leondavi/NErlNet into stat_update
Browse files Browse the repository at this point in the history
  • Loading branch information
ohad123 committed Aug 13, 2024
2 parents a034481 + 29bf510 commit 86dc5a8
Show file tree
Hide file tree
Showing 44 changed files with 478 additions and 74 deletions.
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ authors:
given-names: "Yehuda"
orcid: "https://orcid.org/0000-0002-4905-2085"
title: "NErlNet"
version: 1.5.1
version: 1.5.2
date-released: 2024-07-18
url: "https://github.com/leondavi/NErlNet"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Nerlnet simplifies the setup of a distributed cluster that consists of many mode
Nerlnet library combines the following languages to achieve a stable and efficient distributed ML system framework:
• The communication layer of Nerlnet is based on an Cowboy - an HTTP web server open-source library.
• ML on the edge of the distributed cluster is based on OpenNN library, an open-source project of Cpp Neural Network library.
Managemnt of Nerlnet cluster - An HTTP server of Flask communicates with Nerlnet's main server to control the cluster's entities.
Management of Nerlnet cluster - An HTTP server of Flask communicates with Nerlnet's main server to control the cluster's entities.

![image](https://user-images.githubusercontent.com/18975070/144730156-5bd03ad7-fc5f-45e9-8b4e-62d582af2200.png)
![image](https://user-images.githubusercontent.com/18975070/144730182-c535b20a-a5f9-4d4f-8632-77d49732f17f.png)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"connectionsMap":
{
"r1":["mainServer", "c1", "c2", "r2"],
"r2":["c3","c4", "s1", "r3"],
"r3":["c5","c6", "r4", "r1"],
"r4":["s2","c7", "r5", "r2"],
"r5":["s3","c8", "r1"]
}
}
221 changes: 221 additions & 0 deletions inputJsonsFiles/DistributedConfig/dc_EEG_8d_8c_3s_5r_8w_RR.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,221 @@
{
"nerlnetSettings": {
"frequency": "5",
"batchSize": "10"
},
"mainServer": {
"port": "8900",
"args": ""
},
"apiServer": {
"port": "8901",
"args": ""
},
"devices": [
{
"name": "c0VM5",
"ipv4": "10.0.0.11",
"entities": "apiServer,mainServer"
},
{
"name": "c0VM4",
"ipv4": "10.0.0.10",
"entities": "c3"
},
{
"name": "c0VM6",
"ipv4": "10.0.0.8",
"entities": "c1,r3"
},
{
"name": "c0VM7",
"ipv4": "10.0.0.12",
"entities": "c2,r4"
},
{
"name": "nerlSpilke0",
"ipv4": "10.0.0.32",
"entities": "s2,r5,c4"
},
{
"name": "nerlSpilke1",
"ipv4": "10.0.0.33",
"entities": "s3,c5"
},
{
"name": "nerlSpilke2",
"ipv4": "10.0.0.34",
"entities": "s1,r2,c6"
},
{
"name": "nerlSpilke3",
"ipv4": "10.0.0.35",
"entities": "r1,c7,c8"
}
],
"routers": [
{
"name": "r1",
"port": "8902",
"policy": "0"
},
{
"name": "r2",
"port": "8903",
"policy": "0"
},
{
"name": "r3",
"port": "8904",
"policy": "0"
},
{
"name": "r4",
"port": "8905",
"policy": "0"
},
{
"name": "r5",
"port": "8906",
"policy": "0"
}
],
"sources": [
{
"name": "s1",
"port": "8907",
"frequency": "5",
"policy": "0",
"epochs": "1",
"type": "0"
},
{
"name": "s2",
"port": "8908",
"frequency": "5",
"policy": "0",
"epochs": "1",
"type": "0"
},
{
"name": "s3",
"port": "8909",
"frequency": "5",
"policy": "0",
"epochs": "1",
"type": "0"
}
],
"clients": [
{
"name": "c1",
"port": "8910",
"workers": "w1"
},
{
"name": "c2",
"port": "8911",
"workers": "w2"
},
{
"name": "c3",
"port": "8912",
"workers": "w3"
},
{
"name": "c4",
"port": "8913",
"workers": "w4"
},
{
"name": "c5",
"port": "8914",
"workers": "w5"
},
{
"name": "c6",
"port": "8915",
"workers": "w6"
},
{
"name": "c7",
"port": "8916",
"workers": "w7"
},
{
"name": "c8",
"port": "8917",
"workers": "w8"
}
],
"workers": [
{
"name": "w1",
"model_sha": "d8df752e0a2e8f01de8f66e9cec941cdbc65d144ecf90ab7713e69d65e7e82aa"
},
{
"name": "w2",
"model_sha": "d8df752e0a2e8f01de8f66e9cec941cdbc65d144ecf90ab7713e69d65e7e82aa"
},
{
"name": "w3",
"model_sha": "d8df752e0a2e8f01de8f66e9cec941cdbc65d144ecf90ab7713e69d65e7e82aa"
},
{
"name": "w4",
"model_sha": "d8df752e0a2e8f01de8f66e9cec941cdbc65d144ecf90ab7713e69d65e7e82aa"
},
{
"name": "w5",
"model_sha": "d8df752e0a2e8f01de8f66e9cec941cdbc65d144ecf90ab7713e69d65e7e82aa"
},
{
"name": "w6",
"model_sha": "d8df752e0a2e8f01de8f66e9cec941cdbc65d144ecf90ab7713e69d65e7e82aa"
},
{
"name": "w7",
"model_sha": "d8df752e0a2e8f01de8f66e9cec941cdbc65d144ecf90ab7713e69d65e7e82aa"
},
{
"name": "w8",
"model_sha": "d8df752e0a2e8f01de8f66e9cec941cdbc65d144ecf90ab7713e69d65e7e82aa"
}
],
"model_sha": {
"d8df752e0a2e8f01de8f66e9cec941cdbc65d144ecf90ab7713e69d65e7e82aa": {
"modelType": "0",
"_doc_modelType": " nn:0 | approximation:1 | classification:2 | forecasting:3 | image-classification:4 | text-classification:5 | text-generation:6 | auto-association:7 | autoencoder:8 | ae-classifier:9 |",
"modelArgs": "",
"layersSizes": "70x1x1k5x1x1x64p0s1t0,66x1x64k2x1p0s1,65x1x64k5x1x64x64p0s1t0,61x1x64k2x1p0s1,60x1x64k5x1x64x32p0s1t0,1,32,16,9",
"_doc_layersSizes": "List of postive integers [L0, L1, ..., LN]",
"layerTypesList": "2,4,2,4,2,9,3,3,3",
"_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": "11,2,11,2,11,1,6,6,11",
"_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 |",
"_doc_layer_functions_probabilistic": " Binary:1 | Logistic:2 | Competitive:3 | Softmax:4 |",
"_doc_layer_functions_scaler": " none:1 | MinMax:2 | MeanStd:3 | STD:4 | Log:5 |",
"lossMethod": "2",
"_doc_lossMethod": " SSE:1 | MSE:2 | NSE:3 | MinkowskiE:4 | WSE:5 | CEE:6 |",
"lossArgs": "",
"_doc_lossArgs": "Arguments to loss function. Regularization: reg=L2, reg=L1, reg=NoRegularization (can be also empty)",
"lr": "0.00001",
"_doc_lr": "Positve float",
"epochs": "1",
"_doc_epochs": "Positve Integer",
"optimizer": "5",
"_doc_optimizer": " GD:0 | CGD:1 | SGD:2 | QuasiNeuton:3 | LVM:4 | ADAM:5 |",
"optimizerArgs": "",
"_doc_optimizerArgs": "String",
"infraType": "0",
"_doc_infraType": " opennn:0 | wolfengine:1 |",
"distributedSystemType": "0",
"_doc_distributedSystemType": " none:0 | fedClientAvg:1 | fedServerAvg:2 |",
"distributedSystemArgs": "",
"_doc_distributedSystemArgs": "String",
"distributedSystemToken": "none",
"_doc_distributedSystemToken": "Token that associates distributed group of workers and parameter-server"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@
"_doc_layer_functions_scaler": " none:1 | MinMax:2 | MeanStd:3 | STD:4 | Log:5 |",
"lossMethod": "2",
"_doc_lossMethod": " SSE:1 | MSE:2 | NSE:3 | MinkowskiE:4 | WSE:5 | CEE:6 |",
"lossArgs:": "",
"_doc_lossArgs": "Arguments to loss function. Regularization: reg=L2, reg=L1, reg=NoRegularization (can be also empty)",
"lr": "0.01",
"_doc_lr": "Positve float",
"epochs": "1",
Expand Down Expand Up @@ -124,6 +126,8 @@
"_doc_layer_functions_scaler": " none:1 | MinMax:2 | MeanStd:3 | STD:4 | Log:5 |",
"lossMethod": "2",
"_doc_lossMethod": " SSE:1 | MSE:2 | NSE:3 | MinkowskiE:4 | WSE:5 | CEE:6 |",
"lossArgs:": "",
"_doc_lossArgs": "Arguments to loss function. Regularization: reg=L2, reg=L1, reg=NoRegularization (can be also empty)",
"lr": "0.01",
"_doc_lr": "Positve float",
"epochs": "1",
Expand All @@ -142,4 +146,4 @@
"_doc_distributedSystemToken": "Token that associates distributed group of workers and parameter-server"
}
}
}
}
2 changes: 2 additions & 0 deletions inputJsonsFiles/Workers/distributed_worker.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
"_doc_layer_functions_scaler": " none:1 | MinMax:2 | MeanStd:3 | STD:4 | Log:5 |",
"lossMethod": "2",
"_doc_lossMethod": " SSE:1 | MSE:2 | NSE:3 | MinkowskiE:4 | WSE:5 | CEE:6 |",
"lossArgs:": "",
"_doc_lossArgs": "Arguments to loss function. Regularization: reg=L2, reg=L1, reg=NoRegularization (can be also empty)",
"lr": "0.001",
"_doc_lr": "Positve float",
"epochs": "1",
Expand Down
4 changes: 3 additions & 1 deletion inputJsonsFiles/Workers/worker_ae_classifier.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
"_doc_layer_functions_scaler": " none:1 | MinMax:2 | MeanStd:3 | STD:4 | Log:5 |",
"lossMethod": "2",
"_doc_lossMethod": " SSE:1 | MSE:2 | NSE:3 | MinkowskiE:4 | WSE:5 | CEE:6 |",
"lossArgs:": "",
"_doc_lossArgs": "Arguments to loss function. Regularization: reg=L2, reg=L1, reg=NoRegularization (can be also empty)",
"lr": "0.01",
"_doc_lr": "Positve float",
"epochs": "1",
Expand All @@ -30,4 +32,4 @@
"_doc_distributedSystemArgs": "String",
"distributedSystemToken": "none",
"_doc_distributedSystemToken": "Token that associates distributed group of workers and parameter-server"
}
}
4 changes: 3 additions & 1 deletion inputJsonsFiles/Workers/worker_fed_client.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
"_doc_layer_functions_scaler": " none:1 | MinMax:2 | MeanStd:3 | STD:4 | Log:5 |",
"lossMethod": "2",
"_doc_lossMethod": " SSE:1 | MSE:2 | NSE:3 | MinkowskiE:4 | WSE:5 | CEE:6 |",
"lossArgs:": "",
"_doc_lossArgs": "Arguments to loss function. Regularization: reg=L2, reg=L1, reg=NoRegularization (can be also empty)",
"lr": "0.01",
"_doc_lr": "Positve float",
"epochs": "1",
Expand All @@ -30,4 +32,4 @@
"_doc_distributedSystemArgs": "String",
"distributedSystemToken": "9922u",
"_doc_distributedSystemToken": "Token that associates distributed group of workers and parameter-server"
}
}
4 changes: 3 additions & 1 deletion inputJsonsFiles/Workers/worker_fed_server.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
"_doc_layer_functions_scaler": " none:1 | MinMax:2 | MeanStd:3 | STD:4 | Log:5 |",
"lossMethod": "2",
"_doc_lossMethod": " SSE:1 | MSE:2 | NSE:3 | MinkowskiE:4 | WSE:5 | CEE:6 |",
"lossArgs:": "",
"_doc_lossArgs": "Arguments to loss function. Regularization: reg=L2, reg=L1, reg=NoRegularization (can be also empty)",
"lr": "0.01",
"_doc_lr": "Positve float",
"epochs": "1",
Expand All @@ -30,4 +32,4 @@
"_doc_distributedSystemArgs": "String",
"distributedSystemToken": "9922u",
"_doc_distributedSystemToken": "Token that associates distributed group of workers and parameter-server"
}
}
4 changes: 3 additions & 1 deletion inputJsonsFiles/Workers/worker_latest.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
"_doc_layer_functions_scaler": " none:1 | MinMax:2 | MeanStd:3 | STD:4 | Log:5 |",
"lossMethod": "2",
"_doc_lossMethod": " SSE:1 | MSE:2 | NSE:3 | MinkowskiE:4 | WSE:5 | CEE:6 |",
"lossArgs:": "",
"_doc_lossArgs": "Arguments to loss function. Regularization: reg=L2, reg=L1, reg=NoRegularization (can be also empty)",
"lr": "0.01",
"_doc_lr": "Positve float",
"epochs": "1",
Expand All @@ -28,4 +30,4 @@
"_doc_distributedSystemArgs": "String",
"distributedSystemToken": "none",
"_doc_distributedSystemToken": "Token that associates distributed group of workers and parameter-server"
}
}
4 changes: 3 additions & 1 deletion inputJsonsFiles/Workers/worker_synt_ori_new.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
"_doc_layer_functions_scaler": " none:1 | MinMax:2 | MeanStd:3 | STD:4 | Log:5 |",
"lossMethod": "2",
"_doc_lossMethod": " SSE:1 | MSE:2 | NSE:3 | MinkowskiE:4 | WSE:5 | CEE:6 |",
"lossArgs:": "",
"_doc_lossArgs": "Arguments to loss function. Regularization: reg=L2, reg=L1, reg=NoRegularization (can be also empty)",
"lr": "0.001",
"_doc_lr": "Positve float",
"epochs": "1",
Expand All @@ -30,4 +32,4 @@
"_doc_distributedSystemArgs": "String",
"distributedSystemToken": "none",
"_doc_distributedSystemToken": "Token that associates distributed group of workers and parameter-server"
}
}
4 changes: 3 additions & 1 deletion inputJsonsFiles/Workers/worker_test_synt_1d_2c_1s_4r_4w.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
"_doc_layer_functions_scaler": " none:1 | MinMax:2 | MeanStd:3 | STD:4 | Log:5 |",
"lossMethod": "2",
"_doc_lossMethod": " SSE:1 | MSE:2 | NSE:3 | MinkowskiE:4 | WSE:5 | CEE:6 |",
"lossArgs:": "",
"_doc_lossArgs": "Arguments to loss function. Regularization: reg=L2, reg=L1, reg=NoRegularization (can be also empty)",
"lr": "0.001",
"_doc_lr": "Positve float",
"epochs": "1",
Expand All @@ -28,4 +30,4 @@
"_doc_distributedSystemArgs": "String",
"distributedSystemToken": "none",
"_doc_distributedSystemToken": "Token that associates distributed group of workers and parameter-server"
}
}
Loading

0 comments on commit 86dc5a8

Please sign in to comment.