SHA1
--- a/server.py
+++ b/server.py
@@ -31,11 +31,15 @@ if os.getenv('USE_CUDA') == 'gpu':
 
				 print(f'use gpu: {use_gpu}')
			
 
				 
			
 
				 # 初始化模型
			
 
				+<<<<<<< HEAD
			
 
				+table_engine = PPStructure(layout=False, table=True, show_log=True, table_model_dir="/Users/sxkj/opt/python-workspace/yili-ocr/ocr-table/SLANet/")
			
 
				+=======
			
 
				 table_engine = PPStructure(layout=False,
			
 
				                            table=True,
			
 
				                            use_gpu=use_gpu,
			
 
				                            show_log=True,
			
 
				                            table_model_dir="./tabel_ocr_infer")
			
 
				+>>>>>>> d046d2d76465ba7ba4d8c3e2cdad1ec5e7ac3b69
			
 
				 
			
 
				 
			
 
				 class TableInfo(BaseModel):
			
--- a/tabel_SLANet_infer/inference.pdiparams
+++ b/tabel_SLANet_infer/inference.pdiparams
--- a/tabel_SLANet_infer/inference.pdiparams.info
+++ b/tabel_SLANet_infer/inference.pdiparams.info
--- a/tabel_SLANet_infer/inference.pdmodel
+++ b/tabel_SLANet_infer/inference.pdmodel
Autor	SHA1 Mensaxe	Data
liutao	7b1ecb00eb Merge branch 'master' of https://gogsb.soaringnova.com/chenguilong/ocr-table	%!s(int64=2) %!d(string=hai) anos
liutao	ee74aaa65a modified: server.py	%!s(int64=2) %!d(string=hai) anos