diff --git a/MANIFEST.in b/MANIFEST.in
index 4c16c09d588d39906e1fa581c901cd9fcd7778c8..e16f157d6e9dd249d6c6a14ae54313759a6752c4 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,4 +4,5 @@ include README.md
recursive-include ppocr/utils *.txt utility.py logging.py
recursive-include ppocr/data/ *.py
recursive-include ppocr/postprocess *.py
-recursive-include tools/infer *.py
\ No newline at end of file
+recursive-include tools/infer *.py
+recursive-include ppocr/utils/e2e_utils/ *.py
\ No newline at end of file
diff --git a/README.md b/README.md
index a5c52bdb356fa765931fa7046aca5e4ef72caa95..e0557b2749ae2b37b2710e3fa0066118d9c24f75 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,8 @@ PaddleOCR supports both dynamic graph and static graph programming paradigm
The above pictures are the visualizations of the general ppocr_server model. For more effect pictures, please see [More visualizations](./doc/doc_en/visualization_en.md).
diff --git a/configs/rec/multi_language/generate_multi_language_configs.py b/configs/rec/multi_language/generate_multi_language_configs.py
index 027a65c0c73e4b39ebb3b407271450d23281aa80..6759ca2a4640e9b1eee75d366bbe203b6a4d1b87 100644
--- a/configs/rec/multi_language/generate_multi_language_configs.py
+++ b/configs/rec/multi_language/generate_multi_language_configs.py
@@ -19,21 +19,56 @@ import logging
logging.basicConfig(level=logging.INFO)
support_list = {
- 'it':'italian', 'xi':'spanish', 'pu':'portuguese', 'ru':'russian', 'ar':'arabic',
- 'ta':'tamil', 'ug':'uyghur', 'fa':'persian', 'ur':'urdu', 'rs':'serbian latin',
- 'oc':'occitan', 'rsc':'serbian cyrillic', 'bg':'bulgarian', 'uk':'ukranian', 'be':'belarusian',
- 'te':'telugu', 'ka':'kannada', 'chinese_cht':'chinese tradition','hi':'hindi','mr':'marathi',
- 'ne':'nepali',
+ 'it': 'italian',
+ 'xi': 'spanish',
+ 'pu': 'portuguese',
+ 'ru': 'russian',
+ 'ar': 'arabic',
+ 'ta': 'tamil',
+ 'ug': 'uyghur',
+ 'fa': 'persian',
+ 'ur': 'urdu',
+ 'rs': 'serbian latin',
+ 'oc': 'occitan',
+ 'rsc': 'serbian cyrillic',
+ 'bg': 'bulgarian',
+ 'uk': 'ukranian',
+ 'be': 'belarusian',
+ 'te': 'telugu',
+ 'ka': 'kannada',
+ 'chinese_cht': 'chinese tradition',
+ 'hi': 'hindi',
+ 'mr': 'marathi',
+ 'ne': 'nepali',
}
-assert(
- os.path.isfile("./rec_multi_language_lite_train.yml")
- ),"Loss basic configuration file rec_multi_language_lite_train.yml.\
+
+latin_lang = [
+ 'af', 'az', 'bs', 'cs', 'cy', 'da', 'de', 'es', 'et', 'fr', 'ga', 'hr',
+ 'hu', 'id', 'is', 'it', 'ku', 'la', 'lt', 'lv', 'mi', 'ms', 'mt', 'nl',
+ 'no', 'oc', 'pi', 'pl', 'pt', 'ro', 'rs_latin', 'sk', 'sl', 'sq', 'sv',
+ 'sw', 'tl', 'tr', 'uz', 'vi', 'latin'
+]
+arabic_lang = ['ar', 'fa', 'ug', 'ur']
+cyrillic_lang = [
+ 'ru', 'rs_cyrillic', 'be', 'bg', 'uk', 'mn', 'abq', 'ady', 'kbd', 'ava',
+ 'dar', 'inh', 'che', 'lbe', 'lez', 'tab', 'cyrillic'
+]
+devanagari_lang = [
+ 'hi', 'mr', 'ne', 'bh', 'mai', 'ang', 'bho', 'mah', 'sck', 'new', 'gom',
+ 'sa', 'bgc', 'devanagari'
+]
+multi_lang = latin_lang + arabic_lang + cyrillic_lang + devanagari_lang
+
+assert (os.path.isfile("./rec_multi_language_lite_train.yml")
+ ), "Loss basic configuration file rec_multi_language_lite_train.yml.\
You can download it from \
https://github.com/PaddlePaddle/PaddleOCR/tree/dygraph/configs/rec/multi_language/"
-
-global_config = yaml.load(open("./rec_multi_language_lite_train.yml", 'rb'), Loader=yaml.Loader)
+
+global_config = yaml.load(
+ open("./rec_multi_language_lite_train.yml", 'rb'), Loader=yaml.Loader)
project_path = os.path.abspath(os.path.join(os.getcwd(), "../../../"))
+
class ArgsParser(ArgumentParser):
def __init__(self):
super(ArgsParser, self).__init__(
@@ -41,15 +76,30 @@ class ArgsParser(ArgumentParser):
self.add_argument(
"-o", "--opt", nargs='+', help="set configuration options")
self.add_argument(
- "-l", "--language", nargs='+', help="set language type, support {}".format(support_list))
+ "-l",
+ "--language",
+ nargs='+',
+ help="set language type, support {}".format(support_list))
self.add_argument(
- "--train",type=str,help="you can use this command to change the train dataset default path")
+ "--train",
+ type=str,
+ help="you can use this command to change the train dataset default path"
+ )
self.add_argument(
- "--val",type=str,help="you can use this command to change the eval dataset default path")
+ "--val",
+ type=str,
+ help="you can use this command to change the eval dataset default path"
+ )
self.add_argument(
- "--dict",type=str,help="you can use this command to change the dictionary default path")
+ "--dict",
+ type=str,
+ help="you can use this command to change the dictionary default path"
+ )
self.add_argument(
- "--data_dir",type=str,help="you can use this command to change the dataset default root path")
+ "--data_dir",
+ type=str,
+ help="you can use this command to change the dataset default root path"
+ )
def parse_args(self, argv=None):
args = super(ArgsParser, self).parse_args(argv)
@@ -68,21 +118,37 @@ class ArgsParser(ArgumentParser):
return config
def _set_language(self, type):
- assert(type),"please use -l or --language to choose language type"
+ lang = type[0]
+ assert (type), "please use -l or --language to choose language type"
assert(
- type[0] in support_list.keys()
+ lang in support_list.keys() or lang in multi_lang
),"the sub_keys(-l or --language) can only be one of support list: \n{},\nbut get: {}, " \
- "please check your running command".format(support_list, type)
- global_config['Global']['character_dict_path'] = 'ppocr/utils/dict/{}_dict.txt'.format(type[0])
- global_config['Global']['save_model_dir'] = './output/rec_{}_lite'.format(type[0])
- global_config['Train']['dataset']['label_file_list'] = ["train_data/{}_train.txt".format(type[0])]
- global_config['Eval']['dataset']['label_file_list'] = ["train_data/{}_val.txt".format(type[0])]
- global_config['Global']['character_type'] = type[0]
- assert(
- os.path.isfile(os.path.join(project_path,global_config['Global']['character_dict_path']))
- ),"Loss default dictionary file {}_dict.txt.You can download it from \
-https://github.com/PaddlePaddle/PaddleOCR/tree/dygraph/ppocr/utils/dict/".format(type[0])
- return type[0]
+ "please check your running command".format(multi_lang, type)
+ if lang in latin_lang:
+ lang = "latin"
+ elif lang in arabic_lang:
+ lang = "arabic"
+ elif lang in cyrillic_lang:
+ lang = "cyrillic"
+ elif lang in devanagari_lang:
+ lang = "devanagari"
+ global_config['Global'][
+ 'character_dict_path'] = 'ppocr/utils/dict/{}_dict.txt'.format(lang)
+ global_config['Global'][
+ 'save_model_dir'] = './output/rec_{}_lite'.format(lang)
+ global_config['Train']['dataset'][
+ 'label_file_list'] = ["train_data/{}_train.txt".format(lang)]
+ global_config['Eval']['dataset'][
+ 'label_file_list'] = ["train_data/{}_val.txt".format(lang)]
+ global_config['Global']['character_type'] = lang
+ assert (
+ os.path.isfile(
+ os.path.join(project_path, global_config['Global'][
+ 'character_dict_path']))
+ ), "Loss default dictionary file {}_dict.txt.You can download it from \
+https://github.com/PaddlePaddle/PaddleOCR/tree/dygraph/ppocr/utils/dict/".format(
+ lang)
+ return lang
def merge_config(config):
@@ -110,43 +176,51 @@ def merge_config(config):
cur[sub_key] = value
else:
cur = cur[sub_key]
-
+
+
def loss_file(path):
- assert(
- os.path.exists(path)
- ),"There is no such file:{},Please do not forget to put in the specified file".format(path)
+ assert (
+ os.path.exists(path)
+ ), "There is no such file:{},Please do not forget to put in the specified file".format(
+ path)
+
-
if __name__ == '__main__':
FLAGS = ArgsParser().parse_args()
merge_config(FLAGS.opt)
save_file_path = 'rec_{}_lite_train.yml'.format(FLAGS.language)
if os.path.isfile(save_file_path):
os.remove(save_file_path)
-
+
if FLAGS.train:
global_config['Train']['dataset']['label_file_list'] = [FLAGS.train]
- train_label_path = os.path.join(project_path,FLAGS.train)
+ train_label_path = os.path.join(project_path, FLAGS.train)
loss_file(train_label_path)
if FLAGS.val:
global_config['Eval']['dataset']['label_file_list'] = [FLAGS.val]
- eval_label_path = os.path.join(project_path,FLAGS.val)
+ eval_label_path = os.path.join(project_path, FLAGS.val)
loss_file(eval_label_path)
if FLAGS.dict:
global_config['Global']['character_dict_path'] = FLAGS.dict
- dict_path = os.path.join(project_path,FLAGS.dict)
+ dict_path = os.path.join(project_path, FLAGS.dict)
loss_file(dict_path)
if FLAGS.data_dir:
global_config['Eval']['dataset']['data_dir'] = FLAGS.data_dir
global_config['Train']['dataset']['data_dir'] = FLAGS.data_dir
- data_dir = os.path.join(project_path,FLAGS.data_dir)
+ data_dir = os.path.join(project_path, FLAGS.data_dir)
loss_file(data_dir)
-
+
with open(save_file_path, 'w') as f:
- yaml.dump(dict(global_config), f, default_flow_style=False, sort_keys=False)
+ yaml.dump(
+ dict(global_config), f, default_flow_style=False, sort_keys=False)
logging.info("Project path is :{}".format(project_path))
- logging.info("Train list path set to :{}".format(global_config['Train']['dataset']['label_file_list'][0]))
- logging.info("Eval list path set to :{}".format(global_config['Eval']['dataset']['label_file_list'][0]))
- logging.info("Dataset root path set to :{}".format(global_config['Eval']['dataset']['data_dir']))
- logging.info("Dict path set to :{}".format(global_config['Global']['character_dict_path']))
- logging.info("Config file set to :configs/rec/multi_language/{}".format(save_file_path))
+ logging.info("Train list path set to :{}".format(global_config['Train'][
+ 'dataset']['label_file_list'][0]))
+ logging.info("Eval list path set to :{}".format(global_config['Eval'][
+ 'dataset']['label_file_list'][0]))
+ logging.info("Dataset root path set to :{}".format(global_config['Eval'][
+ 'dataset']['data_dir']))
+ logging.info("Dict path set to :{}".format(global_config['Global'][
+ 'character_dict_path']))
+ logging.info("Config file set to :configs/rec/multi_language/{}".
+ format(save_file_path))
diff --git a/configs/rec/multi_language/rec_arabic_lite_train.yml b/configs/rec/multi_language/rec_arabic_lite_train.yml
new file mode 100644
index 0000000000000000000000000000000000000000..6dcfd1b69988b09c7dfc05cdbacce9756ea1f7cb
--- /dev/null
+++ b/configs/rec/multi_language/rec_arabic_lite_train.yml
@@ -0,0 +1,111 @@
+Global:
+ use_gpu: true
+ epoch_num: 500
+ log_smooth_window: 20
+ print_batch_step: 10
+ save_model_dir: ./output/rec_arabic_lite
+ save_epoch_step: 3
+ eval_batch_step:
+ - 0
+ - 2000
+ cal_metric_during_train: true
+ pretrained_model: null
+ checkpoints: null
+ save_inference_dir: null
+ use_visualdl: false
+ infer_img: null
+ character_dict_path: ppocr/utils/dict/arabic_dict.txt
+ character_type: arabic
+ max_text_length: 25
+ infer_mode: false
+ use_space_char: true
+Optimizer:
+ name: Adam
+ beta1: 0.9
+ beta2: 0.999
+ lr:
+ name: Cosine
+ learning_rate: 0.001
+ regularizer:
+ name: L2
+ factor: 1.0e-05
+Architecture:
+ model_type: rec
+ algorithm: CRNN
+ Transform: null
+ Backbone:
+ name: MobileNetV3
+ scale: 0.5
+ model_name: small
+ small_stride:
+ - 1
+ - 2
+ - 2
+ - 2
+ Neck:
+ name: SequenceEncoder
+ encoder_type: rnn
+ hidden_size: 48
+ Head:
+ name: CTCHead
+ fc_decay: 1.0e-05
+Loss:
+ name: CTCLoss
+PostProcess:
+ name: CTCLabelDecode
+Metric:
+ name: RecMetric
+ main_indicator: acc
+Train:
+ dataset:
+ name: SimpleDataSet
+ data_dir: train_data/
+ label_file_list:
+ - train_data/arabic_train.txt
+ transforms:
+ - DecodeImage:
+ img_mode: BGR
+ channel_first: false
+ - RecAug: null
+ - CTCLabelEncode: null
+ - RecResizeImg:
+ image_shape:
+ - 3
+ - 32
+ - 320
+ - KeepKeys:
+ keep_keys:
+ - image
+ - label
+ - length
+ loader:
+ shuffle: true
+ batch_size_per_card: 256
+ drop_last: true
+ num_workers: 8
+Eval:
+ dataset:
+ name: SimpleDataSet
+ data_dir: train_data/
+ label_file_list:
+ - train_data/arabic_val.txt
+ transforms:
+ - DecodeImage:
+ img_mode: BGR
+ channel_first: false
+ - CTCLabelEncode: null
+ - RecResizeImg:
+ image_shape:
+ - 3
+ - 32
+ - 320
+ - KeepKeys:
+ keep_keys:
+ - image
+ - label
+ - length
+ loader:
+ shuffle: false
+ drop_last: false
+ batch_size_per_card: 256
+ num_workers: 8
diff --git a/configs/rec/multi_language/rec_cyrillic_lite_train.yml b/configs/rec/multi_language/rec_cyrillic_lite_train.yml
new file mode 100644
index 0000000000000000000000000000000000000000..52527c1dfb9a306429bbab9241c623581d546e45
--- /dev/null
+++ b/configs/rec/multi_language/rec_cyrillic_lite_train.yml
@@ -0,0 +1,111 @@
+Global:
+ use_gpu: true
+ epoch_num: 500
+ log_smooth_window: 20
+ print_batch_step: 10
+ save_model_dir: ./output/rec_cyrillic_lite
+ save_epoch_step: 3
+ eval_batch_step:
+ - 0
+ - 2000
+ cal_metric_during_train: true
+ pretrained_model: null
+ checkpoints: null
+ save_inference_dir: null
+ use_visualdl: false
+ infer_img: null
+ character_dict_path: ppocr/utils/dict/cyrillic_dict.txt
+ character_type: cyrillic
+ max_text_length: 25
+ infer_mode: false
+ use_space_char: true
+Optimizer:
+ name: Adam
+ beta1: 0.9
+ beta2: 0.999
+ lr:
+ name: Cosine
+ learning_rate: 0.001
+ regularizer:
+ name: L2
+ factor: 1.0e-05
+Architecture:
+ model_type: rec
+ algorithm: CRNN
+ Transform: null
+ Backbone:
+ name: MobileNetV3
+ scale: 0.5
+ model_name: small
+ small_stride:
+ - 1
+ - 2
+ - 2
+ - 2
+ Neck:
+ name: SequenceEncoder
+ encoder_type: rnn
+ hidden_size: 48
+ Head:
+ name: CTCHead
+ fc_decay: 1.0e-05
+Loss:
+ name: CTCLoss
+PostProcess:
+ name: CTCLabelDecode
+Metric:
+ name: RecMetric
+ main_indicator: acc
+Train:
+ dataset:
+ name: SimpleDataSet
+ data_dir: train_data/
+ label_file_list:
+ - train_data/cyrillic_train.txt
+ transforms:
+ - DecodeImage:
+ img_mode: BGR
+ channel_first: false
+ - RecAug: null
+ - CTCLabelEncode: null
+ - RecResizeImg:
+ image_shape:
+ - 3
+ - 32
+ - 320
+ - KeepKeys:
+ keep_keys:
+ - image
+ - label
+ - length
+ loader:
+ shuffle: true
+ batch_size_per_card: 256
+ drop_last: true
+ num_workers: 8
+Eval:
+ dataset:
+ name: SimpleDataSet
+ data_dir: train_data/
+ label_file_list:
+ - train_data/cyrillic_val.txt
+ transforms:
+ - DecodeImage:
+ img_mode: BGR
+ channel_first: false
+ - CTCLabelEncode: null
+ - RecResizeImg:
+ image_shape:
+ - 3
+ - 32
+ - 320
+ - KeepKeys:
+ keep_keys:
+ - image
+ - label
+ - length
+ loader:
+ shuffle: false
+ drop_last: false
+ batch_size_per_card: 256
+ num_workers: 8
diff --git a/configs/rec/multi_language/rec_devanagari_lite_train.yml b/configs/rec/multi_language/rec_devanagari_lite_train.yml
new file mode 100644
index 0000000000000000000000000000000000000000..e1a7c829c3e6d3c3a57f1d501cdd80a560703ec7
--- /dev/null
+++ b/configs/rec/multi_language/rec_devanagari_lite_train.yml
@@ -0,0 +1,111 @@
+Global:
+ use_gpu: true
+ epoch_num: 500
+ log_smooth_window: 20
+ print_batch_step: 10
+ save_model_dir: ./output/rec_devanagari_lite
+ save_epoch_step: 3
+ eval_batch_step:
+ - 0
+ - 2000
+ cal_metric_during_train: true
+ pretrained_model: null
+ checkpoints: null
+ save_inference_dir: null
+ use_visualdl: false
+ infer_img: null
+ character_dict_path: ppocr/utils/dict/devanagari_dict.txt
+ character_type: devanagari
+ max_text_length: 25
+ infer_mode: false
+ use_space_char: true
+Optimizer:
+ name: Adam
+ beta1: 0.9
+ beta2: 0.999
+ lr:
+ name: Cosine
+ learning_rate: 0.001
+ regularizer:
+ name: L2
+ factor: 1.0e-05
+Architecture:
+ model_type: rec
+ algorithm: CRNN
+ Transform: null
+ Backbone:
+ name: MobileNetV3
+ scale: 0.5
+ model_name: small
+ small_stride:
+ - 1
+ - 2
+ - 2
+ - 2
+ Neck:
+ name: SequenceEncoder
+ encoder_type: rnn
+ hidden_size: 48
+ Head:
+ name: CTCHead
+ fc_decay: 1.0e-05
+Loss:
+ name: CTCLoss
+PostProcess:
+ name: CTCLabelDecode
+Metric:
+ name: RecMetric
+ main_indicator: acc
+Train:
+ dataset:
+ name: SimpleDataSet
+ data_dir: train_data/
+ label_file_list:
+ - train_data/devanagari_train.txt
+ transforms:
+ - DecodeImage:
+ img_mode: BGR
+ channel_first: false
+ - RecAug: null
+ - CTCLabelEncode: null
+ - RecResizeImg:
+ image_shape:
+ - 3
+ - 32
+ - 320
+ - KeepKeys:
+ keep_keys:
+ - image
+ - label
+ - length
+ loader:
+ shuffle: true
+ batch_size_per_card: 256
+ drop_last: true
+ num_workers: 8
+Eval:
+ dataset:
+ name: SimpleDataSet
+ data_dir: train_data/
+ label_file_list:
+ - train_data/devanagari_val.txt
+ transforms:
+ - DecodeImage:
+ img_mode: BGR
+ channel_first: false
+ - CTCLabelEncode: null
+ - RecResizeImg:
+ image_shape:
+ - 3
+ - 32
+ - 320
+ - KeepKeys:
+ keep_keys:
+ - image
+ - label
+ - length
+ loader:
+ shuffle: false
+ drop_last: false
+ batch_size_per_card: 256
+ num_workers: 8
diff --git a/configs/rec/multi_language/rec_en_number_lite_train.yml b/configs/rec/multi_language/rec_en_number_lite_train.yml
index 13eda8481cad8ca308cd0629214b52146c3ebf13..fff4dfcd905b406964bb07cf14017af22f40e91e 100644
--- a/configs/rec/multi_language/rec_en_number_lite_train.yml
+++ b/configs/rec/multi_language/rec_en_number_lite_train.yml
@@ -15,11 +15,11 @@ Global:
use_visualdl: False
infer_img:
# for data or label process
- character_dict_path: ppocr/utils/dict/en_dict.txt
+ character_dict_path: ppocr/utils/en_dict.txt
character_type: EN
max_text_length: 25
infer_mode: False
- use_space_char: False
+ use_space_char: True
Optimizer:
diff --git a/configs/rec/multi_language/rec_latin_lite_train.yml b/configs/rec/multi_language/rec_latin_lite_train.yml
new file mode 100644
index 0000000000000000000000000000000000000000..e71112b4b4f0afd3ceab9f10078bc5d518ee9e59
--- /dev/null
+++ b/configs/rec/multi_language/rec_latin_lite_train.yml
@@ -0,0 +1,111 @@
+Global:
+ use_gpu: true
+ epoch_num: 500
+ log_smooth_window: 20
+ print_batch_step: 10
+ save_model_dir: ./output/rec_latin_lite
+ save_epoch_step: 3
+ eval_batch_step:
+ - 0
+ - 2000
+ cal_metric_during_train: true
+ pretrained_model: null
+ checkpoints: null
+ save_inference_dir: null
+ use_visualdl: false
+ infer_img: null
+ character_dict_path: ppocr/utils/dict/latin_dict.txt
+ character_type: latin
+ max_text_length: 25
+ infer_mode: false
+ use_space_char: true
+Optimizer:
+ name: Adam
+ beta1: 0.9
+ beta2: 0.999
+ lr:
+ name: Cosine
+ learning_rate: 0.001
+ regularizer:
+ name: L2
+ factor: 1.0e-05
+Architecture:
+ model_type: rec
+ algorithm: CRNN
+ Transform: null
+ Backbone:
+ name: MobileNetV3
+ scale: 0.5
+ model_name: small
+ small_stride:
+ - 1
+ - 2
+ - 2
+ - 2
+ Neck:
+ name: SequenceEncoder
+ encoder_type: rnn
+ hidden_size: 48
+ Head:
+ name: CTCHead
+ fc_decay: 1.0e-05
+Loss:
+ name: CTCLoss
+PostProcess:
+ name: CTCLabelDecode
+Metric:
+ name: RecMetric
+ main_indicator: acc
+Train:
+ dataset:
+ name: SimpleDataSet
+ data_dir: train_data/
+ label_file_list:
+ - train_data/latin_train.txt
+ transforms:
+ - DecodeImage:
+ img_mode: BGR
+ channel_first: false
+ - RecAug: null
+ - CTCLabelEncode: null
+ - RecResizeImg:
+ image_shape:
+ - 3
+ - 32
+ - 320
+ - KeepKeys:
+ keep_keys:
+ - image
+ - label
+ - length
+ loader:
+ shuffle: true
+ batch_size_per_card: 256
+ drop_last: true
+ num_workers: 8
+Eval:
+ dataset:
+ name: SimpleDataSet
+ data_dir: train_data/
+ label_file_list:
+ - train_data/latin_val.txt
+ transforms:
+ - DecodeImage:
+ img_mode: BGR
+ channel_first: false
+ - CTCLabelEncode: null
+ - RecResizeImg:
+ image_shape:
+ - 3
+ - 32
+ - 320
+ - KeepKeys:
+ keep_keys:
+ - image
+ - label
+ - length
+ loader:
+ shuffle: false
+ drop_last: false
+ batch_size_per_card: 256
+ num_workers: 8
diff --git a/deploy/cpp_infer/CMakeLists.txt b/deploy/cpp_infer/CMakeLists.txt
index 120cf06a04c8f1769bdcd153a74cd6ff0665cf93..bdcfefee2eb4c3fdd12efd021fdbdcfce648fd39 100644
--- a/deploy/cpp_infer/CMakeLists.txt
+++ b/deploy/cpp_infer/CMakeLists.txt
@@ -40,6 +40,7 @@ endif()
if (WIN32)
include_directories("${PADDLE_LIB}/paddle/fluid/inference")
include_directories("${PADDLE_LIB}/paddle/include")
+ link_directories("${PADDLE_LIB}/paddle/lib")
link_directories("${PADDLE_LIB}/paddle/fluid/inference")
find_package(OpenCV REQUIRED PATHS ${OPENCV_DIR}/build/ NO_DEFAULT_PATH)
@@ -140,22 +141,22 @@ else()
endif ()
endif()
-# Note: libpaddle_inference_api.so/a must put before libpaddle_fluid.so/a
+# Note: libpaddle_inference_api.so/a must put before libpaddle_inference.so/a
if(WITH_STATIC_LIB)
if(WIN32)
set(DEPS
- ${PADDLE_LIB}/paddle/lib/paddle_fluid${CMAKE_STATIC_LIBRARY_SUFFIX})
+ ${PADDLE_LIB}/paddle/lib/paddle_inference${CMAKE_STATIC_LIBRARY_SUFFIX})
else()
set(DEPS
- ${PADDLE_LIB}/paddle/lib/libpaddle_fluid${CMAKE_STATIC_LIBRARY_SUFFIX})
+ ${PADDLE_LIB}/paddle/lib/libpaddle_inference${CMAKE_STATIC_LIBRARY_SUFFIX})
endif()
else()
if(WIN32)
set(DEPS
- ${PADDLE_LIB}/paddle/lib/paddle_fluid${CMAKE_SHARED_LIBRARY_SUFFIX})
+ ${PADDLE_LIB}/paddle/lib/paddle_inference${CMAKE_SHARED_LIBRARY_SUFFIX})
else()
set(DEPS
- ${PADDLE_LIB}/paddle/lib/libpaddle_fluid${CMAKE_SHARED_LIBRARY_SUFFIX})
+ ${PADDLE_LIB}/paddle/lib/libpaddle_inference${CMAKE_SHARED_LIBRARY_SUFFIX})
endif()
endif(WITH_STATIC_LIB)
diff --git a/deploy/cpp_infer/imgs/cpp_infer_pred_12.png b/deploy/cpp_infer/imgs/cpp_infer_pred_12.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb5f64e1f6c329f7ae772c50edce7fc8afcb1211
Binary files /dev/null and b/deploy/cpp_infer/imgs/cpp_infer_pred_12.png differ
diff --git a/deploy/cpp_infer/readme.md b/deploy/cpp_infer/readme.md
index 633553082160ddc37944feadd35287ebcee9bdef..b62b1a4cf10b5abd345528ebf48e6a8de4387469 100644
--- a/deploy/cpp_infer/readme.md
+++ b/deploy/cpp_infer/readme.md
@@ -74,9 +74,10 @@ opencv3/
* 有2种方式获取Paddle预测库，下面进行详细介绍。
+
#### 1.2.1 直接下载安装
-* [Paddle预测库官网](https://www.paddlepaddle.org.cn/documentation/docs/zh/develop/guides/05_inference_deployment/inference/build_and_install_lib_cn.html)上提供了不同cuda版本的Linux预测库，可以在官网查看并选择合适的预测库版本。
+* [Paddle预测库官网](https://www.paddlepaddle.org.cn/documentation/docs/zh/advanced_guide/inference_deployment/inference/build_and_install_lib_cn.html)上提供了不同cuda版本的Linux预测库，可以在官网查看并选择合适的预测库版本（*建议选择paddle版本>=2.0.1版本的预测库* ）。
* 下载之后使用下面的方法解压。
@@ -130,8 +131,6 @@ build/paddle_inference_install_dir/
其中`paddle`就是C++预测所需的Paddle库，`version.txt`中包含当前预测库的版本信息。
-
-
## 2 开始运行
### 2.1 将模型导出为inference model
@@ -232,7 +231,7 @@ visualize 1 # 是否对结果进行可视化，为1时，会在当前文件夹
最终屏幕上会输出检测结果如下。
-
+
-
+
- 
+ 
+ 