xiaofengShi · xiaofengShi · Mar 28, 2019 · Apr 11, 2020
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 xiaofeng
+ (c) 2019 xiaofeng
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
+The above  notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+AUTHORS OR  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
diff --git a/README.md b/README.md
@@ -119,7 +119,13 @@ make im2katex-trainval-ori
 ```bash
 make im2katex-trainval-aug
 ```
+### 预训练权重参数
 
+**BaiduDisk:**
+
+链接: https://pan.baidu.com/s/1cUCSxCaReXw9EPs8_lwCRQ 
+
+提取码: bx4b 
 ### 训练自己的数据
 
 #### 数据集预处理
@@ -163,4 +169,4 @@ make im2katex-trainval-aug
 * [Original model repo-网络模型TF](https://github.com/ritheshkumar95/im2latex-tensorflow)
 * [Another model repo--网络模型TF](https://github.com/baoblackcoal/RFR-solution)
 * [知乎解释](https://zhuanlan.zhihu.com/p/25031185)
-* [Dataset ori repo-数据集制作](https://github.com/Miffyli/im2latex-dataset)
+* [Dataset ori repo-数据集制作](https://github.com/Miffyli/im2latex-dataset)
diff --git a/RunModel.py b/RunModel.py
@@ -7,7 +7,7 @@
 Last Modified: Saturday, 29th December 2018 6:35:57 pm
 Modified By: xiaofeng (sxf1052566766@163.com>)
 -----
-Copyright 2018.06 - 2018 onion Math, onion Math
+ 2018.06 - 2018 Latex Math, Latex Math
 '''
 
 from __future__ import print_function

diff --git a/app.py b/app.py
@@ -123,10 +123,10 @@ def upload_file():
         logger_name='server')
     logger.info('Server is working ...')
     # Generate the vocab
-    _vocab = cfg.VocabSeq2Seq(_config, logger)
+    _vocab = cfg.VocabSeq2Seq(_config, logger,vacab_file="data/properties.npy")
 
     Moedl = LoadModel(ConfClass=_Configure, _config=_config,
-                      _vocab=_vocab, logger=logger, trainable=False)
+                      _vocab=_vocab, logger=logger, pretrainde="./checkpoint/",trainable=False)
 
     print('Load models done ... ...')
 

diff --git a/asset/.DS_Store b/asset/.DS_Store
diff --git a/asset/1.png b/asset/1.png
diff --git a/asset/10.png b/asset/10.png
diff --git a/asset/11.png b/asset/11.png
diff --git a/asset/12.png b/asset/12.png
diff --git a/asset/13.png b/asset/13.png
diff --git a/asset/14.png b/asset/14.png
diff --git a/asset/2.png b/asset/2.png
diff --git a/asset/3.png b/asset/3.png
diff --git a/asset/4.png b/asset/4.png
diff --git a/asset/6.png b/asset/6.png
diff --git a/asset/7.png b/asset/7.png
diff --git a/asset/8.png b/asset/8.png
diff --git a/asset/9.png b/asset/9.png
diff --git a/asset/katex_renedr.png b/asset/katex_renedr.png
diff --git a/asset/web_demo.png b/asset/web_demo.png
diff --git a/checkpoint/checkpoint b/checkpoint/checkpoint
@@ -0,0 +1,2 @@
+model_checkpoint_path: "seq2seqAtt_781500.ckpt"
+all_model_checkpoint_paths: "seq2seqAtt_781500.ckpt"
diff --git a/checkpoint/readme.txt b/checkpoint/readme.txt
@@ -0,0 +1 @@
+this model used the unifor dataloader, and has no augmentation
diff --git a/checkpoint/seq2seqAtt_781500.ckpt.data-00000-of-00001 b/checkpoint/seq2seqAtt_781500.ckpt.data-00000-of-00001
diff --git a/checkpoint/seq2seqAtt_781500.ckpt.index b/checkpoint/seq2seqAtt_781500.ckpt.index
diff --git a/checkpoint/seq2seqAtt_781500.ckpt.meta b/checkpoint/seq2seqAtt_781500.ckpt.meta
diff --git a/config.py b/config.py
@@ -7,7 +7,7 @@
 Last Modified: Wednesday, 5th December 2018 5:32:04 pm
 Modified By: xiaofeng (sxf1052566766@163.com)
 ---------------------------
-Copyright: 2018.06 - 2018 OnionMath. OnionMath
+: 2018.06 - 2018 . 
 '''
 
 import logging
@@ -41,9 +41,10 @@ def __init__(self, data_type, gpu, encoder_type='conv'):
         self.model()
         self.dataset()
         self.predict()
-        self.initalize_dirs()
+
 
     def model(self):
+
         _model = edict()
         _model.batch_size = 16
         _model.test_batch_size = 1
@@ -179,14 +180,19 @@ def save_cfg(self):
 
 
 class VocabSeq2Seq:
-    def __init__(self, config, logger):
+    def __init__(self, config, logger,vacab_file=None):
         self._config = config
         self._logger = logger
+        self.vacab_file=vacab_file
         self.load_vocab()
 
     def load_vocab(self):
-        vocab_dir = os.path.abspath(self._config.dataset.vocabulary_file)
-        vocabulary = np.load(vocab_dir).tolist()
+        if self.vacab_file is None:
+            vocab_dir = os.path.abspath(self._config.dataset.vocabulary_file)
+        else:
+            vocab_dir=self.vacab_file
+        print("vocab_dir",vocab_dir)
+        vocabulary = np.load(vocab_dir,allow_pickle=True).tolist()
         self.vocab_size = vocabulary['vocab_size']
         self.idx_to_token = vocabulary['idx_to_str']
         self.token_to_idx = vocabulary['str_to_idx']

diff --git a/data/.DS_Store b/data/.DS_Store
diff --git a/data/.gitignore b/data/.gitignore
@@ -1,5 +1,5 @@
 
-errorchecker_dataset/
-im2latex_dataset/
+errorchecker_dataset/*
+im2latex_dataset/*
 __pycache__/
 *.pyc
diff --git a/data/build_errorchecker_data.py b/data/build_errorchecker_data.py
@@ -9,7 +9,7 @@
 Last Modified: Monday, 24th December 2018 12:23:37 pm
 Modified By: xiaofeng (sxf1052566766@163.com>)
 -----
-Copyright 2018.06 - 2018 onion Math, onion Math
+ 2018.06 - 2018 Latex Math, Latex Math
 '''
 from __future__ import absolute_import, division, print_function
 

diff --git a/data/build_imglatex_data.py b/data/build_imglatex_data.py
@@ -7,7 +7,7 @@
 Last Modified: Wednesday, 11th July 2018 6:33:16 pm
 Modified By: xiaofeng (sxf1052566766@163.com>)
 -----
-Copyright 2018.06 - 2018 onion Math, onion Math
+ 2018.06 - 2018 Latex Math, Latex Math
 '''
 
 import json
@@ -232,7 +232,7 @@ def generate_dataset(parameters, config):
 
 if __name__ == '__main__':
     print('local or remote represents 0 or 1')
-    print('Enhance style is: ori, diff_threshold, Onion')
+    print('Enhance style is: ori, diff_threshold, Latex')
 
     local_or_not = int(input('Please select the location: local(0) or remote(1):'))
     enhance_type = int(

diff --git a/data/config_dataset.py b/data/config_dataset.py
@@ -7,7 +7,7 @@
 Last Modified: Tuesday, 11th December 2018 10:58:47 am
 Modified By: xiaofeng (sxf1052566766@163.com)
 ---------------------------
-Copyright: 2018.06 - 2018 OnionMath. OnionMath
+: 2018.06 - 2018 . 
 '''
 import numpy as np
 import os

diff --git a/data/data_utils.py b/data/data_utils.py
@@ -9,7 +9,7 @@
 Last Modified: Friday, 30th November 2018 5:32:08 pm
 Modified By: xiaofeng (sxf1052566766@163.com)
 ---------------------------
-Copyright: 2018.06 - 2018 OnionMath. OnionMath
+: 2018.06 - 2018 . 
 '''
 
 import copy

diff --git a/data/properties.npy b/data/properties.npy
diff --git a/dataset_iter.py b/dataset_iter.py
@@ -7,7 +7,7 @@
 Last Modified: Sunday, 9th December 2018 4:38:25 pm
 Modified By: xiaofeng (sxf1052566766@163.com)
 ---------------------------
-Copyright: 2018.06 - 2018 OnionMath. OnionMath
+: 2018.06 - 2018 . 
 '''
 
 import os

diff --git a/init_logger.py b/init_logger.py
@@ -7,7 +7,7 @@
 Last Modified: Sunday, 9th December 2018 6:11:15 pm
 Modified By: xiaofeng (sxf1052566766@163.com)
 ---------------------------
-Copyright: 2018.06 - 2018 OnionMath. OnionMath
+: 2018.06 - 2018 . 
 '''
 
 import logging

diff --git a/load_model.py b/load_model.py
@@ -7,7 +7,7 @@
 Last Modified: Wednesday, 26th December 2018 12:45:11 pm
 Modified By: xiaofeng (sxf1052566766@163.com>)
 -----
-Copyright 2018.06 - 2018 onion Math, onion Math
+2018.06 - 2018 Latex Math, Latex Math
 '''
 
 
@@ -37,22 +37,23 @@
 
 
 class LoadModel(object):
-    def __init__(self, ConfClass, _config, _vocab, logger, trainable=False):
+    def __init__(self, ConfClass, _config, _vocab, logger, pretrainde=None,trainable=False):
         self.ConfClass=ConfClass
         self.config = _config
         self.vocab = _vocab
         self.trainable = trainable
         self.logger = logger
+        self.pretrainde=pretrainde
         self.target_height = self.vocab.target_height
         self.bucket_size = self.vocab.bucket_size
         self.setup()
 
-    def setup(self):
+    def setup(self,):
         """ Load model """
         self.Model = Seq2SeqAttModel(config=self.config, vocab=self.vocab,
                                      logger=self.logger, trainable=self.trainable)
         self.Model.build_inference()
-        _ = self.Model.restore_session()
+        _ = self.Model.restore_session(pretrainde=self.pretrainde)
 
         self.temp_path = os.path.abspath(self.config.predict.temp_path)
         self.preprocess_dir = os.path.abspath(self.config.predict.preprocess_dir)

diff --git a/main.py b/main.py
@@ -7,7 +7,7 @@
 Last Modified: Wednesday, 5th December 2018 5:20:32 pm
 Modified By: xiaofeng (sxf1052566766@163.com)
 ---------------------------
-Copyright: 2018.06 - 2018 OnionMath. OnionMath
+: 2018.06 - 2018 . 
 '''
 from __future__ import print_function
 

diff --git a/makefile b/makefile
@@ -28,7 +28,10 @@ error-inference:
 	python3 main.py --mode infer --predict_img_path  /home/xiaofeng/data/image2latex/handwritten/process/img_padding --model_type im2katex
 
 
-server:
+server-cpu:
+	python3 app.py --data_type merged --gpu=-1
+
+server-gpu:
 	python3 app.py --data_type merged --gpu=0
 
 # full: build train eval
diff --git a/models/.DS_Store b/models/.DS_Store
diff --git a/models/Dis_model.py b/models/Dis_model.py
@@ -7,7 +7,7 @@
 Last Modified: Tuesday, 3rd July 2018 11:58:46 am
 Modified By: xiaofeng (sxf1052566766@163.com>)
 -----
-Copyright 2018.06 - 2018 onion Math, onion Math
+ 2018.06 - 2018 Latex Math, Latex Math
 '''
 import sys
 import time

diff --git a/models/__init__.py b/models/__init__.py
@@ -7,7 +7,7 @@
 Last Modified: Sunday, 2nd December 2018 4:12:02 pm
 Modified By: xiaofeng (sxf1052566766@163.com)
 ---------------------------
-Copyright: 2018.06 - 2018 OnionMath. OnionMath
+: 2018.06 - 2018 . 
 '''
 
 from .seq2seq_model import Seq2SeqAttModel

diff --git a/models/component/LnRnn.py b/models/component/LnRnn.py
@@ -7,7 +7,7 @@
 Last Modified: Friday, 14th December 2018 5:17:47 pm
 Modified By: xiaofeng (sxf1052566766@163.com)
 ---------------------------
-Copyright: 2018.06 - 2018 OnionMath. OnionMath
+: 2018.06 - 2018 . 
 '''
 
 from __future__ import absolute_import, division, print_function

diff --git a/models/component/attention_cell_compile.py b/models/component/attention_cell_compile.py
@@ -7,7 +7,7 @@
 Last Modified: Sunday, 2nd December 2018 2:26:37 pm
 Modified By: xiaofeng (sxf1052566766@163.com)
 ---------------------------
-Copyright: 2018.06 - 2018 OnionMath. OnionMath
+: 2018.06 - 2018 . 
 '''
 
 import collections

diff --git a/models/component/attention_cell_sequence.py b/models/component/attention_cell_sequence.py
@@ -7,7 +7,7 @@
 Last Modified: Friday, 28th December 2018 6:50:40 pm
 Modified By: xiaofeng (sxf1052566766@163.com>)
 -----
-Copyright 2018.06 - 2018 onion Math, onion Math
+ 2018.06 - 2018 Latex Math, Latex Math
 '''
 
 import collections

diff --git a/models/component/attention_cell_step.py b/models/component/attention_cell_step.py
@@ -7,7 +7,7 @@
 Last Modified: Sunday, 2nd December 2018 2:26:37 pm
 Modified By: xiaofeng (sxf1052566766@163.com)
 ---------------------------
-Copyright: 2018.06 - 2018 OnionMath. OnionMath
+: 2018.06 - 2018 . 
 '''
 
 import tensorflow as tf

diff --git a/models/component/decoder_beamsearch.py b/models/component/decoder_beamsearch.py
@@ -7,7 +7,7 @@
 Last Modified: Thursday, 29th November 2018 7:38:14 pm
 Modified By: xiaofeng (sxf1052566766@163.com)
 ---------------------------
-Copyright: 2018.06 - 2018 OnionMath. OnionMath
+: 2018.06 - 2018 . 
 '''
 
 import tensorflow as tf

diff --git a/models/component/decoder_dynamic.py b/models/component/decoder_dynamic.py
@@ -7,7 +7,7 @@
 Last Modified: Thursday, 29th November 2018 7:39:08 pm
 Modified By: xiaofeng (sxf1052566766@163.com)
 ---------------------------
-Copyright: 2018.06 - 2018 OnionMath. OnionMath
+: 2018.06 - 2018 . 
 '''
 
 import tensorflow as tf

diff --git a/models/component/decoder_greedy.py b/models/component/decoder_greedy.py
@@ -7,7 +7,7 @@
 Last Modified: Thursday, 29th November 2018 7:38:26 pm
 Modified By: xiaofeng (sxf1052566766@163.com)
 ---------------------------
-Copyright: 2018.06 - 2018 OnionMath. OnionMath
+: 2018.06 - 2018 . 
 '''
 
 import tensorflow as tf

diff --git a/models/component/encoder_cnn.py b/models/component/encoder_cnn.py
@@ -7,7 +7,7 @@
 Last Modified: Friday, 14th December 2018 3:33:12 pm
 Modified By: xiaofeng (sxf1052566766@163.com)
 ---------------------------
-Copyright: 2018.06 - 2018 OnionMath. OnionMath
+: 2018.06 - 2018 . 
 '''
 
 

diff --git a/models/component/encoder_densenet.py b/models/component/encoder_densenet.py
@@ -7,7 +7,7 @@
 Last Modified: Sunday, 9th December 2018 8:38:04 pm
 Modified By: xiaofeng (sxf1052566766@163.com)
 ---------------------------
-Copyright: 2018.06 - 2018 OnionMath. OnionMath
+: 2018.06 - 2018 . 
 '''
 from __future__ import absolute_import, division, print_function
 

diff --git a/models/component/encoder_rnn.py b/models/component/encoder_rnn.py
@@ -7,7 +7,7 @@
 Last Modified: Friday, 14th December 2018 5:37:07 pm
 Modified By: xiaofeng (sxf1052566766@163.com)
 ---------------------------
-Copyright: 2018.06 - 2018 OnionMath. OnionMath
+: 2018.06 - 2018 . 
 '''
 
 from __future__ import absolute_import, division, print_function

diff --git a/models/component/trainop.py b/models/component/trainop.py
@@ -7,7 +7,7 @@
 Last Modified: Sunday, 2nd December 2018 2:28:25 pm
 Modified By: xiaofeng (sxf1052566766@163.com)
 ---------------------------
-Copyright: 2018.06 - 2018 OnionMath. OnionMath
+: 2018.06 - 2018 . 
 '''
 
 import numpy as np

diff --git a/models/component/word_embeding.py b/models/component/word_embeding.py
@@ -7,7 +7,7 @@
 Last Modified: Sunday, 2nd December 2018 2:39:14 pm
 Modified By: xiaofeng (sxf1052566766@163.com)
 ---------------------------
-Copyright: 2018.06 - 2018 OnionMath. OnionMath
+: 2018.06 - 2018 . 
 '''
 
 import tensorflow as tf

diff --git a/models/decoder.py b/models/decoder.py
@@ -7,7 +7,7 @@
 Last Modified: Sunday, 2nd December 2018 4:09:59 pm
 Modified By: xiaofeng (sxf1052566766@163.com)
 ---------------------------
-Copyright: 2018.06 - 2018 OnionMath. OnionMath
+: 2018.06 - 2018 . 
 '''
 
 from __future__ import division

diff --git a/models/decoder_error_checker.py b/models/decoder_error_checker.py
@@ -7,7 +7,7 @@
 Last Modified: Saturday, 29th December 2018 3:07:45 pm
 Modified By: xiaofeng (sxf1052566766@163.com>)
 -----
-Copyright 2018.06 - 2018 onion Math, onion Math
+ 2018.06 - 2018 Latex Math, Latex Math
 '''
 
 

diff --git a/models/discrimitor.py b/models/discrimitor.py
@@ -7,7 +7,7 @@
 Last Modified: Friday, 22nd February 2019 10:53:59 am
 Modified By: xiaofeng (sxf1052566766@163.com>)
 -----
-Copyright 2018.06 - 2019 onion Math, onion Math
+ 2018.06 - 2019 Latex Math, Latex Math
 '''
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		model_checkpoint_path: "seq2seqAtt_781500.ckpt"
		all_model_checkpoint_paths: "seq2seqAtt_781500.ckpt"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		this model used the unifor dataloader, and has no augmentation