8 Commits 8e8269cb48 ... b7a3d3b14a

Author SHA1 Message Date
  MaochengHu b7a3d3b14a first commit 2 years ago
  MaochengHu 1db9330701 first commit 2 years ago
  MaochengHu a14281e737 dev first commit 2 years ago
  MaochengHu cf05fde92f dev first commit 2 years ago
  MaochengHu cbfb93724d dev first commit 2 years ago
  MaochengHu d156aac5db dev first commit 2 years ago
  MaochengHu 2a8310dd32 dev first commit 2 years ago
  MaochengHu e99806b4eb dev first commit 2 years ago

+ 82 - 163
.idea/workspace.xml

@@ -2,145 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="e5041b5b-13f7-40ae-a9f1-04b16d6a93ad" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src_code/config_files/yolov5_log4j2.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src_code/src/server_utils/read_properties.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src_code/test/test_src/files/Arial.ttf" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src_code/test/test_src/multi_thread_test.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/server_develop.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/server_develop.iml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src_code/model_zoo/yolov5_model_zoo/coco.yaml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/build_docker_container.sh" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/build_docker_container.sh" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/build_mar.sh" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/build_mar.sh" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/config_files/cf.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/config_files/cf.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/config_files/load_yaml_config.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/config_files/load_yaml_config.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/config_files/yolov5_config.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/config_files/yolov5_config.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/files/Arial.ttf" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/files/Arial.ttf" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/install_torchserver.sh" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/install_torchserver.sh" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/model-server/model-store/config.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/models-server/model-store/yolov5_config.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/model_zoo/yolov5_model_zoo/yolov5x.pt" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/model_zoo/yolov5_model_zoo/yolov5x.pt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/model_zoo/yolov5_model_zoo/yolov5x.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/model_zoo/yolov5_model_zoo/yolov5x.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/requirements.txt" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/requirements.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/basic_model_handler.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/basic_model_handler.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/.dockerignore" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/.dockerignore" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/.gitattributes" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/.gitattributes" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/.github/FUNDING.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/.github/FUNDING.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/.github/ISSUE_TEMPLATE/bug-report.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/.github/ISSUE_TEMPLATE/bug-report.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/.github/ISSUE_TEMPLATE/config.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/.github/ISSUE_TEMPLATE/config.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/.github/ISSUE_TEMPLATE/feature-request.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/.github/ISSUE_TEMPLATE/feature-request.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/.github/ISSUE_TEMPLATE/question.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/.github/ISSUE_TEMPLATE/question.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/.github/PULL_REQUEST_TEMPLATE.md" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/.github/PULL_REQUEST_TEMPLATE.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/.github/dependabot.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/.github/dependabot.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/.github/workflows/ci-testing.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/.github/workflows/ci-testing.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/.github/workflows/codeql-analysis.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/.github/workflows/codeql-analysis.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/.github/workflows/greetings.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/.github/workflows/greetings.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/.github/workflows/rebase.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/.github/workflows/rebase.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/.github/workflows/stale.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/.github/workflows/stale.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/.gitignore" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/.pre-commit-config.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/.pre-commit-config.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/CONTRIBUTING.md" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/CONTRIBUTING.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/Dockerfile" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/LICENSE" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/LICENSE" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/data/Argoverse.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/data/Argoverse.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/data/GlobalWheat2020.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/data/GlobalWheat2020.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/data/Objects365.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/data/Objects365.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/data/SKU-110K.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/data/SKU-110K.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/data/VOC.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/data/VOC.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/data/VisDrone.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/data/VisDrone.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/data/coco.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/data/coco.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/data/coco128.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/data/coco128.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/data/hyps/hyp.Objects365.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/data/hyps/hyp.Objects365.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/data/hyps/hyp.VOC.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/data/hyps/hyp.VOC.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/data/hyps/hyp.scratch-high.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/data/hyps/hyp.scratch-high.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/data/hyps/hyp.scratch-low.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/data/hyps/hyp.scratch-low.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/data/hyps/hyp.scratch-med.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/data/hyps/hyp.scratch-med.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/data/images/bus.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/data/images/bus.jpg" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/data/images/zidane.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/data/images/zidane.jpg" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/data/scripts/download_weights.sh" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/data/scripts/download_weights.sh" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/data/scripts/get_coco.sh" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/data/scripts/get_coco.sh" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/data/scripts/get_coco128.sh" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/data/scripts/get_coco128.sh" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/data/xView.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/data/xView.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/detect.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/detect.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/export.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/export.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/hubconf.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/hubconf.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/common.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/common.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/experimental.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/experimental.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/hub/anchors.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/hub/anchors.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov3-spp.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov3-spp.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov3-tiny.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov3-tiny.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov3.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov3.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5-bifpn.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5-bifpn.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5-fpn.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5-fpn.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5-p2.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5-p2.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5-p34.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5-p34.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5-p6.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5-p6.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5-p7.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5-p7.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5-panet.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5-panet.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5l6.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5l6.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5m6.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5m6.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5n6.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5n6.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5s-ghost.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5s-ghost.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5s-transformer.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5s-transformer.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5s6.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5s6.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5x6.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/hub/yolov5x6.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/tf.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/tf.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/yolo.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/yolo.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/yolov5l.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/yolov5l.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/yolov5m.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/yolov5m.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/yolov5n.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/yolov5n.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/yolov5s.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/yolov5s.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/models/yolov5x.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/models/yolov5x.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/requirements.txt" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/requirements.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/setup.cfg" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/setup.cfg" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/train.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/train.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/tutorial.ipynb" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/tutorial.ipynb" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/activations.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/activations.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/augmentations.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/augmentations.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/autoanchor.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/autoanchor.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/autobatch.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/autobatch.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/aws/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/aws/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/aws/mime.sh" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/aws/mime.sh" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/aws/resume.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/aws/resume.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/aws/userdata.sh" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/aws/userdata.sh" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/benchmarks.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/benchmarks.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/callbacks.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/callbacks.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/datasets.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/datasets.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/downloads.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/downloads.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/flask_rest_api/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/flask_rest_api/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/flask_rest_api/example_request.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/flask_rest_api/example_request.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/flask_rest_api/restapi.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/flask_rest_api/restapi.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/general.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/general.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/google_app_engine/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/google_app_engine/Dockerfile" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/google_app_engine/additional_requirements.txt" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/google_app_engine/additional_requirements.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/google_app_engine/app.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/google_app_engine/app.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/loggers/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/loggers/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/loggers/wandb/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/loggers/wandb/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/loggers/wandb/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/loggers/wandb/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/loggers/wandb/log_dataset.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/loggers/wandb/log_dataset.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/loggers/wandb/sweep.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/loggers/wandb/sweep.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/loggers/wandb/sweep.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/loggers/wandb/sweep.yaml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/loggers/wandb/wandb_utils.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/loggers/wandb/wandb_utils.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/loss.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/loss.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/metrics.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/metrics.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/plots.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/plots.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/utils/torch_utils.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/torch_utils.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5-master/val.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/val.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/model_structure/yolov5_structure/yolov5.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/object_detector_handler.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/object_detector_handler.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/server_utils/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/server_utils/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/server_utils/image_convert.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/server_utils/image_convert.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/server_utils/method_parser.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/server_utils/method_parser.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/src/server_utils/recorder.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/server_utils/recorder.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/start_torch_server.sh" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/start_torch_server.sh" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/test/test_images/test1.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/test/test_images/test1.jpg" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/test/test_src/yolo_test_docker.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/test/test_src/yolo_test_docker.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/code/test/test_src/yolo_test_handler.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/test/test_src/yolo_test_handler.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src_code/config_files/yolov5_config.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/config_files/yolov5_config.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src_code/models-server/model-store/yolov5_config.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/models-server/model-store/yolov5_config.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/torch_utils.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5-master/utils/torch_utils.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/src/model_structure/yolov5_structure/yolov5.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src_code/start_torch_server.sh" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/start_torch_server.sh" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src_code/test/test_src/multi_thread_test.py" beforeDir="false" afterPath="$PROJECT_DIR$/src_code/test/test_src/multi_thread_test.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -155,6 +24,11 @@
     </option>
   </component>
   <component name="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="master" />
