Skip to content

O
onnx_model
Commit b3ed567c authored by 武继龙's avatar 武继龙
Browse files
Options

package

parent 8a92775d
Show whitespace changes
Inline Side-by-side
Showing with 124 additions and 72 deletions
.DS_Store
View file @ b3ed567c
No preview for this file type
.idea/workspace.xml
View file @ b3ed567c
......@@ -2,8 +2,13 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="c99523d9-010f-4b7a-8f3f-0e626959dd1a" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/onnx_infer/color.py" beforeDir="false" afterPath="$PROJECT_DIR$/onnx_infer/color.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/onnx_infer/croppic.py" beforeDir="false" afterPath="$PROJECT_DIR$/onnx_infer/croppic.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/onnx_infer/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/onnx_infer/main.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/onnx_infer/yolodata.py" beforeDir="false" afterPath="$PROJECT_DIR$/onnx_infer/yolodata.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/onnx_infer/onnx2kera.py" beforeDir="false" afterPath="$PROJECT_DIR$/onnx_infer/onnx2kera.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/onnx_infer/supression.py" beforeDir="false" afterPath="$PROJECT_DIR$/onnx_infer/supression.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/onnx_infer/yolo3/model.py" beforeDir="false" afterPath="$PROJECT_DIR$/onnx_infer/yolo3/model.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/setup.py" beforeDir="false" afterPath="$PROJECT_DIR$/setup.py" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -17,8 +22,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/onnx_infer/supression.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="361">
<caret line="22" selection-start-line="22" selection-end-line="22" />
<state relative-caret-position="169">
<caret line="9" column="36" selection-start-line="9" selection-start-column="36" selection-end-line="9" selection-end-column="36" />
<folding>
<element signature="e#0#18#0" expanded="true" />
</folding>
......@@ -29,8 +34,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/onnx_infer/yolodata.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="456">
<caret line="24" column="24" lean-forward="true" selection-start-line="24" selection-start-column="24" selection-end-line="24" selection-end-column="24" />
<state relative-caret-position="323">
<caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
<folding>
<element signature="e#0#21#0" expanded="true" />
</folding>
......@@ -38,11 +43,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/onnx_infer/yolo3/model.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2926">
<caret line="165" selection-start-line="165" selection-end-line="165" />
<state relative-caret-position="-417">
<caret line="12" selection-start-line="12" selection-end-line="12" />
<folding>
<element signature="e#0#27#0" expanded="true" />
</folding>
......@@ -51,7 +56,7 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/onnx_infer/yolo3/utils.py">
<entry file="file://$PROJECT_DIR$/onnx_infer/yolo3/__init__.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
......@@ -63,9 +68,10 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/onnx_infer/color.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<state relative-caret-position="152">
<caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
<folding>
<element signature="e#0#32#0" expanded="true" />
<element signature="e#0#33#0" expanded="true" />
</folding>
</state>
</provider>
......@@ -73,7 +79,11 @@
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/onnx_infer/croppic.py">
<provider selected="true" editor-type-id="text-editor" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="13" column="19" selection-start-line="13" selection-start-column="19" selection-end-line="13" selection-end-column="19" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
......@@ -81,25 +91,23 @@
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/onnx_infer/main.py">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/onnx_infer/onnx2kera.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="61" column="32" lean-forward="true" selection-start-line="61" selection-start-column="32" selection-end-line="61" selection-end-column="32" />
<state relative-caret-position="627">
<caret line="33" column="50" lean-forward="true" selection-start-line="33" selection-start-column="50" selection-end-line="33" selection-end-column="50" />
<folding>
<element signature="e#419#484#0" expanded="true" />
<element signature="e#0#18#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/onnx_infer/onnx2kera.py">
<entry file="file://$PROJECT_DIR$/onnx_infer/main.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#0#18#0" expanded="true" />
</folding>
<state relative-caret-position="266">
<caret line="14" column="52" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
</state>
</provider>
</entry>
......@@ -112,15 +120,19 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/onnx_infer/supression.py" />
<option value="$PROJECT_DIR$/onnx_infer/yolodata.py" />
<option value="$PROJECT_DIR$/onnx_infer/main.py" />
<option value="$PROJECT_DIR$/onnx_infer/color.py" />
<option value="$PROJECT_DIR$/onnx_infer/yolo3/model.py" />
<option value="$PROJECT_DIR$/onnx_infer/supression.py" />
<option value="$PROJECT_DIR$/onnx_infer/croppic.py" />
<option value="$PROJECT_DIR$/onnx_infer/onnx2kera.py" />
</list>
</option>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="40" />
<option name="y" value="31" />
<option name="y" value="29" />
<option name="width" value="1400" />
<option name="height" value="815" />
</component>
......@@ -243,17 +255,19 @@
<workItem from="1563429064722" duration="31000" />
<workItem from="1563429380140" duration="1971000" />
<workItem from="1563440209053" duration="966000" />
<workItem from="1563444603403" duration="142000" />
<workItem from="1563445246729" duration="125000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="2968000" />
<option name="totallyTimeSpent" value="3235000" />
</component>
<component name="ToolWindowManager">
<frame x="40" y="31" width="1400" height="815" extended-state="0" />
<frame x="40" y="29" width="1400" height="815" extended-state="0" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2569956" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26435935" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
......@@ -285,72 +299,84 @@
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/onnx_infer/model_data/yolo_anchors.txt" />
<entry file="file://$PROJECT_DIR$/onnx_infer/yolo3/utils.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#40#68#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/onnx_infer/__init__.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/onnx_infer/yolo3/__init__.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/onnx_infer/supression.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="361">
<caret line="22" selection-start-line="22" selection-end-line="22" />
<state relative-caret-position="169">
<caret line="9" column="36" selection-start-line="9" selection-start-column="36" selection-end-line="9" selection-end-column="36" />
<folding>
<element signature="e#0#18#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/onnx_infer/yolo3/model.py">
<entry file="file://$PROJECT_DIR$/onnx_infer/yolodata.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2926">
<caret line="165" selection-start-line="165" selection-end-line="165" />
<state relative-caret-position="323">
<caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
<folding>
<element signature="e#0#27#0" expanded="true" />
<element signature="e#0#21#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/onnx_infer/yolo3/utils.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/onnx_infer/__init__.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/onnx_infer/color.py">
<entry file="file://$PROJECT_DIR$/onnx_infer/onnx2kera.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<state relative-caret-position="627">
<caret line="33" column="50" lean-forward="true" selection-start-line="33" selection-start-column="50" selection-end-line="33" selection-end-column="50" />
<folding>
<element signature="e#0#32#0" expanded="true" />
<element signature="e#0#18#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/onnx_infer/croppic.py">
<provider selected="true" editor-type-id="text-editor" />
<entry file="file://$PROJECT_DIR$/onnx_infer/main.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<caret line="14" column="52" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/onnx_infer/drawpic.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/onnx_infer/onnx2kera.py">
<entry file="file://$PROJECT_DIR$/onnx_infer/croppic.py">
<provider selected="true" editor-type-id="text-editor">
<state>
<folding>
<element signature="e#0#18#0" expanded="true" />
</folding>
<state relative-caret-position="247">
<caret line="13" column="19" selection-start-line="13" selection-start-column="19" selection-end-line="13" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/onnx_infer/yolodata.py">
<entry file="file://$PROJECT_DIR$/onnx_infer/color.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="456">
<caret line="24" column="24" lean-forward="true" selection-start-line="24" selection-start-column="24" selection-end-line="24" selection-end-column="24" />
<state relative-caret-position="152">
<caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
<folding>
<element signature="e#0#21#0" expanded="true" />
<element signature="e#0#33#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/onnx_infer/main.py">
<entry file="file://$PROJECT_DIR$/onnx_infer/yolo3/model.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="61" column="32" lean-forward="true" selection-start-line="61" selection-start-column="32" selection-end-line="61" selection-end-column="32" />
<state relative-caret-position="-417">
<caret line="12" selection-start-line="12" selection-end-line="12" />
<folding>
<element signature="e#419#484#0" expanded="true" />
<element signature="e#0#27#0" expanded="true" />
</folding>
</state>
</provider>
......
onnx_infer.egg-info/PKG-INFO 0 → 100644
View file @ b3ed567c
Metadata-Version: 1.0
Name: onnx-infer
Version: 0.1.0
Summary: model inference
Home-page: http://git.wanmeizhensuo.com/wujilong/onnx_model.git
Author: wjl
Author-email: wujilong@igengmei.com
License: MIT
Description: UNKNOWN
Platform: UNKNOWN
onnx_infer.egg-info/SOURCES.txt 0 → 100644
View file @ b3ed567c
setup.py
onnx_infer/__init__.py
onnx_infer/color.py
onnx_infer/croppic.py
onnx_infer/drawpic.py
onnx_infer/main.py
onnx_infer/onnx2kera.py
onnx_infer/supression.py
onnx_infer/yolodata.py
onnx_infer.egg-info/PKG-INFO
onnx_infer.egg-info/SOURCES.txt
onnx_infer.egg-info/dependency_links.txt
onnx_infer.egg-info/top_level.txt
onnx_infer/yolo3/__init__.py
onnx_infer/yolo3/model.py
onnx_infer/yolo3/utils.py
\ No newline at end of file
onnx_infer/color.py
View file @ b3ed567c
from onnx2kera import onnxinfere
from .onnx2kera import onnxinfere
import numpy as np
import cv2
from copy import deepcopy
......
onnx_infer/croppic.py
View file @ b3ed567c
......@@ -9,7 +9,7 @@ def saveCrop(image, savePath):
cv2.imwrite(savePath, image)
if __name__ == '__main__':
from yolodata import path2arr
from .yolodata import path2arr
path = '/Users/apple/Desktop/8.jpg'
threshold_index = [95.55165, 184.0512, 250.18225, 333.9927]
image = path2arr(path)
......
onnx_infer/main.py
View file @ b3ed567c
......@@ -8,12 +8,12 @@ the result of this is the category and bounding box which is the max score.
"""
#*******************
from yolodata import path2Img, letterbox_image, path2arr, arr2Img
from onnx2kera import onnxinfere
from supression import Supress
from .yolodata import path2Img, letterbox_image, path2arr, arr2Img
from .onnx2kera import onnxinfere
from .supression import Supress
import tensorflow as tf
from color import COLORS, featureTransform, resize, get_color
from croppic import cropImage
from .color import COLORS, featureTransform, resize, get_color
from .croppic import cropImage
import cv2
#global
categorys = ['long sleeve dress', 'vest dress', 'vest', 'long sleeve outwear', 'long sleeve top',
......
onnx_infer/onnx2kera.py
View file @ b3ed567c
......@@ -6,7 +6,7 @@ import cv2
import numpy as np
import keras.backend as k
import tensorflow as tf
from yolodata import path2Img, letterbox_image
from .yolodata import path2Img, letterbox_image
def hf2onnx(h5_path, save_path):
model = load_model(h5_path)
......@@ -23,7 +23,7 @@ def onnxinfere(onnx_path, input):
if __name__ == '__main__':
from supression import Supress
from .supression import Supress
# path = '/Users/apple/Public/keras-yolo3/model_data/our1_yolo.h5'
save_path = '/Users/apple/Desktop/yolo3.onnx'
anncorPath = 'model_data/yolo_anchors.txt'
......
onnx_infer/supression.py
View file @ b3ed567c
import numpy as np
from keras import backend as k
from yolo3.model import yolo_eval
from .yolo3.model import yolo_eval
import os
class Supress:
......
onnx_infer/yolo3/model.py
View file @ b3ed567c
......@@ -9,7 +9,7 @@ from keras.layers.normalization import BatchNormalization
from keras.models import Model
from keras.regularizers import l2
from yolo3.utils import compose
from .utils import compose
@wraps(Conv2D)
......
setup.py
View file @ b3ed567c
......@@ -10,9 +10,6 @@ setup(
url = 'http://git.wanmeizhensuo.com/wujilong/onnx_model.git',
author_email = 'wujilong@igengmei.com',
license = 'MIT',
packages = ['onnx_infer.color', onnx_infer.croppic, onnx_infer.drawpic, 'onnx_infer.main',
'onnx_infer.onnx2kera', 'onnx_infer.supression', 'onnx_infer.yolodata',
'onnx_infer.yolo3.model', 'onnx_infer.yolo3.utils'],
packages = find_packages(),
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment