CoderBotOrg
diff --git a/‎cnn_models/models.json
Lines changed: 1 addition & 1 deletion b/‎cnn_models/models.json
Lines changed: 1 addition & 1 deletion
diff --git a/‎cnn_train.py
Lines changed: 61 additions & 62 deletions b/‎cnn_train.py
Lines changed: 61 additions & 62 deletions
diff --git a/‎requirements_stub.txt
Lines changed: 1 addition & 8 deletions b/‎requirements_stub.txt
Lines changed: 1 addition & 8 deletions
diff --git a/‎saved_photos/photos/0.txt
Lines changed: 1 addition & 0 deletions b/‎saved_photos/photos/0.txt
Lines changed: 1 addition & 0 deletions
diff --git a/‎saved_photos/photos/DSC100.jpg
56.3 KB b/‎saved_photos/photos/DSC100.jpg
56.3 KB
diff --git a/‎saved_photos/photos/DSC101.jpg
56.3 KB b/‎saved_photos/photos/DSC101.jpg
56.3 KB
diff --git a/‎saved_photos/photos/DSC102.jpg
56.3 KB b/‎saved_photos/photos/DSC102.jpg
56.3 KB
diff --git a/‎saved_photos/photos/DSC103.jpg
56.3 KB b/‎saved_photos/photos/DSC103.jpg
56.3 KB
diff --git a/‎saved_photos/photos/DSC104.jpg
56.3 KB b/‎saved_photos/photos/DSC104.jpg
56.3 KB
diff --git a/‎saved_photos/photos/DSC106.jpg
56.3 KB b/‎saved_photos/photos/DSC106.jpg
56.3 KB
@@ -1 +1 @@
-{"mobilenet_v1_1_0_quant": {"status": 100, "image_height": 120, "image_width": 160, "output_layer":"final_result"}}
+{"test_model_1": {"status": 0, "image_height": "128", "image_width": "128", "output_layer": "final_result"}, "mobilenet_v1_1_0_quant": {"status": 100, "image_height": 120, "output_layer": "final_result", "image_width": 160}}
@@ -14,7 +14,7 @@ Flask==1.1.1
 Flask-Babel==0.12.2
 Flask-Cors==3.0.8
 gast==0.2.0
-grpcio==1.15.0
+grpcio==1.25.0
 idna==2.6
 inflection==0.3.1
 itsdangerous==0.24
@@ -35,13 +35,6 @@ requests==2.20.0
 six==1.11.0
 smbus2==0.2.0
 swagger-spec-validator==2.3.1
-<<<<<<< HEAD
-#tensorboard==1.11.0
-#tensorflow==1.11.0
-=======
-tensorboard==1.14.0
-tensorflow==1.14.0
->>>>>>> develop
 termcolor==1.1.0
 tinydb==3.12.1
 urllib3==1.24.2
 
@@ -0,0 +1 @@
+placeholder
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-{"mobilenet_v1_1_0_quant": {"status": 100, "image_height": 120, "image_width": 160, "output_layer":"final_result"}}`
	`1`	`+{"test_model_1": {"status": 0, "image_height": "128", "image_width": "128", "output_layer": "final_result"}, "mobilenet_v1_1_0_quant": {"status": 100, "image_height": 120, "output_layer": "final_result", "image_width": 160}}`