+      </map>
+    </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="ProjectId" id="25luwsMVvISDnUCbmCVPyibPsPf" />
@@ -167,11 +41,12 @@
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
     <property name="WebServerToolWindowFactoryState" value="true" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/src_code/test/test_src" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src_code/model_zoo/yolov5_model_zoo" />
     <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PythonContentEntriesConfigurable" />
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="F:\server_develop\src_code\model_zoo\yolov5_model_zoo" />
       <recent name="F:\server_develop\src_code\test\test_src" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
@@ -182,7 +57,7 @@
       <recent name="F:\server_develop\code\src\model_structure\yolov5_structure" />
     </key>
   </component>
-  <component name="RunManager" selected="Python.yolo_test_docker">
+  <component name="RunManager" selected="Python.multi_thread_test">
     <configuration name="123" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="server_develop" />
       <option name="INTERPRETER_OPTIONS" value="" />
@@ -205,7 +80,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="method_parser" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="multi_thread_test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="server_develop" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -213,12 +88,12 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/code/src/server_utils" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/src_code/test/test_src" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/code/src/server_utils/method_parser.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/src_code/test/test_src/multi_thread_test.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -227,7 +102,7 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="multi_thread_test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="q23" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="server_develop" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
@@ -235,12 +110,12 @@
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
       <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/src_code/test/test_src" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
       <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/src_code/test/test_src/multi_thread_test.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/q23.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -271,20 +146,20 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="yolo_test_handler" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+    <configuration name="yolo_test_handler" type="PythonConfigurationType" factoryName="Python" temporary="true">
       <module name="server_develop" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
