Skip to content

Commit 98f1801

Browse files
leondavileondavi
authored
Merge pull request #399 from leondavi/fix_init
Optimize initialization parsing and source pieces creation
2 parents ea3df3c + c7225d7 commit 98f1801

File tree

14 files changed

+547
-51
lines changed

14 files changed

+547
-51
lines changed

‎inputJsonsFiles/ConnectionMap/conn_paper_25bs_5hz.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"connectionsMap":
3+
{
4+
"r1":["mainServer", "c1", "s1", "r2", "s3", "s4"],
5+
"r2":["s2", "r1"]
6+
}
7+
}

‎inputJsonsFiles/DistributedConfig/dc_paper_25bs_5hz.json

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+
{
2+
"nerlnetSettings": {
3+
"frequency": "5",
4+
"batchSize": "25"
5+
},
6+
"mainServer": {
7+
"port": "8080",
8+
"args": ""
9+
},
10+
"apiServer": {
11+
"port": "8081",
12+
"args": ""
13+
},
14+
"devices": [
15+
{
16+
"name": "NerlNist-Powerful",
17+
"ipv4": "10.0.0.57",
18+
"entities": "mainServer,apiServer,c1"
19+
},
20+
{
21+
"name": "C0VM0",
22+
"ipv4": "10.0.0.5",
23+
"entities": "s1"
24+
},
25+
{
26+
"name": "C0VM1",
27+
"ipv4": "10.0.0.4",
28+
"entities": "s2"
29+
},
30+
{
31+
"name": "C0VM2",
32+
"ipv4": "10.0.0.9",
33+
"entities": "s3"
34+
},
35+
{
36+
"name": "C0VM3",
37+
"ipv4": "10.0.0.7",
38+
"entities": "s4"
39+
},
40+
{
41+
"name": "NerlNist-6",
42+
"ipv4": "10.0.0.44",
43+
"entities": "r1"
44+
},
45+
{
46+
"name": "NerlNist-8",
47+
"ipv4": "10.0.0.43",
48+
"entities": "r2"
49+
}
50+
],
51+
"routers": [
52+
{
53+
"name": "r1",
54+
"port": "8090",
55+
"policy": "0"
56+
},
57+
{
58+
"name": "r2",
59+
"port": "8090",
60+
"policy": "0"
61+
}
62+
],
63+
"sources": [
64+
{
65+
"name": "s1",
66+
"port": "8086",
67+
"frequency": "5",
68+
"policy": "0",
69+
"epochs": "1",
70+
"type": "0"
71+
},
72+
{
73+
"name": "s2",
74+
"port": "8086",
75+
"frequency": "5",
76+
"policy": "0",
77+
"epochs": "1",
78+
"type": "0"
79+
},
80+
{
81+
"name": "s3",
82+
"port": "8086",
83+
"frequency": "80",
84+
"policy": "0",
85+
"epochs": "1",
86+
"type": "0"
87+
},
88+
{
89+
"name": "s4",
90+
"port": "8086",
91+
"frequency": "80",
92+
"policy": "0",
93+
"epochs": "1",
94+
"type": "0"
95+
}
96+
],
97+
"clients": [
98+
{
99+
"name": "c1",
100+
"port": "8082",
101+
"workers": "w1"
102+
}
103+
],
104+
"workers": [
105+
{
106+
"name": "w1",
107+
"model_sha": "9c5f1261068be7be96487a2cae282aa22e8c1cb482a5bf8d557bc8e1e2b6fef0"
108+
}
109+
],
110+
"model_sha": {
111+
"9c5f1261068be7be96487a2cae282aa22e8c1cb482a5bf8d557bc8e1e2b6fef0": {
112+
"modelType": "0",
113+
"_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 |",
114+
"modelArgs": "",
115+
"_doc_modelArgs": "Extra arguments to model",
116+
"layersSizes": "28x28x1k5x5x1x6p0s1t1,28x28x6k2x2p0s2,14x14x6k4x4x6x12p0s1t0,1,32,10",
117+
"_doc_layersSizes": "List of postive integers [L0, L1, ..., LN]",
118+
"layerTypesList": "2,4,2,9,3,5",
119+
"_doc_LayerTypes": " Default:0 | Scaling:1 | Conv:2 | Perceptron:3 | Pooling:4 | Probabilistic:5 | LSTM:6 | Reccurrent:7 | Unscaling:8 | Flatten:9 | Bounding:10 |",
120+
"layers_functions": "6,2,6,1,6,4",
121+
"_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 |",
122+
"_doc_layer_functions_pooling": " none:1 | Max:2 | Avg:3 |",
123+
"_doc_layer_functions_probabilistic": " Binary:1 | Logistic:2 | Competitive:3 | Softmax:4 |",
124+
"_doc_layer_functions_scaler": " none:1 | MinMax:2 | MeanStd:3 | STD:4 | Log:5 |",
125+
"lossMethod": "6",
126+
"lossArgs": "",
127+
"_doc_lossMethod": " SSE:1 | MSE:2 | NSE:3 | MinkowskiE:4 | WSE:5 | CEE:6 |",
128+
"lr": "0.001",
129+
"_doc_lr": "Positve float",
130+
"epochs": "1",
131+
"_doc_epochs": "Positve Integer",
132+
"optimizer": "5",
133+
"_doc_optimizer": " GD:0 | CGD:1 | SGD:2 | QuasiNeuton:3 | LVM:4 | ADAM:5 |",
134+
"optimizerArgs": "none",
135+
"_doc_optimizerArgs": "String",
136+
"infraType": "0",
137+
"_doc_infraType": " opennn:0 | wolfengine:1 |",
138+
"distributedSystemType": "0",
139+
"_doc_distributedSystemType": " none:0 | FedClientAvg:1 | FedServerAvg:2 | FedClientWeightedAvgClassification:3 | FedServerWeightedAvgClassification:4 | FedClientAE:5 | FedServerAE:6 | tiles:7 |",
140+
"distributedSystemArgs": "none",
141+
"_doc_distributedSystemArgs": "String",
142+
"distributedSystemToken": "none",
143+
"_doc_distributedSystemToken": "Token that associates distributed group of workers and parameter-server"
144+
}
145+
}
146+
}

