Update from latest develop (#28)

* [Backend] Update paddle inference version (PaddlePaddle#990) 2.4-dev3 -> 2.4-dev4 * Add uie benchmark * fix trt dy shape * update uie benchmark * Update uie benchmark output * Fix cpu_num_thread->cpu_num_threads * Update backend name * [Model] Update PPSeg Preprocess (PaddlePaddle#1007) * 更新PPSeg pybind and python * 更新PPSeg pybind and python * [Model] Update PPDet Preprocess (PaddlePaddle#1006) * 更新导航文档 * 更新导航文档 * 更新导航文档 * 更新导航文档 * 更新PPDet PreProcess * 更新PPDet PreProcess * 更新PPDet pybind and python * 更新 * 更新ppdet * [Other]Update Paddle Lite for RV1126 (PaddlePaddle#1013) update lite link * [Other] Remove TRT static libs in package (PaddlePaddle#1011) * remove duplicated and useless libs * use os system to run ldd * remove filter libs by ldd * [Serving]update ocr model.py from np.object to np.object_ (PaddlePaddle#1017) * [Serving]update ocr model.py from np.object to np.object_ * Update model.py * [Bug Fix] Fix build with Paddle Inference on Jetson (PaddlePaddle#1019) Fix build with Paddle Inference on Jetson * Update README.md * [Serving]update np.object to np.object_ (PaddlePaddle#1021) np.object to np.object_ * Update README.md * fresh doc version release/1.0.2 (PaddlePaddle#1023) fresh doc version * [Other] Add a interface to get all pretrained models available from hub model server (PaddlePaddle#1022) add get model list * [Doc]Revise one wording (PaddlePaddle#1028) * 第一次提交 * 补充一处漏翻译 * deleted: docs/en/quantize.md * Update one translation * Update en version * Update one translation in code * Standardize one writing * Standardize one writing * Update some en version * Fix a grammer problem * Update en version for api/vision result * Merge branch 'develop' of https://github.com/charl-u/FastDeploy into develop * Checkout the link in README in vision_results/ to the en documents * Modify a title * Add link to serving/docs/ * Finish translation of demo.md * Update english version of serving/docs/ * Update title of readme * Update some links * Modify a title * Update some links * Update en version of java android README * Modify some titles * Modify some titles * Modify some titles * modify article to document * [Model] add style transfer model (PaddlePaddle#922) * add style transfer model * add examples for generation model * add unit test * add speed comparison * add speed comparison * add variable for constant * add preprocessor and postprocessor * add preprocessor and postprocessor * fix * fix according to review Co-authored-by: DefTruth <31974251+DefTruth@users.noreply.github.com> Co-authored-by: Jack Zhou <zhoushunjie@baidu.com> Co-authored-by: Zheng-Bicheng <58363586+Zheng-Bicheng@users.noreply.github.com> Co-authored-by: yeliang2258 <30516196+yeliang2258@users.noreply.github.com> Co-authored-by: Wang Xinyu <wangxinyu_es@163.com> Co-authored-by: heliqi <1101791222@qq.com> Co-authored-by: Jason <jiangjiajun@baidu.com> Co-authored-by: leiqing <54695910+leiqing1@users.noreply.github.com> Co-authored-by: Zeref996 <53218160+Zeref996@users.noreply.github.com> Co-authored-by: chenjian <chenjian26@baidu.com> Co-authored-by: charl-u <115439700+charl-u@users.noreply.github.com>
DefTruth · Jan 3, 2023 · a367c70 · a367c70
1 parent 3647965
commit a367c70
Show file tree

Hide file tree

Showing 60 changed files with 1,556 additions and 120 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -240,12 +240,12 @@ if(ENABLE_PADDLE_BACKEND)
   add_definitions(-DENABLE_PADDLE_BACKEND)
   list(APPEND ALL_DEPLOY_SRCS ${DEPLOY_PADDLE_SRCS})
   include(${PROJECT_SOURCE_DIR}/cmake/paddle_inference.cmake)
-  if(NOT APPLE)
-    list(APPEND DEPEND_LIBS external_paddle_inference external_dnnl external_omp)
-  else()
-    # no third parties libs(mkldnn and omp) need to
-    # link into paddle_inference on MacOS OSX.
-    list(APPEND DEPEND_LIBS external_paddle_inference)
+  list(APPEND DEPEND_LIBS external_paddle_inference)
+  if(external_dnnl_FOUND)
+    list(APPEND DEPEND_LIBS external_dnnl external_omp)
+  endif()
+  if(external_ort_FOUND)
+    list(APPEND DEPEND_LIBS external_p2o external_ort)
   endif()
 endif()
 
@@ -387,9 +387,9 @@ if(ENABLE_TRT_BACKEND)
     find_package(Python COMPONENTS Interpreter Development REQUIRED)
     message(STATUS "Copying ${TRT_DIRECTORY}/lib to ${CMAKE_CURRENT_BINARY_DIR}/third_libs/install/tensorrt/lib ...")
     execute_process(COMMAND ${Python_EXECUTABLE} ${PROJECT_SOURCE_DIR}/scripts/copy_directory.py ${TRT_DIRECTORY}/lib ${CMAKE_CURRENT_BINARY_DIR}/third_libs/install/tensorrt/lib)
-    file(GLOB_RECURSE TRT_STAIC_LIBS ${CMAKE_CURRENT_BINARY_DIR}/third_libs/install/tensorrt/lib/*.a)
+    file(GLOB_RECURSE TRT_STATIC_LIBS ${CMAKE_CURRENT_BINARY_DIR}/third_libs/install/tensorrt/lib/*.a)
     if(TRT_STATIC_LIBS)
-      file(REMOVE ${TRT_STAIC_LIBS})
+      file(REMOVE ${TRT_STATIC_LIBS})
     endif()
     if(UNIX AND (NOT APPLE) AND (NOT ANDROID))
       execute_process(COMMAND sh -c "ls *.so*" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/third_libs/install/tensorrt/lib

diff --git a/FastDeploy.cmake.in b/FastDeploy.cmake.in
@@ -74,10 +74,9 @@ if(ENABLE_PADDLE_BACKEND)
     set(DNNL_LIB "${CMAKE_CURRENT_LIST_DIR}/third_libs/install/paddle_inference/third_party/install/mkldnn/lib/libmkldnn.so.0")
     set(IOMP_LIB "${CMAKE_CURRENT_LIST_DIR}/third_libs/install/paddle_inference/third_party/install/mklml/lib/libiomp5.so")
   endif()
-  if(NOT APPLE)
-    list(APPEND FASTDEPLOY_LIBS ${PADDLE_LIB} ${DNNL_LIB} ${IOMP_LIB})
-  else()
-    list(APPEND FASTDEPLOY_LIBS ${PADDLE_LIB})
+  list(APPEND FASTDEPLOY_LIBS ${PADDLE_LIB})
+  if(EXISTS "${DNNL_LIB}")
+    list(APPEND FASTDEPLOY_LIBS ${DNNL_LIB} ${IOMP_LIB})
   endif()
 endif()
 

diff --git a/README.md b/README.md
@@ -1 +1 @@
-README_CN.md
+README_EN.md
diff --git a/benchmark/benchmark_uie.py b/benchmark/benchmark_uie.py
@@ -0,0 +1,321 @@
+import numpy as np
+import os
+import time
+import distutils.util
+import sys
+import json
+
+import fastdeploy as fd
+from fastdeploy.text import UIEModel, SchemaLanguage
+
+
+def parse_arguments():
+    import argparse
+    import ast
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "--model_dir",
+        required=True,
+        help="The directory of model and tokenizer.")
+    parser.add_argument(
+        "--data_path", required=True, help="The path of uie data.")
+    parser.add_argument(
+        "--device",
+        type=str,
+        default='cpu',
+        choices=['gpu', 'cpu'],
+        help="Type of inference device, support 'cpu' or 'gpu'.")
+    parser.add_argument(
+        "--backend",
+        type=str,
+        default='paddle',
+        choices=['ort', 'paddle', 'trt', 'paddle_trt', 'ov'],
+        help="The inference runtime backend.")
+    parser.add_argument(
+        "--device_id", type=int, default=0, help="device(gpu) id")
+    parser.add_argument(
+        "--batch_size", type=int, default=1, help="The batch size of data.")
+    parser.add_argument(
+        "--max_length",
+        type=int,
+        default=128,
+        help="The max length of sequence.")
+    parser.add_argument(
+        "--cpu_num_threads",
+        type=int,
+        default=8,
+        help="The number of threads when inferring on cpu.")
+    parser.add_argument(
+        "--enable_trt_fp16",
+        type=distutils.util.strtobool,
+        default=False,
+        help="whether enable fp16 in trt backend")
+    parser.add_argument(
+        "--epoch", type=int, default=1, help="The epoch of test")
+    parser.add_argument(
+        "--enable_collect_memory_info",
+        type=ast.literal_eval,
+        default=False,
+        help="whether enable collect memory info")
+    return parser.parse_args()
+
+
+def build_option(args):
+    option = fd.RuntimeOption()
+    if args.device == 'cpu':
+        option.use_cpu()
+        option.set_cpu_thread_num(args.cpu_num_threads)
+    else:
+        option.use_gpu(args.device_id)
+    if args.backend == 'paddle':
+        option.use_paddle_backend()
+    elif args.backend == 'ort':
+        option.use_ort_backend()
+    elif args.backend == 'ov':
+        option.use_openvino_backend()
+    else:
+        option.use_trt_backend()
+        if args.backend == 'paddle_trt':
+            option.enable_paddle_to_trt()
+            option.enable_paddle_trt_collect_shape()
+        trt_file = os.path.join(args.model_dir, "infer.trt")
+        option.set_trt_input_shape(
+            'input_ids',
+            min_shape=[1, 1],
+            opt_shape=[args.batch_size, args.max_length // 2],
+            max_shape=[args.batch_size, args.max_length])
+        option.set_trt_input_shape(
+            'token_type_ids',
+            min_shape=[1, 1],
+            opt_shape=[args.batch_size, args.max_length // 2],
+            max_shape=[args.batch_size, args.max_length])
+        option.set_trt_input_shape(
+            'pos_ids',
+            min_shape=[1, 1],
+            opt_shape=[args.batch_size, args.max_length // 2],
+            max_shape=[args.batch_size, args.max_length])
+        option.set_trt_input_shape(
+            'att_mask',
+            min_shape=[1, 1],
+            opt_shape=[args.batch_size, args.max_length // 2],
+            max_shape=[args.batch_size, args.max_length])
+        if args.enable_trt_fp16:
+            option.enable_trt_fp16()
+            trt_file = trt_file + ".fp16"
+        option.set_trt_cache_file(trt_file)
+    return option
+
+
+class StatBase(object):
+    """StatBase"""
+    nvidia_smi_path = "nvidia-smi"
+    gpu_keys = ('index', 'uuid', 'name', 'timestamp', 'memory.total',
+                'memory.free', 'memory.used', 'utilization.gpu',
+                'utilization.memory')
+    nu_opt = ',nounits'
+    cpu_keys = ('cpu.util', 'memory.util', 'memory.used')
+
+
+class Monitor(StatBase):
+    """Monitor"""
+
+    def __init__(self, use_gpu=False, gpu_id=0, interval=0.1):
+        self.result = {}
+        self.gpu_id = gpu_id
+        self.use_gpu = use_gpu
+        self.interval = interval
+        self.cpu_stat_q = multiprocessing.Queue()
+
+    def start(self):
+        cmd = '%s --id=%s --query-gpu=%s --format=csv,noheader%s -lms 50' % (
+            StatBase.nvidia_smi_path, self.gpu_id, ','.join(StatBase.gpu_keys),
+            StatBase.nu_opt)
+        if self.use_gpu:
+            self.gpu_stat_worker = subprocess.Popen(
+                cmd,
+                stderr=subprocess.STDOUT,
+                stdout=subprocess.PIPE,
+                shell=True,
+                close_fds=True,
+                preexec_fn=os.setsid)
+        # cpu stat
+        pid = os.getpid()
+        self.cpu_stat_worker = multiprocessing.Process(
+            target=self.cpu_stat_func,
+            args=(self.cpu_stat_q, pid, self.interval))
+        self.cpu_stat_worker.start()
+
+    def stop(self):
+        try:
+            if self.use_gpu:
+                os.killpg(self.gpu_stat_worker.pid, signal.SIGUSR1)
+            # os.killpg(p.pid, signal.SIGTERM)
+            self.cpu_stat_worker.terminate()
+            self.cpu_stat_worker.join(timeout=0.01)
+        except Exception as e:
+            print(e)
+            return
+
+        # gpu
+        if self.use_gpu:
+            lines = self.gpu_stat_worker.stdout.readlines()
+            lines = [
+                line.strip().decode("utf-8") for line in lines
+                if line.strip() != ''
+            ]
+            gpu_info_list = [{
+                k: v
+                for k, v in zip(StatBase.gpu_keys, line.split(', '))
+            } for line in lines]
+            if len(gpu_info_list) == 0:
+                return
+            result = gpu_info_list[0]
+            for item in gpu_info_list:
+                for k in item.keys():
+                    if k not in ["name", "uuid", "timestamp"]:
+                        result[k] = max(int(result[k]), int(item[k]))
+                    else:
+                        result[k] = max(result[k], item[k])
+            self.result['gpu'] = result
+
+        # cpu
+        cpu_result = {}
+        if self.cpu_stat_q.qsize() > 0:
+            cpu_result = {
+                k: v
+                for k, v in zip(StatBase.cpu_keys, self.cpu_stat_q.get())
+            }
+        while not self.cpu_stat_q.empty():
+            item = {
+                k: v
+                for k, v in zip(StatBase.cpu_keys, self.cpu_stat_q.get())
+            }
+            for k in StatBase.cpu_keys:
+                cpu_result[k] = max(cpu_result[k], item[k])
+        cpu_result['name'] = cpuinfo.get_cpu_info()['brand_raw']
+        self.result['cpu'] = cpu_result
+
+    def output(self):
+        return self.result
+
+    def cpu_stat_func(self, q, pid, interval=0.0):
+        """cpu stat function"""
+        stat_info = psutil.Process(pid)
+        while True:
+            # pid = os.getpid()
+            cpu_util, mem_util, mem_use = stat_info.cpu_percent(
+            ), stat_info.memory_percent(), round(stat_info.memory_info().rss /
+                                                 1024.0 / 1024.0, 4)
+            q.put([cpu_util, mem_util, mem_use])
+            time.sleep(interval)
+        return
+
+
+def get_dataset(data_path, max_seq_len=512):
+    json_lines = []
+    with open(data_path, 'r', encoding='utf-8') as f:
+        for line in f:
+            json_line = json.loads(line)
+            content = json_line['content'].strip()
+            prompt = json_line['prompt']
+            # Model Input is aslike: [CLS] Prompt [SEP] Content [SEP]
+            # It include three summary tokens.
+            if max_seq_len <= len(prompt) + 3:
+                raise ValueError(
+                    "The value of max_seq_len is too small, please set a larger value"
+                )
+            json_lines.append(json_line)
+
+    return json_lines
+
+
+if __name__ == '__main__':
+    args = parse_arguments()
+    runtime_option = build_option(args)
+    model_path = os.path.join(args.model_dir, "inference.pdmodel")
+    param_path = os.path.join(args.model_dir, "inference.pdiparams")
+    vocab_path = os.path.join(args.model_dir, "vocab.txt")
+
+    gpu_id = args.device_id
+    enable_collect_memory_info = args.enable_collect_memory_info
+    dump_result = dict()
+    end2end_statis = list()
+    cpu_mem = list()
+    gpu_mem = list()
+    gpu_util = list()
+    if args.device == "cpu":
+        file_path = args.model_dir + "_model_" + args.backend + "_" + \
+            args.device + "_" + str(args.cpu_num_threads) + ".txt"
+    else:
+        if args.enable_trt_fp16:
+            file_path = args.model_dir + "_model_" + \
+                args.backend + "_fp16_" + args.device + ".txt"
+        else:
+            file_path = args.model_dir + "_model_" + args.backend + "_" + args.device + ".txt"
+    f = open(file_path, "w")
+    f.writelines("===={}====: \n".format(os.path.split(file_path)[-1][:-4]))
+
+    ds = get_dataset(args.data_path)
+    schema = ["时间"]
+    uie = UIEModel(
+        model_path,
+        param_path,
+        vocab_path,
+        position_prob=0.5,
+        max_length=args.max_length,
+        batch_size=args.batch_size,
+        schema=schema,
+        runtime_option=runtime_option,
+        schema_language=SchemaLanguage.ZH)
+
+    try:
+        if enable_collect_memory_info:
+            import multiprocessing
+            import subprocess
+            import psutil
+            import signal
+            import cpuinfo
+            enable_gpu = args.device == "gpu"
+            monitor = Monitor(enable_gpu, gpu_id)
+            monitor.start()
+        uie.enable_record_time_of_runtime()
+
+        for ep in range(args.epoch):
+            for i, sample in enumerate(ds):
+                curr_start = time.time()
+                uie.set_schema([sample['prompt']])
+                result = uie.predict([sample['content']])
+                end2end_statis.append(time.time() - curr_start)
+        runtime_statis = uie.print_statis_info_of_runtime()
+
+        warmup_iter = args.epoch * len(ds) // 5
+
+        end2end_statis_repeat = end2end_statis[warmup_iter:]
+        if enable_collect_memory_info:
+            monitor.stop()
+            mem_info = monitor.output()
+            dump_result["cpu_rss_mb"] = mem_info['cpu'][
+                'memory.used'] if 'cpu' in mem_info else 0
+            dump_result["gpu_rss_mb"] = mem_info['gpu'][
+                'memory.used'] if 'gpu' in mem_info else 0
+            dump_result["gpu_util"] = mem_info['gpu'][
+                'utilization.gpu'] if 'gpu' in mem_info else 0
+
+        dump_result["runtime"] = runtime_statis["avg_time"] * 1000
+        dump_result["end2end"] = np.mean(end2end_statis_repeat) * 1000
+
+        time_cost_str = f"Runtime(ms): {dump_result['runtime']}\n" \
+                        f"End2End(ms): {dump_result['end2end']}\n"
+        f.writelines(time_cost_str)
+        print(time_cost_str)
+
+        if enable_collect_memory_info:
+            mem_info_str = f"cpu_rss_mb: {dump_result['cpu_rss_mb']}\n" \
+                           f"gpu_rss_mb: {dump_result['gpu_rss_mb']}\n" \
+                           f"gpu_util: {dump_result['gpu_util']}\n"
+            f.writelines(mem_info_str)
+            print(mem_info_str)
+    except:
+        f.writelines("!!!!!Infer Failed\n")
+
+    f.close()
diff --git a/benchmark/run_benchmark_uie.sh b/benchmark/run_benchmark_uie.sh
@@ -0,0 +1,27 @@
+# wget https://bj.bcebos.com/fastdeploy/benchmark/uie/reimbursement_form_data.txt
+# wget https://bj.bcebos.com/fastdeploy/models/uie/uie-base.tgz
+# tar xvfz uie-base.tgz
+
+DEVICE_ID=0
+
+echo "[FastDeploy]    Running UIE benchmark..."
+
+# GPU
+echo "-------------------------------GPU Benchmark---------------------------------------"
+python benchmark_uie.py --epoch 5 --model_dir uie-base --data_path reimbursement_form_data.txt --backend paddle --device_id $DEVICE_ID --device gpu --enable_collect_memory_info True
+python benchmark_uie.py --epoch 5 --model_dir uie-base --data_path reimbursement_form_data.txt --backend ort --device_id $DEVICE_ID --device gpu --enable_collect_memory_info True
+python benchmark_uie.py --epoch 5 --model_dir uie-base --data_path reimbursement_form_data.txt --backend paddle_trt --device_id $DEVICE_ID --device gpu --enable_trt_fp16 False --enable_collect_memory_info True
+python benchmark_uie.py --epoch 5 --model_dir uie-base --data_path reimbursement_form_data.txt --backend trt --device_id $DEVICE_ID --device gpu --enable_trt_fp16 False --enable_collect_memory_info True
+python benchmark_uie.py --epoch 5 --model_dir uie-base --data_path reimbursement_form_data.txt --backend paddle_trt --device_id $DEVICE_ID --device gpu --enable_trt_fp16 True --enable_collect_memory_info True
+python benchmark_uie.py --epoch 5 --model_dir uie-base --data_path reimbursement_form_data.txt --backend trt --device_id $DEVICE_ID --device gpu --enable_trt_fp16 True --enable_collect_memory_info True
+echo "-----------------------------------------------------------------------------------"
+
+# CPU
+echo "-------------------------------CPU Benchmark---------------------------------------"
+for cpu_num_threads in 1 8;
+do
+  python benchmark_uie.py --epoch 5 --model_dir uie-base --data_path reimbursement_form_data.txt --backend paddle --device cpu --cpu_num_threads ${cpu_num_threads} --enable_collect_memory_info True
+  python benchmark_uie.py --epoch 5 --model_dir uie-base --data_path reimbursement_form_data.txt --backend ort --device cpu --cpu_num_threads ${cpu_num_threads} --enable_collect_memory_info True
+  python benchmark_uie.py --epoch 5 --model_dir uie-base --data_path reimbursement_form_data.txt --backend ov --device cpu --cpu_num_threads ${cpu_num_threads} --enable_collect_memory_info True
+done
+echo "-----------------------------------------------------------------------------------"