-      <option name="SDK_HOME" value="sftp://root@192.168.20.248:22/usr/bin/python3" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/code/test/test_src" />
-      <option name="IS_MODULE_SDK" value="false" />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/src_code/test/test_src" />
+      <option name="IS_MODULE_SDK" value="true" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/code/test/test_src/yolo_test_handler.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/src_code/test/test_src/yolo_test_handler.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -293,20 +168,20 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
-    <configuration name="yolo_test_handler" type="PythonConfigurationType" factoryName="Python" temporary="true">
+    <configuration name="yolo_test_handler" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="server_develop" />
       <option name="INTERPRETER_OPTIONS" value="" />
       <option name="PARENT_ENVS" value="true" />
       <envs>
         <env name="PYTHONUNBUFFERED" value="1" />
       </envs>
-      <option name="SDK_HOME" value="" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/src_code/test/test_src" />
-      <option name="IS_MODULE_SDK" value="true" />
+      <option name="SDK_HOME" value="sftp://root@192.168.20.248:22/usr/bin/python3" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/code/test/test_src" />
+      <option name="IS_MODULE_SDK" value="false" />
       <option name="ADD_CONTENT_ROOTS" value="true" />
       <option name="ADD_SOURCE_ROOTS" value="true" />
       <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/src_code/test/test_src/yolo_test_handler.py" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/code/test/test_src/yolo_test_handler.py" />
       <option name="PARAMETERS" value="" />
       <option name="SHOW_COMMAND_LINE" value="false" />
       <option name="EMULATE_TERMINAL" value="false" />
@@ -316,18 +191,18 @@
       <method v="2" />
     </configuration>
     <list>
-      <item itemvalue="Python.method_parser" />
       <item itemvalue="Python.yolo_test_handler" />
       <item itemvalue="Python.yolo_test_docker" />
       <item itemvalue="Python.123" />
       <item itemvalue="Python.multi_thread_test" />
+      <item itemvalue="Python.q23" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Python.yolo_test_docker" />
+        <item itemvalue="Python.q23" />
         <item itemvalue="Python.multi_thread_test" />
-        <item itemvalue="Python.yolo_test_handler" />
         <item itemvalue="Python.123" />
+        <item itemvalue="Python.yolo_test_docker" />
         <item itemvalue="Python.yolo_test_handler" />
       </list>
     </recent_temporary>
@@ -342,7 +217,7 @@
       <updated>1646114237871</updated>
       <workItem from="1646114239289" duration="17703000" />
       <workItem from="1646185096865" duration="3852000" />
-      <workItem from="1646189002277" duration="50911000" />
+      <workItem from="1646189002277" duration="76763000" />
     </task>
     <task id="LOCAL-00001" summary="first commit">
       <created>1646185575550</created>
@@ -351,12 +226,55 @@
       <option name="project" value="LOCAL" />
       <updated>1646185575550</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="first commit">
+      <created>1646297168339</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1646297168339</updated>
+    </task>
+    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="7fa0cafa-346f-4108-8391-ef5b1a6ab08f">
+          <value>
+            <State>
+              <option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" />
+              <option name="FILTERS">
+                <map>
+                  <entry key="branch">
+                    <value>
+                      <list>
+                        <option value="HEAD" />
+                      </list>
+                    </value>
+                  </entry>
+                  <entry key="roots">
+                    <value>
+                      <list>
+                        <option value="$PROJECT_DIR$" />
+                      </list>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+            </State>
+          </value>
+        </entry>
+      </map>
+    </option>
+    <option name="OPEN_GENERIC_TABS">
+      <map>
+        <entry key="7fa0cafa-346f-4108-8391-ef5b1a6ab08f" value="TOOL_WINDOW" />
+      </map>
+    </option>
+  </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="first commit" />
     <option name="LAST_COMMIT_MESSAGE" value="first commit" />
