fix: pt文件

.gitignore

@@ -1,4 +1,6 @@
 **/__pycache__/**
 .DS_Store
 
-*.pt
+*.pt
+.idea/
+.vscode/

.idea/.gitignore

@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml

.idea/deployment.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PublishConfigData" autoUpload="Always" exclude=".svn;.cvs;.idea;.DS_Store;.git;.hg;*.hprof;*.pyc;test_imgs" remoteFilesAllowedToDisappearOnAutoupload="false">
-    <serverData>
-      <paths name="root@192.168.199.249:4868">
-        <serverdata>
-          <mappings>
-            <mapping deploy="/workspace" local="$PROJECT_DIR$" />
-          </mappings>
-        </serverdata>
-      </paths>
-      <paths name="root@192.168.199.249:4868 (2)">
-        <serverdata>
-          <mappings>
-            <mapping deploy="/workspace" local="$PROJECT_DIR$" />
-          </mappings>
-        </serverdata>
-      </paths>
-    </serverData>
-    <option name="myAutoUpload" value="ALWAYS" />
-  </component>
-</project>

.idea/inspectionProfiles/profiles_settings.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>

.idea/misc.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8 (torch13)" project-jdk-type="Python SDK" />
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/yl-ocr-layout.iml" filepath="$PROJECT_DIR$/.idea/yl-ocr-layout.iml" />
-    </modules>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

.idea/yl-ocr-layout.iml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 3.8 (torch13)" jdkType="Python SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-  <component name="PyDocumentationSettings">
-    <option name="format" value="PLAIN" />
-    <option name="myDocStringFormat" value="Plain" />
-  </component>
-  <component name="TemplatesService">
-    <option name="TEMPLATE_CONFIGURATION" value="Jinja2" />
-    <option name="TEMPLATE_FOLDERS">
-      <list>
-        <option value="$MODULE_DIR$/templates" />
-      </list>
-    </option>
-  </component>
-</module>

Dockerfile

@@ -93,19 +93,19 @@ startretries=0\n\
 redirect_stderr=true\n\
 stdout_logfile=/var/log/be.log\n\
 stdout_logfile_maxbytes=50MB\n\
-environment=CUDA_VISIBLE_DEVICES=0,PYTHONPATH=/worksapce/yolov5\n\
+environment=CUDA_VISIBLE_DEVICES=0,PYTHONPATH=/worksapce/yolov7\n\
 " > /etc/supervisor/conf.d/be.conf
 
 # envs/py38/
 
-RUN git clone https://gitee.com/monkeycc/yolov5.git
+RUN git clone http://gogs.soaringnova.com/sxwl_DL/yolov7.git
 # RUN wget --user=sxkj --password='sx' ftp://192.168.199.208/yili.pt
 # RUN wget --user=sxkj --password='sx' ftp://192.168.199.208/best.pt
 # RUN wget --user=sxkj --password='sx' ftp://192.168.199.208/best2.pt
 #RUN wget --user=sxkj --password='sx' ftp://192.168.199.208/8-14_layout_model.pt
 #RUN wget --user=sxkj --password='sx' ftp://192.168.199.208/0822yili.pt
-RUN wget  ftp://192.168.199.31/11-17.pt
-RUN wget  ftp://192.168.199.31/logo.pt
+RUN wget  ftp://192.168.199.31/yiliv7_718.pt
+# RUN wget  ftp://192.168.199.31/logo.pt
 
 
 ADD . /workspace

Makefile

@@ -5,11 +5,18 @@ COMMIT_SHA1     := $(shell git rev-parse HEAD)
 AUTHOR          := $(shell git show -s --format='%an')
 
 
-.PHONY: all gpu cpu
-all: gpu
-gpu:
-	@docker build -t registry.cn-hangzhou.aliyuncs.com/sxtest/$(NAME):gpu --build-arg VERSION=gpu .
-	# @docker push registry.cn-hangzhou.aliyuncs.com/sxtest/$(NAME):gpu
+.PHONY: all
+all: test
+
+rsync:
+	@rsync -azP --exclude ".*/"  --exclude "tmp/" `pwd` sxkj@192.168.199.107:/home/sxkj/zhangli
+
+test: rsync
+	@ssh sxkj@192.168.199.107 -t 'cd /home/sxkj/zhangli/yl-ocr-layout && make image'
+
+image:
+	@docker build -t SXKJ:32775/$(NAME):gpu --build-arg VERSION=gpu .
+	@docker push SXKJ:32775/$(NAME):gpu
 
 cpu:
 	@docker build -t registry.cn-hangzhou.aliyuncs.com/sxtest/$(NAME):cpu --build-arg VERSION=cpu .

server.py

@@ -13,7 +13,7 @@ import sys
 import logging
 
 YOLO_DIR = './yolov7'
-WEIGHTS = './7_18.pt'
+WEIGHTS = './yiliv7_718.pt'
 
 logger = logging.getLogger('log')
 logger.setLevel(logging.DEBUG)