Skip to content

Commit

Permalink
fix_phase_called_twice- conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@NoaShapira8
NoaShapira8 committed Jul 14, 2024
2 parents 6d92799 + d2b6830 commit b6a1c26
Show file tree
Hide file tree
Showing 45 changed files with 1,964 additions and 475 deletions.
629 changes: 629 additions & 0 deletions examples/AEC/AEC_Exp.ipynb
View file

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions inputJsonsFiles/ConnectionMap/conn_8Routers10Clients3S.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"connectionsMap":
{
"r1":["mainServer", "c1", "s1", "r2","c9"],
"r2":["c2","s2", "r3","c10"],
"r3":["c3","s3", "r4"],
"r4":["c4", "r5"],
"r5":["c5", "r6"],
"r6":["c6", "r7"],
"r7":["c7", "r8"],
"r8":["c8", "r1"]
}
}
283 changes: 283 additions & 0 deletions inputJsonsFiles/DistributedConfig/dc_10w_14d_8r_3s_10c_synt.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,283 @@
{
"nerlnetSettings": {
"frequency": "50",
"batchSize": "50"
},
"mainServer": {
"port": "8900",
"args": ""
},
"apiServer": {
"port": "8901",
"args": ""
},
"devices": [
{
"name": "vm0",
"ipv4": "10.0.0.31",
"entities": "mainServer,apiServer"
},
{
"name": "vm1",
"ipv4": "10.0.0.18",
"entities": "c1,r1"
},
{
"name": "vm2",
"ipv4": "10.0.0.27",
"entities": "c2,r2"
},
{
"name": "vm3",
"ipv4": "10.0.0.28",
"entities": "c3,r3"
},
{
"name": "vm4",
"ipv4": "10.0.0.29",
"entities": "c4,r4"
},
{
"name": "vm5",
"ipv4": "10.0.0.19",
"entities": "c5,r5"
},
{
"name": "vm6",
"ipv4": "10.0.0.20",
"entities": "c6,r6"
},
{
"name": "vm7",
"ipv4": "10.0.0.21",
"entities": "c7,r7"
},
{
"name": "vm8",
"ipv4": "10.0.0.22",
"entities": "c8,r8"
},
{
"name": "vm9",
"ipv4": "10.0.0.23",
"entities": "c9"
},
{
"name": "vm10",
"ipv4": "10.0.0.24",
"entities": "c10"
},
{
"name": "vm11",
"ipv4": "10.0.0.25",
"entities": "s1"
},
{
"name": "vm12",
"ipv4": "10.0.0.26",
"entities": "s2"
},
{
"name": "vm13",
"ipv4": "10.0.0.17",
"entities": "s3"
}
],
"routers": [
{
"name": "r1",
"port": "8915",
"policy": "0"
},
{
"name": "r2",
"port": "8916",
"policy": "0"
},
{
"name": "r3",
"port": "8917",
"policy": "0"
},
{
"name": "r4",
"port": "8918",
"policy": "0"
},
{
"name": "r5",
"port": "8919",
"policy": "0"
},
{
"name": "r6",
"port": "8920",
"policy": "0"
},
{
"name": "r7",
"port": "8921",
"policy": "0"
},
{
"name": "r8",
"port": "8922",
"policy": "0"
}
],
"sources": [
{
"name": "s1",
"port": "8902",
"frequency": "50",
"policy": "0",
"epochs": "1",
"type": "0"
},
{
"name": "s2",
"port": "8903",
"frequency": "50",
"policy": "0",
"epochs": "1",
"type": "0"
},
{
"name": "s3",
"port": "8904",
"frequency": "50",
"policy": "0",
"epochs": "1",
"type": "0"
}
],
"clients": [
{
"name": "c1",
"port": "8905",
"workers": "w1"
},
{
"name": "c2",
"port": "8906",
"workers": "w2"
},
{
"name": "c3",
"port": "8907",
"workers": "w3"
},
{
"name": "c4",
"port": "8908",
"workers": "w4"
},
{
"name": "c5",
"port": "8909",
"workers": "w5"
},
{
"name": "c6",
"port": "8910",
"workers": "w6"
},
{
"name": "c7",
"port": "8911",
"workers": "w7"
},
{
"name": "c8",
"port": "8912",
"workers": "w8"
},
{
"name": "c9",
"port": "8913",
"workers": "w9"
},
{
"name": "c10",
"port": "8914",
"workers": "w10"
}
],
"workers": [
{
"name": "w1",
"model_sha": "99264b4582544a42f7eae15af11ee95486450770301de460847a757e3135dc6a"
},
{
"name": "w2",
"model_sha": "99264b4582544a42f7eae15af11ee95486450770301de460847a757e3135dc6a"
},
{
"name": "w3",
"model_sha": "99264b4582544a42f7eae15af11ee95486450770301de460847a757e3135dc6a"
},
{
"name": "w4",
"model_sha": "99264b4582544a42f7eae15af11ee95486450770301de460847a757e3135dc6a"
},
{
"name": "w5",
"model_sha": "99264b4582544a42f7eae15af11ee95486450770301de460847a757e3135dc6a"
},
{
"name": "w6",
"model_sha": "99264b4582544a42f7eae15af11ee95486450770301de460847a757e3135dc6a"
},
{
"name": "w7",
"model_sha": "99264b4582544a42f7eae15af11ee95486450770301de460847a757e3135dc6a"
},
{
"name": "w8",
"model_sha": "99264b4582544a42f7eae15af11ee95486450770301de460847a757e3135dc6a"
},
{
"name": "w9",
"model_sha": "99264b4582544a42f7eae15af11ee95486450770301de460847a757e3135dc6a"
},
{
"name": "w10",
"model_sha": "99264b4582544a42f7eae15af11ee95486450770301de460847a757e3135dc6a"
}
],
"model_sha": {
"99264b4582544a42f7eae15af11ee95486450770301de460847a757e3135dc6a": {
"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": "",
"_doc_modelArgs": "Extra arguments to model",
"layersSizes": "5,10,5,3",
"_doc_layersSizes": "List of postive integers [L0, L1, ..., LN]",
"layerTypesList": "1,3,3,3",
"_doc_LayerTypes": " Default:0 | Scaling:1 | Conv:2 | Perceptron:3 | Pooling:4 | Probabilistic:5 | LSTM:6 | Reccurrent:7 | Unscaling:8 | Flatten:9 | Bounding:10 |",
"layers_functions": "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 |",
"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": "none",
"_doc_optimizerArgs": "String",
"infraType": "0",
"_doc_infraType": " opennn:0 | wolfengine:1 |",
"distributedSystemType": "0",
"_doc_distributedSystemType": " none:0 | fedClientAvg:1 | fedServerAvg:2 |",
"distributedSystemArgs": "none",
"_doc_distributedSystemArgs": "String",
"distributedSystemToken": "none",
"_doc_distributedSystemToken": "Token that associates distributed group of workers and parameter-server"
}
}
}
8 changes: 4 additions & 4 deletions inputJsonsFiles/DistributedConfig/dc_AEC_1d_2c_1s_4r_4w.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,16 @@
"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": "64,32,16,8,16,32,64,64",
"layersSizes": "8,4,2,4,8,8",
"_doc_layersSizes": "List of postive integers [L0, L1, ..., LN]",
"layerTypesList": "1,3,3,3,3,3,3,10",
"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 |",
"layers_functions": "1,6,6,6,6,6,6,1",
"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 |",
"_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": "6",
"lossMethod": "2",
"_doc_lossMethod": " SSE:1 | MSE:2 | NSE:3 | MinkowskiE:4 | WSE:5 | CEE:6 |",
"lr": "0.01",
"_doc_lr": "Positve float",
Expand Down
33 changes: 33 additions & 0 deletions inputJsonsFiles/Workers/worker_synt_ori_new.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"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": "",
"_doc_modelArgs": "Extra arguments to model",
"layersSizes": "5,10,5,3",
"_doc_layersSizes": "List of postive integers [L0, L1, ..., LN]",
"layerTypesList": "1,3,3,3",
"_doc_LayerTypes": " Default:0 | Scaling:1 | Conv:2 | Perceptron:3 | Pooling:4 | Probabilistic:5 | LSTM:6 | Reccurrent:7 | Unscaling:8 | Flatten:9 | Bounding:10 |",
"layers_functions": "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 |",
"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": "none",
"_doc_optimizerArgs": "String",
"infraType": "0",
"_doc_infraType": " opennn:0 | wolfengine:1 |",
"distributedSystemType": "0",
"_doc_distributedSystemType": " none:0 | fedClientAvg:1 | fedServerAvg:2 |",
"distributedSystemArgs": "none",
"_doc_distributedSystemArgs": "String",
"distributedSystemToken": "none",
"_doc_distributedSystemToken": "Token that associates distributed group of workers and parameter-server"
}
Loading

0 comments on commit b6a1c26

Please sign in to comment.