From fa2e7dc2e53607886200c32a85eccd4a94f94264 Mon Sep 17 00:00:00 2001 From: Qi Li Date: Wed, 8 Jun 2022 11:25:03 +0800 Subject: [PATCH] Revert "fix unit test temp file, test=develop (#43155)" This reverts commit 5a6c974ee4886eaa982d2db7d6db2edb7ed6b832. --- .../fluid/tests/unittests/ipu/test_weight_decay_ipu.py | 6 +----- python/paddle/fluid/tests/unittests/test_load_op_xpu.py | 8 ++------ 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/python/paddle/fluid/tests/unittests/ipu/test_weight_decay_ipu.py b/python/paddle/fluid/tests/unittests/ipu/test_weight_decay_ipu.py index 627a8fedff6..630a00f5a7d 100644 --- a/python/paddle/fluid/tests/unittests/ipu/test_weight_decay_ipu.py +++ b/python/paddle/fluid/tests/unittests/ipu/test_weight_decay_ipu.py @@ -14,9 +14,7 @@ import unittest -import os import numpy as np -import tempfile import paddle import paddle.static from paddle.fluid.tests.unittests.ipu.op_test_ipu import IPUOpTest @@ -32,8 +30,6 @@ class TestBase(IPUOpTest): self.set_data_feed() self.set_feed_attr() self.set_attrs() - self.temp_dir = tempfile.TemporaryDirectory() - self.model_path = os.path.join(self.temp_dir.name, "weight_decay") def set_atol(self): self.atol = 1e-6 @@ -92,7 +88,7 @@ class TestBase(IPUOpTest): place = paddle.CPUPlace() exe = paddle.static.Executor(place) exe.run(startup_prog) - paddle.static.save(main_prog, self.model_path) + paddle.static.save(main_prog, "weight_decay") if run_ipu: feed_list = [image.name] diff --git a/python/paddle/fluid/tests/unittests/test_load_op_xpu.py b/python/paddle/fluid/tests/unittests/test_load_op_xpu.py index f11c39b7b65..f3c8024a21a 100644 --- a/python/paddle/fluid/tests/unittests/test_load_op_xpu.py +++ b/python/paddle/fluid/tests/unittests/test_load_op_xpu.py @@ -16,8 +16,6 @@ from __future__ import print_function import unittest import numpy as np -import os -import tempfile from op_test import OpTest, randomize_probability import paddle.fluid as fluid import paddle.fluid.layers as layers @@ -31,8 +29,6 @@ class TestLoadOpXpu(unittest.TestCase): """ def setUp(self): - self.temp_dir = tempfile.TemporaryDirectory() - self.model_path = os.path.join(self.temp_dir.name, "model") self.ones = np.ones((4, 4)).astype('float32') main_prog = fluid.Program() start_prog = fluid.Program() @@ -48,7 +44,7 @@ class TestLoadOpXpu(unittest.TestCase): exe = fluid.Executor(fluid.XPUPlace(0)) exe.run(start_prog) fluid.io.save_persistables(exe, - dirname=self.model_path, + dirname="./model", main_program=main_prog) def test_load_xpu(self): @@ -56,7 +52,7 @@ class TestLoadOpXpu(unittest.TestCase): start_prog = fluid.Program() with fluid.program_guard(main_prog, start_prog): var = layers.create_tensor(dtype='float32') - layers.load(var, file_path=self.model_path + '/w') + layers.load(var, file_path='./model/w') exe = fluid.Executor(fluid.XPUPlace(0)) exe.run(start_prog) -- GitLab