Merge branch 'develop' of https://github.com/PaddlePaddle/PaddleX into develop

deploy/cpp/src/paddlex.cpp

@@ -66,7 +66,7 @@ void Model::create_predictor(const std::string& model_dir,
   if (key == "") {
     config.SetModel(model_file, params_file);
   }
-  if (use_mkl) {
+  if (use_mkl && !use_gpu) {
     if (name != "HRNet" && name != "DeepLabv3p" && name != "PPYOLO") {
         config.EnableMKLDNN();
         config.SetCpuMathLibraryNumThreads(mkl_thread_num);

paddlex/deploy.py

@@ -108,7 +108,7 @@ class Predictor:
             config.enable_use_gpu(100, gpu_id)
         else:
             config.disable_gpu()
-        if use_mkl:
+        if use_mkl and not use_gpu:
             if self.model_name not in ["HRNet", "DeepLabv3p", "PPYOLO"]:
                 config.enable_mkldnn()
                 config.set_cpu_math_library_num_threads(mkl_thread_num)