Skip to content

Commit 0c3c6fb

Browse files
leondavileondavi
authored
Merge pull request #155 from leondavi/data-split
Data split
2 parents c06cb86 + 4d92a72 commit 0c3c6fb

File tree

60 files changed

+433
-527
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+433
-527
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,5 @@ src_cpp/*.so
4242
/src_cpp/opennnBridge/CMakeFiles
4343
/src_cpp/opennnBridge/Makefile
4444
/src_cpp/opennnBridge/\[binary_dir\]
45+
src_erl/NerlGUI/_build/*
46+
examples/.ipynb_checkpoints/simple_run-checkpoint.ipynb

‎examples/simple_run.ipynb

Lines changed: 111 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,97 @@
22
"cells": [
33
{
44
"cell_type": "code",
5-
"execution_count": null,
5+
"execution_count": 1,
66
"id": "6ce55378",
77
"metadata": {},
88
"outputs": [],
99
"source": [
1010
"from apiServer import *\n",
11-
"from experiment import *"
11+
"from experiment import *\n",
12+
"api_server_instance = ApiServer()"
1213
]
1314
},
1415
{
1516
"cell_type": "code",
16-
"execution_count": null,
17+
"execution_count": 2,
1718
"id": "e7d7d7d4",
1819
"metadata": {},
19-
"outputs": [],
20+
"outputs": [
21+
{
22+
"name": "stdout",
23+
"output_type": "stream",
24+
"text": [
25+
"\n",
26+
"Architechure Files\n",
27+
"--------------------\n",
28+
"\n",
29+
"0.\tarch_1PC1Worker.json\n",
30+
"1.\tarch_1PC1Worker_autoencoder.json\n",
31+
"2.\tarch_1PC2Worker2RouterMonitored.json\n",
32+
"3.\tarch_1PC2WorkerMonitored.json\n",
33+
"4.\tarch_1PC2Workers2Sources_autoencoder.json\n",
34+
"5.\tarch_2PC2Workers.json\n",
35+
"6.\tarch_3Devs3Workers1SourceH.json\n",
36+
"7.\tarch_3Devs4Workers1SourceGUI.json\n",
37+
"8.\tarch_3PC2Workers1SourceMonitored.json\n",
38+
"9.\tarch_4Devs4Workers1Source.json\n",
39+
"10.\tarch_4Devs4Workers1Source1fed.json\n",
40+
"11.\tarch_4Devs4Workers1SourceMonitored.json\n",
41+
"12.\tarch_4Devs4Workers1Source_autoencoder.json\n",
42+
"13.\tarch_4Devs4Workers2Sources.json\n",
43+
"14.\tarch_4Devs4Workers2Sources1fed.json\n",
44+
"15.\tarch_4Devs4Workers2SourcesAzure.json\n",
45+
"16.\tarch_PC1WorkerMonitored.json\n",
46+
"\n",
47+
"Connection Map Files\n",
48+
"--------------------\n",
49+
"\n",
50+
"0.\tconn_1PC1Worker.json\n",
51+
"1.\tconn_1Router2Clients.json\n",
52+
"2.\tconn_1Router3Clients.json\n",
53+
"3.\tconn_1Router4Clients.json\n",
54+
"4.\tconn_1Router4Clients1fed.json\n",
55+
"5.\tconn_1Router4Clients2Sources.json\n",
56+
"6.\tconn_1Router4Clients2Sources1fed.json\n",
57+
"7.\tconn_2Router2Clients1Source.json\n",
58+
"8.\tconn_2Router2ClientsGUI.json\n",
59+
"9.\tconn_3Router3Clients.json\n",
60+
"\n",
61+
"Experiments Flow Files\n",
62+
"--------------------\n",
63+
"\n",
64+
"0.\texp_1Worker1Source.json\n",
65+
"1.\texp_1Worker1SourceAE.json\n",
66+
"2.\texp_2Devs2Workers.json\n",
67+
"3.\texp_2Worke3Router1Source.json\n",
68+
"4.\texp_2Worker1Source.json\n",
69+
"5.\texp_2Worker2Router1Source.json\n",
70+
"6.\texp_2Workers2SourcesAE.json\n",
71+
"7.\texp_3Workers1Source.json\n",
72+
"8.\texp_4Workers1Source1fed.json\n",
73+
"9.\texp_4Workers1SourceGauss.json\n",
74+
"10.\texp_4Workers1SourceNum.json\n",
75+
"11.\texp_4Workers2Sources.json\n",
76+
"12.\texp_4Workers2Sources1fed.json\n"
77+
]
78+
},
79+
{
80+
"ename": "KeyboardInterrupt",
81+
"evalue": "Interrupted by user",
82+
"output_type": "error",
83+
"traceback": [
84+
"\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
85+
"\u001b[0;31mKeyboardInterrupt\u001b[0m Traceback (most recent call last)",
86+
"Cell \u001b[0;32mIn [2], line 2\u001b[0m\n\u001b[1;32m 1\u001b[0m api_server_instance\u001b[38;5;241m.\u001b[39mshowJsons()\n\u001b[0;32m----> 2\u001b[0m \u001b[43mapi_server_instance\u001b[49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mselectJsons\u001b[49m\u001b[43m(\u001b[49m\u001b[43m)\u001b[49m\n\u001b[1;32m 4\u001b[0m arch_json , connmap_json, exp_flow_json \u001b[38;5;241m=\u001b[39m api_server_instance\u001b[38;5;241m.\u001b[39mgetUserJsons()\n",
87+
"File \u001b[0;32m~/workspace/NErlNet/JupyterLabDir/apiServer.py:90\u001b[0m, in \u001b[0;36mApiServer.selectJsons\u001b[0;34m(self)\u001b[0m\n\u001b[1;32m 89\u001b[0m \u001b[38;5;28;01mdef\u001b[39;00m \u001b[38;5;21mselectJsons\u001b[39m(\u001b[38;5;28mself\u001b[39m):\n\u001b[0;32m---> 90\u001b[0m \u001b[38;5;28;43mself\u001b[39;49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mjson_dir_parser\u001b[49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mselect_arch_connmap_experiment\u001b[49m\u001b[43m(\u001b[49m\u001b[43m)\u001b[49m\n",
88+
"File \u001b[0;32m~/workspace/NErlNet/JupyterLabDir/jsonDirParser.py:88\u001b[0m, in \u001b[0;36mselect_arch_connmap_experiment\u001b[0;34m(self)\u001b[0m\n\u001b[1;32m 86\u001b[0m arch \u001b[38;5;241m=\u001b[39m \u001b[38;5;28minput\u001b[39m(\u001b[38;5;124m\"\u001b[39m\u001b[38;5;124menter arch file #\u001b[39m\u001b[38;5;124m\"\u001b[39m)\n\u001b[1;32m 87\u001b[0m connection_map \u001b[38;5;241m=\u001b[39m \u001b[38;5;28minput\u001b[39m(\u001b[38;5;124m\"\u001b[39m\u001b[38;5;124menter conn_map file #\u001b[39m\u001b[38;5;124m\"\u001b[39m)\n\u001b[0;32m---> 88\u001b[0m experiment \u001b[38;5;241m=\u001b[39m \u001b[38;5;28minput\u001b[39m(\u001b[38;5;124m\"\u001b[39m\u001b[38;5;124menter exp file #\u001b[39m\u001b[38;5;124m\"\u001b[39m)\n\u001b[1;32m 89\u001b[0m \u001b[38;5;28mself\u001b[39m\u001b[38;5;241m.\u001b[39muser_selection_tuple \u001b[38;5;241m=\u001b[39m (\u001b[38;5;28mint\u001b[39m(arch), \u001b[38;5;28mint\u001b[39m(connection_map), \u001b[38;5;28mint\u001b[39m(experiment))\n",
89+
"File \u001b[0;32m~/workspace/venv-nerl/lib/python3.8/site-packages/ipykernel/kernelbase.py:1177\u001b[0m, in \u001b[0;36mKernel.raw_input\u001b[0;34m(self, prompt)\u001b[0m\n\u001b[1;32m 1173\u001b[0m \u001b[38;5;28;01mif\u001b[39;00m \u001b[38;5;129;01mnot\u001b[39;00m \u001b[38;5;28mself\u001b[39m\u001b[38;5;241m.\u001b[39m_allow_stdin:\n\u001b[1;32m 1174\u001b[0m \u001b[38;5;28;01mraise\u001b[39;00m StdinNotImplementedError(\n\u001b[1;32m 1175\u001b[0m \u001b[38;5;124m\"\u001b[39m\u001b[38;5;124mraw_input was called, but this frontend does not support input requests.\u001b[39m\u001b[38;5;124m\"\u001b[39m\n\u001b[1;32m 1176\u001b[0m )\n\u001b[0;32m-> 1177\u001b[0m \u001b[38;5;28;01mreturn\u001b[39;00m \u001b[38;5;28;43mself\u001b[39;49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43m_input_request\u001b[49m\u001b[43m(\u001b[49m\n\u001b[1;32m 1178\u001b[0m \u001b[43m \u001b[49m\u001b[38;5;28;43mstr\u001b[39;49m\u001b[43m(\u001b[49m\u001b[43mprompt\u001b[49m\u001b[43m)\u001b[49m\u001b[43m,\u001b[49m\n\u001b[1;32m 1179\u001b[0m \u001b[43m \u001b[49m\u001b[38;5;28;43mself\u001b[39;49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43m_parent_ident\u001b[49m\u001b[43m[\u001b[49m\u001b[38;5;124;43m\"\u001b[39;49m\u001b[38;5;124;43mshell\u001b[39;49m\u001b[38;5;124;43m\"\u001b[39;49m\u001b[43m]\u001b[49m\u001b[43m,\u001b[49m\n\u001b[1;32m 1180\u001b[0m \u001b[43m \u001b[49m\u001b[38;5;28;43mself\u001b[39;49m\u001b[38;5;241;43m.\u001b[39;49m\u001b[43mget_parent\u001b[49m\u001b[43m(\u001b[49m\u001b[38;5;124;43m\"\u001b[39;49m\u001b[38;5;124;43mshell\u001b[39;49m\u001b[38;5;124;43m\"\u001b[39;49m\u001b[43m)\u001b[49m\u001b[43m,\u001b[49m\n\u001b[1;32m 1181\u001b[0m \u001b[43m \u001b[49m\u001b[43mpassword\u001b[49m\u001b[38;5;241;43m=\u001b[39;49m\u001b[38;5;28;43;01mFalse\u001b[39;49;00m\u001b[43m,\u001b[49m\n\u001b[1;32m 1182\u001b[0m \u001b[43m\u001b[49m\u001b[43m)\u001b[49m\n",
90+
"File \u001b[0;32m~/workspace/venv-nerl/lib/python3.8/site-packages/ipykernel/kernelbase.py:1219\u001b[0m, in \u001b[0;36mKernel._input_request\u001b[0;34m(self, prompt, ident, parent, password)\u001b[0m\n\u001b[1;32m 1216\u001b[0m \u001b[38;5;28;01mbreak\u001b[39;00m\n\u001b[1;32m 1217\u001b[0m \u001b[38;5;28;01mexcept\u001b[39;00m \u001b[38;5;167;01mKeyboardInterrupt\u001b[39;00m:\n\u001b[1;32m 1218\u001b[0m \u001b[38;5;66;03m# re-raise KeyboardInterrupt, to truncate traceback\u001b[39;00m\n\u001b[0;32m-> 1219\u001b[0m \u001b[38;5;28;01mraise\u001b[39;00m \u001b[38;5;167;01mKeyboardInterrupt\u001b[39;00m(\u001b[38;5;124m\"\u001b[39m\u001b[38;5;124mInterrupted by user\u001b[39m\u001b[38;5;124m\"\u001b[39m) \u001b[38;5;28;01mfrom\u001b[39;00m \u001b[38;5;28mNone\u001b[39m\n\u001b[1;32m 1220\u001b[0m \u001b[38;5;28;01mexcept\u001b[39;00m \u001b[38;5;167;01mException\u001b[39;00m:\n\u001b[1;32m 1221\u001b[0m \u001b[38;5;28mself\u001b[39m\u001b[38;5;241m.\u001b[39mlog\u001b[38;5;241m.\u001b[39mwarning(\u001b[38;5;124m\"\u001b[39m\u001b[38;5;124mInvalid Message:\u001b[39m\u001b[38;5;124m\"\u001b[39m, exc_info\u001b[38;5;241m=\u001b[39m\u001b[38;5;28;01mTrue\u001b[39;00m)\n",
91+
"\u001b[0;31mKeyboardInterrupt\u001b[0m: Interrupted by user"
92+
]
93+
}
94+
],
2095
"source": [
21-
"api_server_instance = ApiServer()\n",
22-
"\n",
2396
"api_server_instance.showJsons()\n",
2497
"api_server_instance.selectJsons()\n",
2598
"\n",
@@ -50,7 +123,9 @@
50123
"cell_type": "code",
51124
"execution_count": null,
52125
"id": "639a9b13",
53-
"metadata": {},
126+
"metadata": {
127+
"scrolled": true
128+
},
54129
"outputs": [],
55130
"source": [
56131
"api_server_instance.train()"
@@ -60,7 +135,9 @@
60135
"cell_type": "code",
61136
"execution_count": null,
62137
"id": "ff716693",
63-
"metadata": {},
138+
"metadata": {
139+
"scrolled": true
140+
},
64141
"outputs": [],
65142
"source": [
66143
"api_server_instance.predict()"
@@ -85,6 +162,32 @@
85162
"source": [
86163
"api_server_instance.statistics()"
87164
]
165+
},
166+
{
167+
"cell_type": "code",
168+
"execution_count": null,
169+
"id": "2b88c1fc",
170+
"metadata": {},
171+
"outputs": [],
172+
"source": [
173+
"api_server_instance.statistics()"
174+
]
175+
},
176+
{
177+
"cell_type": "code",
178+
"execution_count": null,
179+
"id": "f30d27c5",
180+
"metadata": {},
181+
"outputs": [],
182+
"source": []
183+
},
184+
{
185+
"cell_type": "code",
186+
"execution_count": null,
187+
"id": "720f2b84",
188+
"metadata": {},
189+
"outputs": [],
190+
"source": []
88191
}
89192
],
90193
"metadata": {

‎inputJsonFiles/Architecture/2pc2workers.json

Lines changed: 0 additions & 114 deletions
This file was deleted.

‎inputJsonFiles/Architecture/arch_1PC1Worker.json

Lines changed: 0 additions & 83 deletions
This file was deleted.

‎inputJsonFiles/Architecture/jsonArch1PC1WorkerMonitored.json renamed to ‎inputJsonFiles/Architecture/arch_1PC1WorkerGUI.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@
77
],
88
"devices": [
99
{
10-
"host": "127.0.0.1",
10+
"host": "192.168.0.108",
1111
"entities": "mainServer,c1,s1,r1,nerlGUI"
1212
}
1313
],
1414
"serverAPI": [
1515
{
16-
"host": "127.0.0.1",
16+
"host": "192.168.0.108",
1717
"port": "8095",
1818
"args": ""
1919
}
2020
],
2121
"nerlGUI": [
2222
{
23-
"host": "127.0.0.1",
23+
"host": "192.168.0.108",
2424
"port": "8096",
2525
"args": ""
2626
}
2727
],
2828
"mainServer": [
2929
{
30-
"host": "127.0.0.1",
30+
"host": "192.168.0.108",
3131
"port": "8080",
3232
"args": ""
3333
}

0 commit comments

Comments
 (0)