@@ -373,12 +291,13 @@
     </breakpoint-manager>
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/server_develop$multi_thread_test.coverage" NAME="multi_thread_test Coverage Results" MODIFIED="1646296009996" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src_code/test/test_src" />
+    <SUITE FILE_PATH="coverage/server_develop$multi_thread_test.coverage" NAME="multi_thread_test Coverage Results" MODIFIED="1646357967827" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src_code/test/test_src" />
     <SUITE FILE_PATH="coverage/server_develop$object_detector_handler.coverage" NAME="object_detector_handler Coverage Results" MODIFIED="1646188921658" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/code/src" />
     <SUITE FILE_PATH="coverage/server_develop$123.coverage" NAME="123 Coverage Results" MODIFIED="1646289968940" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/server_develop$yolo_test_handler__1_.coverage" NAME="yolo_test_handler Coverage Results" MODIFIED="1646290847557" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src_code/test/test_src" />
     <SUITE FILE_PATH="coverage/server_develop$yolo_test_handler.coverage" NAME="yolo_test_handler Coverage Results" MODIFIED="1646189020877" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/code/test/test_src" />
+    <SUITE FILE_PATH="coverage/server_develop$q23.coverage" NAME="q23 Coverage Results" MODIFIED="1646322674165" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
     <SUITE FILE_PATH="coverage/server_develop$method_parser.coverage" NAME="method_parser Coverage Results" MODIFIED="1646115981351" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/code/src/server_utils" />
-    <SUITE FILE_PATH="coverage/server_develop$yolo_test_docker.coverage" NAME="yolo_test_docker Coverage Results" MODIFIED="1646296298546" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src_code/test/test_src" />
+    <SUITE FILE_PATH="coverage/server_develop$yolo_test_docker.coverage" NAME="yolo_test_docker Coverage Results" MODIFIED="1646323214508" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src_code/test/test_src" />
   </component>
 </project>

+ 9 - 0
README.md

@@ -0,0 +1,9 @@
+# Algorithm PyTorch Framework
+
+## Contact
+- Author: Maocheng Hu
+- Email: wojiaohumaocheng@gmail.com
+- Create Time: 2020/09/16
+
+## Description 
+![alt 图标](src_code/images/description.jpg)

BIN
src_code/images/description.jpg


+ 0 - 0
src_code/install_torchserver.sh → src_code/install_torchserve.sh


+ 44 - 0
src_code/model_zoo/yolov5_model_zoo/coco.yaml

@@ -0,0 +1,44 @@
+# YOLOv5 🚀 by Ultralytics, GPL-3.0 license
+# COCO 2017 dataset http://cocodataset.org by Microsoft
+# Example usage: python train.py --data coco.yaml
+# parent
+# ├── yolov5
+# └── datasets
+#     └── coco  ← downloads here
+
+
+# Train/val/test sets as 1) dir: path/to/imgs, 2) file: path/to/imgs.txt, or 3) list: [path/to/imgs1, path/to/imgs2, ..]
+path: ../datasets/coco  # dataset root dir
+train: train2017.txt  # train images (relative to 'path') 118287 images
+val: val2017.txt  # val images (relative to 'path') 5000 images
+test: test-dev2017.txt  # 20288 of 40670 images, submit to https://competitions.codalab.org/competitions/20794
+
+# Classes
+nc: 80  # number of classes
+names: ['person', 'bicycle', 'car', 'motorcycle', 'airplane', 'bus', 'train', 'truck', 'boat', 'traffic light',
+        'fire hydrant', 'stop sign', 'parking meter', 'bench', 'bird', 'cat', 'dog', 'horse', 'sheep', 'cow',
+        'elephant', 'bear', 'zebra', 'giraffe', 'backpack', 'umbrella', 'handbag', 'tie', 'suitcase', 'frisbee',
+        'skis', 'snowboard', 'sports ball', 'kite', 'baseball bat', 'baseball glove', 'skateboard', 'surfboard',
+        'tennis racket', 'bottle', 'wine glass', 'cup', 'fork', 'knife', 'spoon', 'bowl', 'banana', 'apple',
+        'sandwich', 'orange', 'broccoli', 'carrot', 'hot dog', 'pizza', 'donut', 'cake', 'chair', 'couch',
+        'potted plant', 'bed', 'dining table', 'toilet', 'tv', 'laptop', 'mouse', 'remote', 'keyboard', 'cell phone',
+        'microwave', 'oven', 'toaster', 'sink', 'refrigerator', 'book', 'clock', 'vase', 'scissors', 'teddy bear',
+        'hair drier', 'toothbrush']  # class names
+
+
+# Download script/URL (optional)
+download: |
+  from utils.general import download, Path
+
+  # Download labels
+  segments = False  # segment or box labels
+  dir = Path(yaml['path'])  # dataset root dir
+  url = 'https://github.com/ultralytics/yolov5/releases/download/v1.0/'
+  urls = [url + ('coco2017labels-segments.zip' if segments else 'coco2017labels.zip')]  # labels
+  download(urls, dir=dir.parent)
+
+  # Download data
+  urls = ['http://images.cocodataset.org/zips/train2017.zip',  # 19G, 118k images
+          'http://images.cocodataset.org/zips/val2017.zip',  # 1G, 5k images
+          'http://images.cocodataset.org/zips/test2017.zip']  # 7G, 41k images (optional)
+  download(urls, dir=dir / 'images', threads=3)

