合并代码,去掉编译器的文件

.gitignore

@@ -24,6 +24,7 @@ var/
 .installed.cfg
 *.egg
 
+onnx_infer.egg-info
 # Installer logs
 pip-log.txt
 pip-delete-this-directory.txt
@@ -82,3 +83,4 @@ coverage_html/
 gaia/rpcd.json
 *.swp
 .python-version
+.idea

.idea/misc.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7" project-jdk-type="Python SDK" />
-</project>
\ No newline at end of file

.idea/modules.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/onnx.iml" filepath="$PROJECT_DIR$/.idea/onnx.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file

.idea/onnx.iml

-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/onnx_infer/yolo3" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-  <component name="TestRunnerService">
-    <option name="PROJECT_TEST_RUNNER" value="Unittests" />
-  </component>
-</module>
\ No newline at end of file

.idea/vcs.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file

onnx_infer/main.py

-# *******************
+#*******************
 """
 this is the main which contain color and yolo
 the color input need abs path of color.onnx and one image arr which  generate from the croppic.py。
@@ -6,9 +6,9 @@ the result is the color of the picture。
 the yolo  is more complex, need, the path of anchor.txt, label.txt, and the image path， the yolo.onnx path
 the result of this is the category and bounding box which is the max score.
 """
-# *******************
+#*******************
 
-from onnx_infer.yolodata import path2Img, letterbox_image, path2arr
+from onnx_infer.yolodata import letterbox_image, path2arr,arr2Img
 from onnx_infer.onnx2kera import onnxinfere
 from onnx_infer.supression import Supress
 import tensorflow as tf
@@ -21,18 +21,19 @@ categorys = ['long sleeve dress', 'vest dress', 'vest', 'long sleeve outwear', '
 
 
 class Main:
-    def __init__(self, colorOnnx_path, yoloOnnx_path, image_path):
+    def __init__(self, colorOnnx_path, yoloOnnx_path, image_arr):
         self.colorOnnx_path = colorOnnx_path
         self.yoloOnnx_path = yoloOnnx_path
-        self.image_path = image_path
+        self.image_arr = image_arr
         self.score = 0.05
         self.iou = 0.05
         self.picSize = (416, 416)
 
+
     def bboxAndcategory(self):
         bbox = []
         category = []
-        image = path2Img(self.image_path)
+        image = arr2Img(self.image_arr)
         image_data = letterbox_image(image, self.picSize)
         precit = onnxinfere(self.yoloOnnx_path, image_data)
         feature = []
@@ -47,7 +48,7 @@ class Main:
 
     def colorAndbboxAndcategory(self):
         bbox, category = self.bboxAndcategory()
-        image_arr = path2arr(self.image_path)
+        image_arr = self.image_arr
         image_crop = cropImage(image_arr, bbox)
         resized = resize(image_crop)
         tmp = featureTransform(resized)
@@ -59,21 +60,21 @@ class Main:
 colorOnnx_path = 'color.onnx'
 yoloOnnx_path = 'yolo3.onnx'
 
-
-def get_result(image_path):
-    m = Main(colorOnnx_path, yoloOnnx_path, image_path)
+def get_result(image_arr):
+    m = Main(colorOnnx_path, yoloOnnx_path, image_arr)
     color, bbox, category = m.colorAndbboxAndcategory()
     return color, bbox, category
 
 
-# if __name__ == '__main__':
-#     colorOnnx_path = '/Users/apple/Desktop/color.onnx'
-#     image_path = '/Users/apple/Desktop/8.jpg'
-#     yoloOnnx_path = '/Users/apple/Desktop/yolo3.onnx'
-#     m = Main(colorOnnx_path, yoloOnnx_path, image_path)
-#     color, bbox, category = m.colorAndbboxAndcategory()
-#     print('its color is : {}, category is : {} '.format(color, category))
-#     print('the bounding box is : {}'.format(bbox))
+if __name__ == '__main__':
+    colorOnnx_path = '/Users/apple/Desktop/color.onnx'
+    image_path = '/Users/apple/Desktop/8.jpg'
+    yoloOnnx_path = '/Users/apple/Desktop/yolo3.onnx'
+    m = Main(colorOnnx_path, yoloOnnx_path, image_path)
+    color, bbox, category = m.colorAndbboxAndcategory()
+    print('its color is : {}, category is : {} '.format(color, category))
+    print('the bounding box is : {}'.format(bbox))
 #    print(color)
 #    print(bbox)
 #    print(category)
+

onnx_infer/yolodata.py

@@ -12,6 +12,11 @@ def path2arr(path):
     image = cv2.imread(path, cv2.IMREAD_COLOR)
     return image
 
+def arr2Img(image_arr):
+    image = Image.fromarray(image_arr)
+    return image
+
+# this image is one Image type
 def letterbox_image(image, size):
     iw, ih = image.size
     h, w = size

setup.py

@@ -33,3 +33,4 @@ setup(
     dependency_links=dependency_links,
     author_email='Your address email (eq. you@example.com)'
 )
+