Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AEC_exp #397

Merged
merged 68 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
899cb46
14 Devices Distributed Experiment Added
GuyPerets106 Jun 24, 2024
751557a
Merge branch 'master' of github.com:leondavi/NErlNet
GuyPerets106 Jun 28, 2024
94ad928
Merge branch 'master' of github.com:leondavi/NErlNet
GuyPerets106 Jun 29, 2024
dc1a39d
[AEC] Exp working
GuyPerets106 Jul 2, 2024
82c96ce
Merge branch 'master' of github.com:leondavi/NErlNet into AEC_exp
GuyPerets106 Jul 7, 2024
c8432e6
Merge branch 'master' of github.com:leondavi/NErlNet into AEC_exp
GuyPerets106 Jul 7, 2024
19ebdda
[AEC_exp] Small changes
GuyPerets106 Jul 12, 2024
b3f7a32
Merge branch 'master' of github.com:leondavi/NErlNet into AEC_exp
GuyPerets106 Jul 12, 2024
763a7fe
Merge branch 'master' of github.com:leondavi/NErlNet into AEC_exp
GuyPerets106 Jul 13, 2024
3bbb2da
[AEC_exp] Changes
GuyPerets106 Jul 14, 2024
e85565c
[AEC_exp] Latest changes
GuyPerets106 Jul 18, 2024
88f67a7
Merge branch 'master' of github.com:leondavi/NErlNet into AEC_exp
GuyPerets106 Jul 18, 2024
4217701
Merge branch 'master' of github.com:leondavi/NErlNet into AEC_exp
GuyPerets106 Jul 18, 2024
33db2e1
[AEC_Exp] WIP
GuyPerets106 Jul 21, 2024
1ab46bf
Merge branch 'master' of github.com:leondavi/NErlNet into AEC_exp
GuyPerets106 Jul 22, 2024
5ea5646
[AEC] Added EMA Only Mode
GuyPerets106 Jul 28, 2024
e6baaa7
[AEC_Exp] Exp Notebook WIP
GuyPerets106 Jul 31, 2024
c70252c
[AEC_Exp] WIP
GuyPerets106 Aug 1, 2024
2993be1
[AEC_Exp] WIP
GuyPerets106 Aug 2, 2024
f891f2d
[AEC_Exp] WIP RR
GuyPerets106 Aug 2, 2024
24c7cf0
[AEC_Exp] Added source policy check in stats
GuyPerets106 Aug 3, 2024
6903794
[AEC_Exp] RR Fixes
GuyPerets106 Aug 3, 2024
5805829
Merge branch 'master' of github.com:leondavi/NErlNet into AEC_exp
GuyPerets106 Aug 3, 2024
fe850d1
Merge branch 'master' of github.com:leondavi/NErlNet into AEC_exp
GuyPerets106 Aug 3, 2024
3d99d22
[AEC_Exp] WIP
GuyPerets106 Aug 4, 2024
e4ed4bd
Merge branch 'master' of github.com:leondavi/NErlNet into AEC_exp
GuyPerets106 Aug 4, 2024
0a8f0e0
[AEC_EXP] WIP
GuyPerets106 Aug 7, 2024
dc4251e
Merge branch 'master' of github.com:leondavi/NErlNet into AEC_exp
GuyPerets106 Aug 7, 2024
4c3dacd
[AEC_Exp] JSON Files update
GuyPerets106 Aug 8, 2024
b61937a
Merge branch 'master' of github.com:leondavi/NErlNet into AEC_exp
GuyPerets106 Aug 8, 2024
8bf04d0
Merge branch 'master' of github.com:leondavi/NErlNet into AEC_exp
GuyPerets106 Aug 10, 2024
8b1519a
[AEC_EXP] WIP
GuyPerets106 Aug 12, 2024
3596d0f
Merge branch 'master' of github.com:leondavi/NErlNet into AEC_exp
GuyPerets106 Aug 12, 2024
590d7f9
[AEC] WIP
GuyPerets106 Aug 14, 2024
19ced9e
Merge branch 'master' of github.com:leondavi/NErlNet into AEC_exp
GuyPerets106 Aug 14, 2024
ab17032
[AEC] WIP
GuyPerets106 Aug 15, 2024
9ca34e4
[AEC] WIP
GuyPerets106 Aug 15, 2024
a6a675e
[AEC] WIP
GuyPerets106 Aug 15, 2024
b669d07
[AEC] WIP
GuyPerets106 Aug 15, 2024
78596fe
[AEC] WIP
GuyPerets106 Aug 15, 2024
0d44e04
[AEC] WIP
GuyPerets106 Aug 15, 2024
506927e
[AEC] WIP
GuyPerets106 Aug 15, 2024
8f36be5
[AEC] WIP
GuyPerets106 Aug 15, 2024
03acb78
[AEC] WIP
GuyPerets106 Aug 15, 2024
28f3325
[AEC] WIP
GuyPerets106 Aug 15, 2024
4bda261
[AEC] WIP
GuyPerets106 Aug 15, 2024
82532ec
[AEC] WIP
GuyPerets106 Aug 15, 2024
f590d71
[AEC] WIP
GuyPerets106 Aug 15, 2024
87a14df
[AEC] WIP
GuyPerets106 Aug 15, 2024
a48cfe4
[AEC] WIP
GuyPerets106 Aug 15, 2024
8477898
[AEC] WIP
GuyPerets106 Aug 15, 2024
2dcf9d9
[AEC] WIP
GuyPerets106 Aug 15, 2024
bf2c5a3
[AEC] WIP
GuyPerets106 Aug 16, 2024
cf0d390
[AEC] WIP
GuyPerets106 Aug 17, 2024
3e20266
[AEC] WIP
GuyPerets106 Aug 17, 2024
f58e8ef
removed loss_values tensor
GuyPerets106 Aug 20, 2024
eb5e633
Added Size Print
GuyPerets106 Aug 20, 2024
45a196d
Size Print
GuyPerets106 Aug 20, 2024
7ea8715
Print Size
GuyPerets106 Aug 20, 2024
797c619
Removed Size Print
GuyPerets106 Aug 20, 2024
48adb71
Changed Calculate Size
GuyPerets106 Aug 20, 2024
f8ce3e3
Print Size
GuyPerets106 Aug 20, 2024
26e41ab
Removed Prints
GuyPerets106 Aug 20, 2024
730387c
Merge branch 'master' of github.com:leondavi/NErlNet into AEC_exp
GuyPerets106 Aug 23, 2024
765e459
[AEC_Exp] Last commit - remove prints
GuyPerets106 Aug 23, 2024
dec2550
OpenNN ScalingLayer Fix
GuyPerets106 Aug 27, 2024
549ddfa
Shared Pointers Fix
GuyPerets106 Aug 27, 2024
81d50d6
Fixed loss_val_tensor size
GuyPerets106 Aug 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,328 changes: 1,042 additions & 286 deletions examples/AEC/AEC_Exp.ipynb

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions inputJsonsFiles/ConnectionMap/conn_AEC_1d_2c_1s_4r_4w.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"connectionsMap":
{
"r1":["mainServer","c1","s1", "r2"],
"r2":["r3"],
"r3":["r4"],
"r4":["r1"]
}
}
9 changes: 9 additions & 0 deletions inputJsonsFiles/ConnectionMap/conn_AEC_4d_4r_2s_4c_4w.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"connectionsMap":
{
"r1":["mainServer","c1","s1", "r2"],
"r2":["r3"],
"r3":["s2", "r4"],
"r4":["c2", "c3", "c4", "r1"]
}
}
9 changes: 9 additions & 0 deletions inputJsonsFiles/ConnectionMap/conn_AEC_KDD14_test.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"connectionsMap":
{
"r1":["mainServer","c1","s1", "r2"],
"r2":["r3"],
"r3":["r4"],
"r4":["r1"]
}
}
9 changes: 9 additions & 0 deletions inputJsonsFiles/ConnectionMap/conn_AEC_skab_test.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"connectionsMap":
{
"r1":["mainServer","c1","s1", "r2"],
"r2":["r3"],
"r3":["r4"],
"r4":["r1"]
}
}
9 changes: 9 additions & 0 deletions inputJsonsFiles/DistributedConfig/conn_AEC_baseline.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"connectionsMap":
{
"r1":["mainServer","c1","s1", "r2"],
"r2":["r3"],
"r3":["s2", "r4"],
"r4":["r1"]
}
}
31 changes: 9 additions & 22 deletions inputJsonsFiles/DistributedConfig/dc_AEC_1d_2c_1s_4r_4w.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"nerlnetSettings": {
"frequency": "200",
"frequency": "300",
"batchSize": "100"
},
"mainServer": {
Expand All @@ -13,7 +13,7 @@
},
"devices": [
{
"name": "pc1",
"name": "C0VM0",
"ipv4": "10.0.0.5",
"entities": "c1,c2,r2,r1,r3,r4,s1,apiServer,mainServer"
}
Expand Down Expand Up @@ -44,7 +44,7 @@
{
"name": "s1",
"port": "8085",
"frequency": "200",
"frequency": "300",
"policy": "0",
"epochs": "1",
"type": "0"
Expand All @@ -55,11 +55,6 @@
"name": "c1",
"port": "8083",
"workers": "w1,w2"
},
{
"name": "c2",
"port": "8084",
"workers": "w3,w4"
}
],
"workers": [
Expand All @@ -70,33 +65,25 @@
{
"name": "w2",
"model_sha": "d8df752e0a2e8f01de8f66e9cec941cdbc65d144ecf90ab7713e69d65e7e82aa"
},
{
"name": "w3",
"model_sha": "d8df752e0a2e8f01de8f66e9cec941cdbc65d144ecf90ab7713e69d65e7e82aa"
},
{
"name": "w4",
"model_sha": "d8df752e0a2e8f01de8f66e9cec941cdbc65d144ecf90ab7713e69d65e7e82aa"
}
],
"model_sha": {
"d8df752e0a2e8f01de8f66e9cec941cdbc65d144ecf90ab7713e69d65e7e82aa": {
"modelType": "9",
"_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": "8,4,2,4,8,8",
"modelArgs": "k=0.5,alpha=0.4,use_ema_only=1",
"layersSizes": "10,32,16,32,10",
"_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 | Flatten:9 | Bounding:10 |",
"layers_functions": "1,6,6,6,6,1",
"layerTypesList": "1,3,3,3,3",
"_doc_LayerTypes": " Default:0 | Scaling:1 | CNN:2 | Perceptron:3 | Pooling:4 | Probabilistic:5 | LSTM:6 | Reccurrent:7 | Unscaling:8 |",
"layers_functions": "1,7,7,7,7",
"_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 |",
"lr": "0.01",
"lr": "0.001",
"_doc_lr": "Positve float",
"epochs": "1",
"_doc_epochs": "Positve Integer",
Expand Down
152 changes: 152 additions & 0 deletions inputJsonsFiles/DistributedConfig/dc_AEC_4d_4r_2s_4c_4w.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
{
"nerlnetSettings": {
"frequency": "300",
"batchSize": "100"
},
"mainServer": {
"port": "8900",
"args": ""
},
"apiServer": {
"port": "8901",
"args": ""
},
"devices": [
{
"name": "C0VM0",
"ipv4": "10.0.0.5",
"entities": "apiServer,mainServer,c1,r1,s1"
},
{
"name": "MinionMS",
"ipv4": "10.0.0.31",
"entities": "c2,r2,s2"
},
{
"name": "Minion0",
"ipv4": "10.0.0.17",
"entities": "c3,r3"
},
{
"name": "Minion1",
"ipv4": "10.0.0.18",
"entities": "c4,r4"
}
],
"routers": [
{
"name": "r1",
"port": "8086",
"policy": "0"
},
{
"name": "r2",
"port": "8087",
"policy": "0"
},
{
"name": "r3",
"port": "8088",
"policy": "0"
},
{
"name": "r4",
"port": "8089",
"policy": "0"
}
],
"sources": [
{
"name": "s1",
"port": "8085",
"frequency": "500",
"policy": "0",
"epochs": "1",
"type": "0"
},
{
"name": "s2",
"port": "8085",
"frequency": "500",
"policy": "0",
"epochs": "1",
"type": "0"
}
],
"clients": [
{
"name": "c1",
"port": "8083",
"workers": "w1"
},
{
"name": "c2",
"port": "8083",
"workers": "w2"
},
{
"name": "c3",
"port": "8083",
"workers": "w3"
},
{
"name": "c4",
"port": "8083",
"workers": "w4"
}
],
"workers": [
{
"name": "w1",
"model_sha": "d8df752e0a2e8f01de8f66e9cec941cdbc65d144ecf90ab7713e69d65e7e82aa"
},
{
"name": "w2",
"model_sha": "d8df752e0a2e8f01de8f66e9cec941cdbc65d144ecf90ab7713e69d65e7e82aa"
},
{
"name": "w3",
"model_sha": "d8df752e0a2e8f01de8f66e9cec941cdbc65d144ecf90ab7713e69d65e7e82aa"
},
{
"name": "w4",
"model_sha": "d8df752e0a2e8f01de8f66e9cec941cdbc65d144ecf90ab7713e69d65e7e82aa"
}
],
"model_sha": {
"d8df752e0a2e8f01de8f66e9cec941cdbc65d144ecf90ab7713e69d65e7e82aa": {
"modelType": "9",
"_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": "k=1.9,alpha=0.4,use_ema_only=1",
"layersSizes": "10,128,64,32,16,32,64,128,10",
"_doc_layersSizes": "List of postive integers [L0, L1, ..., LN]",
"layerTypesList": "1,3,3,3,3,3,3,3,3",
"_doc_LayerTypes": " Default:0 | Scaling:1 | CNN:2 | Perceptron:3 | Pooling:4 | Probabilistic:5 | LSTM:6 | Reccurrent:7 | Unscaling:8 |",
"layers_functions": "1,8,8,8,8,8,8,8,8",
"_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": "reg=L2, reg=L1, reg=NoRegularization (can be also empty)",
"lr": "0.001",
"_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"
}
}
}
104 changes: 104 additions & 0 deletions inputJsonsFiles/DistributedConfig/dc_AEC_KDD14_test.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
{
"nerlnetSettings": {
"frequency": "300",
"batchSize": "100"
},
"mainServer": {
"port": "8081",
"args": ""
},
"apiServer": {
"port": "8082",
"args": ""
},
"devices": [
{
"name": "C0VM0",
"ipv4": "10.0.0.5",
"entities": "c1,c2,r2,r1,r3,r4,s1,apiServer,mainServer"
}
],
"routers": [
{
"name": "r1",
"port": "8086",
"policy": "0"
},
{
"name": "r2",
"port": "8087",
"policy": "0"
},
{
"name": "r3",
"port": "8088",
"policy": "0"
},
{
"name": "r4",
"port": "8089",
"policy": "0"
}
],
"sources": [
{
"name": "s1",
"port": "8085",
"frequency": "300",
"policy": "0",
"epochs": "5",
"type": "0"
}
],
"clients": [
{
"name": "c1",
"port": "8083",
"workers": "w1,w2"
}
],
"workers": [
{
"name": "w1",
"model_sha": "d8df752e0a2e8f01de8f66e9cec941cdbc65d144ecf90ab7713e69d65e7e82aa"
},
{
"name": "w2",
"model_sha": "d8df752e0a2e8f01de8f66e9cec941cdbc65d144ecf90ab7713e69d65e7e82aa"
}
],
"model_sha": {
"d8df752e0a2e8f01de8f66e9cec941cdbc65d144ecf90ab7713e69d65e7e82aa": {
"modelType": "9",
"_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": "k=0.5,alpha=0.4,use_ema_only=1",
"layersSizes": "10,64,32,16,32,64,10",
"_doc_layersSizes": "List of postive integers [L0, L1, ..., LN]",
"layerTypesList": "1,3,3,3,3,3,3",
"_doc_LayerTypes": " Default:0 | Scaling:1 | CNN:2 | Perceptron:3 | Pooling:4 | Probabilistic:5 | LSTM:6 | Reccurrent:7 | Unscaling:8 |",
"layers_functions": "1,8,8,8,8,8,8",
"_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 |",
"lr": "0.0001",
"_doc_lr": "Positve float",
"epochs": "1",
"_doc_epochs": "Positve Integer",
"optimizer": "2",
"_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"
}
}
}
Loading