diff --git a/test/custom_runtime/CMakeLists.txt b/test/custom_runtime/CMakeLists.txt index e8b14445278be..cf11b5555c386 100644 --- a/test/custom_runtime/CMakeLists.txt +++ b/test/custom_runtime/CMakeLists.txt @@ -1,6 +1,6 @@ if(WITH_CUSTOM_DEVICE AND NOT WITH_GPU) set(PLUGIN_URL https://github.com/PaddlePaddle/PaddleCustomDevice.git) - set(PLUGIN_TAG develop) + set(PLUGIN_TAG release/2.6) file( GLOB TEST_OPS diff --git a/test/custom_runtime/test_collective_process_group_xccl.py b/test/custom_runtime/test_collective_process_group_xccl.py index 4d007d726273b..060d76de19664 100644 --- a/test/custom_runtime/test_collective_process_group_xccl.py +++ b/test/custom_runtime/test_collective_process_group_xccl.py @@ -150,7 +150,7 @@ def setUp(self): cur_dir = os.path.dirname(os.path.abspath(__file__)) self.temp_dir = tempfile.TemporaryDirectory() cmd = 'cd {} \ - && git clone --depth 1 {} \ + && git clone --depth 1 {} -b {} \ && cd PaddleCustomDevice \ && git fetch origin \ && git checkout {} -b dev \ @@ -159,6 +159,7 @@ def setUp(self): self.temp_dir.name, os.getenv('PLUGIN_URL'), os.getenv('PLUGIN_TAG'), + os.getenv('PLUGIN_TAG'), sys.executable, ) os.system(cmd) diff --git a/test/custom_runtime/test_custom_cpu_plugin.py b/test/custom_runtime/test_custom_cpu_plugin.py index b92df8def9dd3..5478b7ecfad64 100755 --- a/test/custom_runtime/test_custom_cpu_plugin.py +++ b/test/custom_runtime/test_custom_cpu_plugin.py @@ -26,7 +26,7 @@ def setUp(self): cur_dir = os.path.dirname(os.path.abspath(__file__)) self.temp_dir = tempfile.TemporaryDirectory() cmd = 'cd {} \ - && git clone --depth 1 {} \ + && git clone --depth 1 {} -b {} \ && cd PaddleCustomDevice \ && git fetch origin \ && git checkout {} -b dev \ @@ -35,6 +35,7 @@ def setUp(self): self.temp_dir.name, os.getenv('PLUGIN_URL'), os.getenv('PLUGIN_TAG'), + os.getenv('PLUGIN_TAG'), sys.executable, ) os.system(cmd) diff --git a/test/custom_runtime/test_custom_cpu_profiler_plugin.py b/test/custom_runtime/test_custom_cpu_profiler_plugin.py index 220c9a0a21aeb..aeebec9e342c3 100644 --- a/test/custom_runtime/test_custom_cpu_profiler_plugin.py +++ b/test/custom_runtime/test_custom_cpu_profiler_plugin.py @@ -24,7 +24,7 @@ def setUp(self): cur_dir = os.path.dirname(os.path.abspath(__file__)) self.temp_dir = tempfile.TemporaryDirectory() cmd = 'cd {} \ - && git clone --depth 1 {} \ + && git clone --depth 1 {} -b {} \ && cd PaddleCustomDevice \ && git fetch origin \ && git checkout {} -b dev \ @@ -33,6 +33,7 @@ def setUp(self): self.temp_dir.name, os.getenv('PLUGIN_URL'), os.getenv('PLUGIN_TAG'), + os.getenv('PLUGIN_TAG'), sys.executable, ) os.system(cmd) diff --git a/test/custom_runtime/test_custom_cpu_to_static.py b/test/custom_runtime/test_custom_cpu_to_static.py index 60ba27004afbd..55181cc017440 100644 --- a/test/custom_runtime/test_custom_cpu_to_static.py +++ b/test/custom_runtime/test_custom_cpu_to_static.py @@ -106,7 +106,7 @@ def setUp(self): cur_dir = os.path.dirname(os.path.abspath(__file__)) self.temp_dir = tempfile.TemporaryDirectory() cmd = 'cd {} \ - && git clone --depth 1 {} \ + && git clone --depth 1 {} -b {} \ && cd PaddleCustomDevice \ && git fetch origin \ && git checkout {} -b dev \ @@ -115,6 +115,7 @@ def setUp(self): self.temp_dir.name, os.getenv('PLUGIN_URL'), os.getenv('PLUGIN_TAG'), + os.getenv('PLUGIN_TAG'), sys.executable, ) os.system(cmd) diff --git a/test/custom_runtime/test_custom_op_setup.py b/test/custom_runtime/test_custom_op_setup.py index 47c7d9821d6b8..2086b3ac6f2ed 100644 --- a/test/custom_runtime/test_custom_op_setup.py +++ b/test/custom_runtime/test_custom_op_setup.py @@ -104,7 +104,7 @@ def setUp(self): self.cur_dir = os.path.dirname(os.path.abspath(__file__)) self.temp_dir = tempfile.TemporaryDirectory() cmd = 'cd {} \ - && git clone --depth 1 {} \ + && git clone --depth 1 {} -b {} \ && cd PaddleCustomDevice \ && git fetch origin \ && git checkout {} -b dev \ @@ -114,6 +114,7 @@ def setUp(self): self.temp_dir.name, os.getenv('PLUGIN_URL'), os.getenv('PLUGIN_TAG'), + os.getenv('PLUGIN_TAG'), sys.executable, self.cur_dir, ) diff --git a/test/custom_runtime/test_fleet_launch_custom_device.sh b/test/custom_runtime/test_fleet_launch_custom_device.sh index cc85155846239..5cbb3a11d1422 100644 --- a/test/custom_runtime/test_fleet_launch_custom_device.sh +++ b/test/custom_runtime/test_fleet_launch_custom_device.sh @@ -18,7 +18,7 @@ set -e temp_dir=$(mktemp --directory) pushd ${temp_dir} \ -&& git clone --depth 1 ${PLUGIN_URL} \ +&& git clone --depth 1 ${PLUGIN_URL} -b ${PLUGIN_TAG} \ && pushd PaddleCustomDevice/ \ && git fetch origin \ && git checkout ${PLUGIN_TAG} -b dev \