+ 4 - 0
src_code/src/model_structure/yolov5_structure/yolov5-master/utils/torch_utils.py

@@ -20,6 +20,7 @@ import torch.nn as nn
 import torch.nn.functional as F
 
 from utils.general import LOGGER
+import logging
 
 try:
     import thop  # for FLOPs computation
@@ -156,12 +157,15 @@ def profile(input, ops, n=10, device=None):
 
 
 def is_parallel(model):
+
     # Returns True if model is of type DP or DDP
+    logging.info("!!!!!!!!!!!!!!!!!!!!!!"*100)
     return type(model) in (nn.parallel.DataParallel, nn.parallel.DistributedDataParallel)
 
 
 def de_parallel(model):
     # De-parallelize a model: returns single-GPU model if model is of type DP or DDP
+    logging.info("@@@@@@@@@@@@@@@"*100)
     return model.module if is_parallel(model) else model
 
 

+ 18 - 6
src_code/src/model_structure/yolov5_structure/yolov5.py

@@ -12,15 +12,27 @@ from cf import yolov5_yaml_config
 from models.yolo import Model
 from utils.general import *
 from models.common import *
+from utils.torch_utils import select_device
 
 
 class YOLOV5(object):
     def __init__(self):
         LOGGER.setLevel(logging.WARNING)
         self.model = None
+
         self.config = yolov5_yaml_config
-        self.device = self.config.get("basic_params").get("device")
-        self.device = self.device if self.device else -1
+        # self.device = self.config.get("basic_params").get("device")
+        self.gpu_id = self.config.get("basic_params").get("gpu_id")
+        # self.use_multi_gpu = False
+        # if len(gpu_id.split(",")) > 1 and torch.cuda.device_count() > 1:
+        #     self.use_multi_gpu = True
+        # if torch.cuda.is_available() and gpu_id != "-1":
+        #     device_id = torch.device("cuda:0")
+        # else:
+        #     device_id = torch.device("cpu")
+        # self.device = torch.device(device_id)
+
+
         self.root_dir = self.config.get("basic_params").get("root_dir", None)
         self.structure_yaml = self.config.get("basic_params").get("struct_path", None)
         self.model_weight = self.config.get("basic_params").get("weight_path", None)
@@ -32,8 +44,6 @@ class YOLOV5(object):
         self.multi_label = self.config.get("advanced_params").get("multi_label", False)
         self.max_det = self.config.get("advanced_params").get("max_det", 1000)
         self.amp = self.config.get("advanced_params").get("amp", False)
-        self.structure_yaml_path = ""
-        self.model_weight_path = ""
         if self.root_dir is not None:
             if self.structure_yaml is not None:
                 self.structure_yaml_path = os.path.join(self.root_dir, self.structure_yaml)
@@ -43,6 +53,10 @@ class YOLOV5(object):
 
     def create(self):
         model = Model(self.structure_yaml_path, nc=self.class_num)
+        device = "cpu"
+        if torch.cuda.is_available():
+            device = select_device(self.gpu_id, batch_size=2)
+        model = model.to(device)
         ckpt = torch.load(self.model_weight_path)
         csd = ckpt['model'].float().state_dict()
         model.load_state_dict(csd)  # load
@@ -56,8 +70,6 @@ class YOLOV5(object):
         model.multi_label = self.multi_label
         model.max_det = self.max_det
         model.amp = self.amp
-        if self.device != -1:
-            model = model.cuda()
         model.eval()
         return model
 

+ 0 - 0
src_code/start_torch_server.sh → src_code/start_torch_serve.sh