plt update net instance, test=model

framework/e2e/PaddleLT_new/binary_search.py

@@ -62,6 +62,8 @@ def __init__(self, commit_list, title, layerfile, testing, perf_decay=None, test
         self.test_obj = test_obj
         self.py_cmd = os.environ.get("python_ver")
         self.testing_mode = os.environ.get("TESTING_MODE")
+        self.device_place_id = 0
+        self.timeout = 300
 
     def _status_print(self, exit_code, status_str):
         """
@@ -82,8 +84,8 @@ def _install_paddle(self, commit_id):
 
         whl_link = (
             "https://paddle-qa.bj.bcebos.com/paddle-pipe"
-            "line/Develop-GpuAll-LinuxCentos-Gcc82-Cuda112-Trtoff-Py38-Compile/{}/paddle"
-            "paddle_gpu-0.0.0-cp38-cp38-linux_x86_64.whl".format(commit_id)
+            "line/Develop-GpuSome-LinuxCentos-Gcc82-Cuda118-Cudnn86-Trt85-Py310-CINN-Compile/{}/paddle"
+            "paddle_gpu-0.0.0-cp310-cp310-linux_x86_64.whl".format(commit_id)
         )
         exit_code = os.system(f"{self.py_cmd} -m pip install {whl_link}")
         self._status_print(exit_code=exit_code, status_str="install paddlepaddle-gpu")
@@ -105,7 +107,8 @@ def _precision_debug(self, commit_id):
         exit_code = os.system(
             f"cp -r PaddleLT.py {self.title}.py && "
             f"{self.py_cmd} -m pytest {self.title}.py --title={self.title} "
-            f"--layerfile={self.layerfile} --testing={self.testing}"
+            f"--layerfile={self.layerfile} --testing={self.testing} "
+            f"--device_place_id={self.device_place_id} --timeout={self.timeout}"
         )
 
         if exit_code > 0:
@@ -168,8 +171,8 @@ def _commit_locate(self, commits):
     if not os.path.exists("paddle"):
         os.system("git clone -b develop http://github.com/paddlepaddle/paddle.git")
     os.chdir(os.path.join(cur_path, "paddle"))
-    start_commit = "f651ac5cf387c56488b52fcc6456a63e9eb73086"  # 成功commit
-    end_commit = "9d5f31687cce16a976256723a70df4550085d685"  # 失败commit
+    start_commit = "4ac66e4319740d65eb3b2a9e80b4a9f989083099"  # 成功commit
+    end_commit = "81dc24b20d9a016dd4e92e76d2849cc9e3d0f8c8"  # 失败commit
     commits = get_commits(start=start_commit, end=end_commit)
     save_pickle(data=commits, filename="candidate_commits.pickle")
     print("the candidate commits is {}".format(commits))
@@ -178,8 +181,8 @@ def _commit_locate(self, commits):
     final_commit = BinarySearch(
         commit_list=commits,
         title="PrecisionBS",
-        layerfile="./layercase/sublayer1000/Clas_cases/CSWinTransformer_CSWinTransformer_base_384/SIR_5.py",
-        testing="yaml/dy^dy2stcinn_eval.yml",
+        layerfile="./layercase/sublayer1000/Det_cases/ppyolo_ppyolo_r50vd_dcn_1x_coco/SIR_58.py",
+        testing="yaml/dy^dy2stcinn_train_inputspec.yml",
         perf_decay=None,  # ["dy2st_eval_cinn_perf", 0.042814, -0.3]
         test_obj=LayerTest,
     )._commit_locate(commits)

framework/e2e/PaddleLT_new/engine/paddle_eval.py

@@ -24,7 +24,7 @@ class LayerEval(object):
     """
 
     # def __init__(self, testing, layerfile, device_id):
-    def __init__(self, testing, layerfile, device_place_id):
+    def __init__(self, testing, layerfile, device_place_id, upstream_net):
         """
         初始化
         """
@@ -36,6 +36,8 @@ def __init__(self, testing, layerfile, device_place_id):
         # paddle.set_device("{}:{}".format(str(self.device), str(device_id)))
 
         self.testing = testing
+        self.upstream_net = upstream_net
+        self.return_net_instance = self.testing.get("return_net_instance", "False")
         self.model_dtype = self.testing.get("model_dtype")
         paddle.set_default_dtype(self.model_dtype)
 
@@ -53,7 +55,10 @@ def _net_input(self):
     def _net_instant(self):
         """get net"""
         reset(self.seed)
-        net = BuildLayer(layerfile=self.layerfile).get_layer()
+        if self.upstream_net:
+            net = self.upstream_net
+        else:
+            net = BuildLayer(layerfile=self.layerfile).get_layer()
         return net
 
     def _net_input_and_spec(self):
@@ -85,7 +90,10 @@ def dy_eval(self):
         net = self._net_instant()
         net.eval()
         logit = net(*self._net_input())
-        return {"logit": logit}
+        if self.return_net_instance == "True":
+            return {"res": {"logit": logit}, "net": net}
+        else:
+            return {"res": {"logit": logit}, "net": None}
 
     def dy2st_eval(self):
         """dy2st eval"""
@@ -94,7 +102,10 @@ def dy2st_eval(self):
         st_net = paddle.jit.to_static(net, full_graph=True)
         st_net.eval()
         logit = st_net(*data)
-        return {"logit": logit}
+        if self.return_net_instance == "True":
+            return {"res": {"logit": logit}, "net": st_net}
+        else:
+            return {"res": {"logit": logit}, "net": None}
 
     def dy2st_eval_inputspec(self):
         """dy2st eval"""
@@ -104,7 +115,10 @@ def dy2st_eval_inputspec(self):
         st_net = paddle.jit.to_static(net, full_graph=True, input_spec=input_spec)
         st_net.eval()
         logit = st_net(*data)
-        return {"logit": logit}
+        if self.return_net_instance == "True":
+            return {"res": {"logit": logit}, "net": st_net}
+        else:
+            return {"res": {"logit": logit}, "net": None}
 
     def dy2st_eval_static_inputspec(self):
         """dy2st eval"""
@@ -114,7 +128,10 @@ def dy2st_eval_static_inputspec(self):
         st_net = paddle.jit.to_static(net, full_graph=True, input_spec=input_spec)
         st_net.eval()
         logit = st_net(*data)
-        return {"logit": logit}
+        if self.return_net_instance == "True":
+            return {"res": {"logit": logit}, "net": st_net}
+        else:
+            return {"res": {"logit": logit}, "net": None}
 
     def dy2st_eval_cinn(self):
         """dy2st cinn eval"""
@@ -126,7 +143,10 @@ def dy2st_eval_cinn(self):
         cinn_net = paddle.jit.to_static(net, build_strategy=build_strategy, full_graph=True)
         cinn_net.eval()
         logit = cinn_net(*data)
-        return {"logit": logit}
+        if self.return_net_instance == "True":
+            return {"res": {"logit": logit}, "net": cinn_net}
+        else:
+            return {"res": {"logit": logit}, "net": None}
 
     def dy2st_eval_cinn_inputspec(self):
         """dy2st cinn eval with inputspec"""
@@ -139,7 +159,10 @@ def dy2st_eval_cinn_inputspec(self):
         cinn_net = paddle.jit.to_static(net, build_strategy=build_strategy, full_graph=True, input_spec=input_spec)
         cinn_net.eval()
         logit = cinn_net(*data)
-        return {"logit": logit}
+        if self.return_net_instance == "True":
+            return {"res": {"logit": logit}, "net": cinn_net}
+        else:
+            return {"res": {"logit": logit}, "net": None}
 
     def dy2st_eval_cinn_static_inputspec(self):
         """dy2st cinn eval with inputspec"""
@@ -152,7 +175,10 @@ def dy2st_eval_cinn_static_inputspec(self):
         cinn_net = paddle.jit.to_static(net, build_strategy=build_strategy, full_graph=True, input_spec=input_spec)
         cinn_net.eval()
         logit = cinn_net(*data)
-        return {"logit": logit}
+        if self.return_net_instance == "True":
+            return {"res": {"logit": logit}, "net": cinn_net}
+        else:
+            return {"res": {"logit": logit}, "net": None}
 
     # def dy2st_eval_cinn_inputspec_legacy_2(self):
     #     """dy2st cinn eval with inputspec"""

framework/e2e/PaddleLT_new/engine/paddle_eval_bm.py

@@ -24,7 +24,7 @@ class LayerEvalBM(object):
     """
 
     # def __init__(self, testing, layerfile, device_id):
-    def __init__(self, testing, layerfile, device_place_id):
+    def __init__(self, testing, layerfile, device_place_id, upstream_net):
         """
         初始化
         """
@@ -43,6 +43,8 @@ def __init__(self, testing, layerfile, device_place_id):
         self.statis_round = 6
 
         self.testing = testing
+        self.upstream_net = upstream_net
+        # self.return_net_instance = self.testing.get("return_net_instance", "False")
         self.model_dtype = self.testing.get("model_dtype")
         paddle.set_default_dtype(self.model_dtype)
 
@@ -53,7 +55,10 @@ def __init__(self, testing, layerfile, device_place_id):
     def _net_instant(self):
         """get net and data"""
         reset(self.seed)
-        net = BuildLayer(layerfile=self.layerfile).get_layer()
+        if self.upstream_net:
+            net = self.upstream_net
+        else:
+            net = BuildLayer(layerfile=self.layerfile).get_layer()
         return net
 
     def _set_cinn_flags(self):

framework/e2e/PaddleLT_new/engine/paddle_export.py

@@ -20,7 +20,7 @@ class LayerExport(object):
     构建Layer导出的通用类
     """
 
-    def __init__(self, testing, layerfile, device_place_id):
+    def __init__(self, testing, layerfile, device_place_id, upstream_net):
         """
         初始化
         """
@@ -30,6 +30,8 @@ def __init__(self, testing, layerfile, device_place_id):
         paddle.set_device(f"{self.device}:{device_place_id}")
 
         self.testing = testing
+        self.upstream_net = upstream_net
+        # self.return_net_instance = self.testing.get("return_net_instance", "False")
         self.model_dtype = self.testing.get("model_dtype")
         paddle.set_default_dtype(self.model_dtype)
 
@@ -48,7 +50,10 @@ def _net_input(self):
     def _net_instant(self):
         """get net"""
         reset(self.seed)
-        net = BuildLayer(layerfile=self.layerfile).get_layer()
+        if self.upstream_net:
+            net = self.upstream_net
+        else:
+            net = BuildLayer(layerfile=self.layerfile).get_layer()
         return net
 
     def _net_input_and_spec(self):
@@ -77,6 +82,7 @@ def jit_save(self):
 
         # paddle.jit.save(net, path=os.path.join(self.path, self.case))
         paddle.jit.save(st_net, path=os.path.join(self.path, self.layername, "jit_save"))
+        return {"res": None}
 
     def jit_save_inputspec(self):
         """jit.save(layer)"""
@@ -90,6 +96,7 @@ def jit_save_inputspec(self):
 
         # paddle.jit.save(net, path=os.path.join(self.path, self.case))
         paddle.jit.save(st_net, path=os.path.join(self.path, self.layername, "jit_save_inputspec"))
+        return {"res": None}
 
     def jit_save_static_inputspec(self):
         """jit.save(layer)"""
@@ -103,6 +110,7 @@ def jit_save_static_inputspec(self):
 
         # paddle.jit.save(net, path=os.path.join(self.path, self.case))
         paddle.jit.save(st_net, path=os.path.join(self.path, self.layername, "jit_save_static_inputspec"))
+        return {"res": None}
 
     def jit_save_cinn(self):
         """jit.save(layer)"""
@@ -117,6 +125,7 @@ def jit_save_cinn(self):
 
         # paddle.jit.save(net, path=os.path.join(self.path, self.case))
         paddle.jit.save(cinn_net, path=os.path.join(self.path, self.layername, "jit_save_cinn"))
+        return {"res": None}
 
     def jit_save_cinn_inputspec(self):
         """jit.save(layer)"""
@@ -132,6 +141,7 @@ def jit_save_cinn_inputspec(self):
 
         # paddle.jit.save(net, path=os.path.join(self.path, self.case))
         paddle.jit.save(cinn_net, path=os.path.join(self.path, self.layername, "jit_save_cinn_inputspec"))
+        return {"res": None}
 
     def jit_save_cinn_static_inputspec(self):
         """jit.save(layer)"""
@@ -147,3 +157,4 @@ def jit_save_cinn_static_inputspec(self):
 
         # paddle.jit.save(net, path=os.path.join(self.path, self.case))
         paddle.jit.save(cinn_net, path=os.path.join(self.path, self.layername, "jit_save_cinn_static_inputspec"))
+        return {"res": None}

framework/e2e/PaddleLT_new/engine/paddle_infer.py

@@ -14,13 +14,15 @@
 from generator.builder_layer import BuildLayer
 from generator.builder_data import BuildData
 
+from tools.logger import Logger
+
 
 class LayerInfer(object):
     """
     构建Layer预测的通用类
     """
 
-    def __init__(self, testing, layerfile, device_place_id):
+    def __init__(self, testing, layerfile, device_place_id, upstream_net):
         """
         初始化
         """
@@ -41,7 +43,8 @@ def paddle_infer_gpu(self):
         """infer load (layer)"""
         reset(self.seed)
         if not os.path.exists(self.path + ".pdiparams"):
-            return "pass"
+            Logger("paddle_infer_gpu").get_log().info("该子图export未产出pdiparams, 所以跳过infer测试")
+            return {"res": {"logit": None}}
 
         config = paddle_infer.Config(self.path + ".pdmodel", self.path + ".pdiparams")
         config.enable_use_gpu(1000, int(self.device_id))
@@ -63,13 +66,14 @@ def paddle_infer_gpu(self):
         else:
             output_handle = predictor.get_output_handle(output_names[0])
             infer_res = output_handle.copy_to_cpu()
-        return {"logit": infer_res}
+        return {"res": {"logit": infer_res}}
 
     def paddle_infer_cpu(self):
         """infer load (layer)"""
         reset(self.seed)
         if not os.path.exists(self.path + ".pdiparams"):
-            return "pass"
+            Logger("paddle_infer_cpu").get_log().info("该子图export未产出pdiparams, 所以跳过infer测试")
+            return {"res": {"logit": None}}
 
         config = paddle_infer.Config(self.path + ".pdmodel", self.path + ".pdiparams")
 
@@ -92,13 +96,14 @@ def paddle_infer_cpu(self):
         else:
             output_handle = predictor.get_output_handle(output_names[0])
             infer_res = output_handle.copy_to_cpu()
-        return {"logit": infer_res}
+        return {"res": {"logit": infer_res}}
 
     def paddle_infer_mkldnn(self):
         """infer load (layer)"""
         reset(self.seed)
         if not os.path.exists(self.path + ".pdiparams"):
-            return "pass"
+            Logger("paddle_infer_mkldnn").get_log().info("该子图export未产出pdiparams, 所以跳过infer测试")
+            return {"res": {"logit": None}}
 
         config = paddle_infer.Config(self.path + ".pdmodel", self.path + ".pdiparams")
 
@@ -123,13 +128,14 @@ def paddle_infer_mkldnn(self):
         else:
             output_handle = predictor.get_output_handle(output_names[0])
             infer_res = output_handle.copy_to_cpu()
-        return {"logit": infer_res}
+        return {"res": {"logit": infer_res}}
 
     def paddle_infer_ort(self):
         """infer load (layer)"""
         reset(self.seed)
         if not os.path.exists(self.path + ".pdiparams"):
-            return "pass"
+            Logger("paddle_infer_ort").get_log().info("该子图export未产出pdiparams, 所以跳过infer测试")
+            return {"res": {"logit": None}}
 
         config = paddle_infer.Config(self.path + ".pdmodel", self.path + ".pdiparams")
 
@@ -153,13 +159,14 @@ def paddle_infer_ort(self):
         else:
             output_handle = predictor.get_output_handle(output_names[0])
             infer_res = output_handle.copy_to_cpu()
-        return {"logit": infer_res}
+        return {"res": {"logit": infer_res}}
 
     def paddle_infer_new_exc_pir(self):
         """infer load (layer)"""
         reset(self.seed)
         if not os.path.exists(self.path + ".pdiparams"):
-            return "pass"
+            Logger("paddle_infer_new_exc_pir").get_log().info("该子图export未产出pdiparams, 所以跳过infer测试")
+            return {"res": {"logit": None}}
 
         config = paddle_infer.Config(self.path + ".json", self.path + ".pdiparams")
         # config = paddle_infer.Config(self.path, 'inference')
@@ -186,4 +193,4 @@ def paddle_infer_new_exc_pir(self):
         else:
             output_handle = predictor.get_output_handle(output_names[0])
             infer_res = output_handle.copy_to_cpu()
-        return {"logit": infer_res}
+        return {"res": {"logit": infer_res}}