‎inputJsonsFiles/DistributedConfig/dc_paper_cifar.json

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+
{
2+
"nerlnetSettings": {
3+
"frequency": "5",
4+
"batchSize": "25"
5+
},
6+
"mainServer": {
7+
"port": "8080",
8+
"args": ""
9+
},
10+
"apiServer": {
11+
"port": "8081",
12+
"args": ""
13+
},
14+
"devices": [
15+
{
16+
"name": "NerlNist-Powerful",
17+
"ipv4": "10.0.0.57",
18+
"entities": "mainServer,apiServer,c1"
19+
},
20+
{
21+
"name": "C0VM0",
22+
"ipv4": "10.0.0.5",
23+
"entities": "s1"
24+
},
25+
{
26+
"name": "C0VM3",
27+
"ipv4": "10.0.0.7",
28+
"entities": "s2"
29+
},
30+
{
31+
"name": "C0VM2",
32+
"ipv4": "10.0.0.9",
33+
"entities": "s3"
34+
},
35+
{
36+
"name": "C0VM1",
37+
"ipv4": "10.0.0.4",
38+
"entities": "s4"
39+
},
40+
{
41+
"name": "NerlNist-6",
42+
"ipv4": "10.0.0.44",
43+
"entities": "r1"
44+
},
45+
{
46+
"name": "NerlNist-8",
47+
"ipv4": "10.0.0.43",
48+
"entities": "r2"
49+
}
50+
],
51+
"routers": [
52+
{
53+
"name": "r1",
54+
"port": "8090",
55+
"policy": "0"
56+
},
57+
{
58+
"name": "r2",
59+
"port": "8090",
60+
"policy": "0"
61+
}
62+
],
63+
"sources": [
64+
{
65+
"name": "s1",
66+
"port": "8086",
67+
"frequency": "5",
68+
"policy": "0",
69+
"epochs": "1",
70+
"type": "0"
71+
},
72+
{
73+
"name": "s2",
74+
"port": "8086",
75+
"frequency": "5",
76+
"policy": "0",
77+
"epochs": "1",
78+
"type": "0"
79+
},
80+
{
81+
"name": "s3",
82+
"port": "8086",
83+
"frequency": "80",
84+
"policy": "0",
85+
"epochs": "1",
86+
"type": "0"
87+
},
88+
{
89+
"name": "s4",
90+
"port": "8086",
91+
"frequency": "80",
92+
"policy": "0",
93+
"epochs": "1",
94+
"type": "0"
95+
}
96+
],
97+
"clients": [
98+
{
99+
"name": "c1",
100+
"port": "8082",
101+
"workers": "w1"
102+
}
103+
],
104+
"workers": [
105+
{
106+
"name": "w1",
107+
"model_sha": "9c5f1261068be7be96487a2cae282aa22e8c1cb482a5bf8d557bc8e1e2b6fef0"
108+
}
109+
],
110+
"model_sha": {
111+
"9c5f1261068be7be96487a2cae282aa22e8c1cb482a5bf8d557bc8e1e2b6fef0": {
112+
"modelType": "0",
113+
"_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 |",
114+
"modelArgs": "",
115+
"_doc_modelArgs": "Extra arguments to model",
116+
"layersSizes": "32x32x3k3x3x3x32p0s1t1,32x32x32k2x2p0s2,16x16x32k3x3x32x64p0s1t1,16x16x64k2x2p0s2,8x8x64k3x3x64x128p0s1t0,1,512,128,10",
117+
"_doc_layersSizes": "List of postive integers [L0, L1, ..., LN]",
118+
"layerTypesList": "2,4,2,4,2,9,3,3,5",
119+
"_doc_LayerTypes": " Default:0 | Scaling:1 | Conv:2 | Perceptron:3 | Pooling:4 | Probabilistic:5 | LSTM:6 | Reccurrent:7 | Unscaling:8 | Flatten:9 | Bounding:10 |",
120+
"layers_functions": "6,2,6,2,6,1,6,11,4",
121+
"_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 |",
122+
"_doc_layer_functions_pooling": " none:1 | Max:2 | Avg:3 |",
123+
"_doc_layer_functions_probabilistic": " Binary:1 | Logistic:2 | Competitive:3 | Softmax:4 |",
124+
"_doc_layer_functions_scaler": " none:1 | MinMax:2 | MeanStd:3 | STD:4 | Log:5 |",
125+
"lossMethod": "6",
126+
"lossArgs": "reg=L2",
127+
"_doc_lossMethod": " SSE:1 | MSE:2 | NSE:3 | MinkowskiE:4 | WSE:5 | CEE:6 |",
128+
"lr": "0.00001",
129+
"_doc_lr": "Positve float",
130+
"epochs": "1",
131+
"_doc_epochs": "Positve Integer",
132+
"optimizer": "5",
133+
"_doc_optimizer": " GD:0 | CGD:1 | SGD:2 | QuasiNeuton:3 | LVM:4 | ADAM:5 |",
134+
"optimizerArgs": "none",
135+
"_doc_optimizerArgs": "String",
136+
"infraType": "0",
137+
"_doc_infraType": " opennn:0 | wolfengine:1 |",
138+
"distributedSystemType": "0",
139+
"_doc_distributedSystemType": " none:0 | FedClientAvg:1 | FedServerAvg:2 | FedClientWeightedAvgClassification:3 | FedServerWeightedAvgClassification:4 | FedClientAE:5 | FedServerAE:6 | tiles:7 |",
140+
"distributedSystemArgs": "none",
141+
"_doc_distributedSystemArgs": "String",
142+
"distributedSystemToken": "none",
143+
"_doc_distributedSystemToken": "Token that associates distributed group of workers and parameter-server"
144+
}
145+
}
146+
}

0 commit comments

Comments
 (0)