Skip to content

Commit 2efbb50

Browse files
co63occo63oc
committed
Fix
1 parent ad1a1b1 commit 2efbb50

File tree

6 files changed

+1
-253
lines changed

6 files changed

+1
-253
lines changed

‎paddle/fluid/operators/collective/c_allreduce_max_op.cc

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,3 @@ REGISTER_OP_WITHOUT_GRADIENT(c_allreduce_max,
4242
ops::CAllReduceOp,
4343
ops::CAllReduceMaxOpMaker,
4444
ops::AllreduceMaxInplaceInferer)
45-
PD_REGISTER_STRUCT_KERNEL(c_allreduce_max,
46-
CPU,
47-
ALL_LAYOUT,
48-
ops::CAllReduceMaxCPUKernel,
49-
float,
50-
double,
51-
int,
52-
int64_t,
53-
phi::dtype::float16) {}

‎paddle/fluid/operators/collective/c_allreduce_max_op.cu.cc

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎test/auto_parallel/test_semi_auto_parallel_single_strategy.py

Lines changed: 0 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -12,103 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
import tempfile
1615
import unittest
1716

18-
import collective.test_communication_api_base as test_base
19-
20-
21-
class TestSemiAutoParallelInSingleStrategy(test_base.CommunicationTestDistBase):
22-
def setUp(self):
23-
super().setUp(
24-
num_of_devices=2,
25-
timeout=120,
26-
)
27-
self._default_envs = {
28-
"dtype": "float32",
29-
"seed": "2023",
30-
}
31-
self._changeable_envs = {"backend": ["cpu", "gpu"]}
32-
33-
def test_simple_net_single_strategy(self):
34-
envs_list = test_base.gen_product_envs_list(
35-
self._default_envs, self._changeable_envs
36-
)
37-
for envs in envs_list:
38-
self.run_test_case(
39-
"semi_auto_parallel_simple_net.py",
40-
user_defined_envs=envs,
41-
)
42-
43-
def test_simple_net_single_strategy_with_amp(self):
44-
changeable_envs = {
45-
"backend": ["gpu"],
46-
"use_master_grad": ["1", "0"],
47-
"dtype": ["bfloat16", "float16"],
48-
"seed": ["2023"],
49-
"use_adam": ["0"],
50-
}
51-
envs_list = test_base.gen_product_envs_list({}, changeable_envs)
52-
for envs in envs_list:
53-
self.run_test_case(
54-
"semi_auto_parallel_simple_net_amp.py",
55-
user_defined_envs=envs,
56-
)
57-
58-
def test_simple_net_single_strategy_with_gradient_merge(self):
59-
self._changeable_envs = {"backend": ["gpu"]}
60-
envs_list = test_base.gen_product_envs_list(
61-
self._default_envs, self._changeable_envs
62-
)
63-
for envs in envs_list:
64-
self.run_test_case(
65-
"semi_auto_parallel_simple_net_gradient_merge.py",
66-
user_defined_envs=envs,
67-
)
68-
69-
def test_simple_net_recompute(self):
70-
envs_list = test_base.gen_product_envs_list(
71-
self._default_envs, self._changeable_envs
72-
)
73-
for envs in envs_list:
74-
self.run_test_case(
75-
"semi_auto_parallel_simple_net_recompute.py",
76-
user_defined_envs=envs,
77-
)
78-
79-
def test_shard_optimizer(self):
80-
envs_list = test_base.gen_product_envs_list(
81-
self._default_envs, self._changeable_envs
82-
)
83-
for envs in envs_list:
84-
self.run_test_case(
85-
"semi_auto_parallel_shard_optimizer.py",
86-
user_defined_envs=envs,
87-
)
88-
89-
def test_shard_optimizer_api(self):
90-
envs_list = test_base.gen_product_envs_list(
91-
self._default_envs, self._changeable_envs
92-
)
93-
for envs in envs_list:
94-
ckpt_path = tempfile.TemporaryDirectory()
95-
envs["ckpt_path"] = ckpt_path.name
96-
self.run_test_case(
97-
"semi_auto_parallel_shard_optimizer_api.py",
98-
user_defined_envs=envs,
99-
)
100-
ckpt_path.cleanup()
101-
102-
def test_set_value(self):
103-
envs_list = test_base.gen_product_envs_list(
104-
self._default_envs, self._changeable_envs
105-
)
106-
for envs in envs_list:
107-
self.run_test_case(
108-
"semi_auto_parallel_set_value.py",
109-
user_defined_envs=envs,
110-
)
111-
112-
11317
if __name__ == "__main__":
11418
unittest.main()

‎test/deprecated/auto_parallel/test_gpt_with_prim_deprecated.py

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -12,43 +12,8 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
import os
16-
import subprocess
17-
import sys
18-
import tempfile
19-
import unittest
20-
21-
22-
class TestGPTPrim(unittest.TestCase):
23-
def test_gpt_prim(self):
24-
file_dir = os.path.dirname(os.path.abspath(__file__))
25-
launch_model_path = os.path.join(file_dir, "gpt_with_prim.py")
26-
27-
if os.environ.get("WITH_COVERAGE", "OFF") == "ON":
28-
coverage_args = ["-m", "coverage", "run", "--branch", "-p"]
29-
else:
30-
coverage_args = []
31-
32-
tmp_dir = tempfile.TemporaryDirectory()
33-
cmd = [
34-
sys.executable,
35-
"-u",
36-
*coverage_args,
37-
"-m",
38-
"paddle.distributed.launch",
39-
"--devices",
40-
"0,1",
41-
"--log_dir",
42-
tmp_dir.name,
43-
launch_model_path,
44-
]
45-
46-
process = subprocess.Popen(cmd)
47-
process.wait()
48-
self.assertEqual(process.returncode, 0)
49-
50-
tmp_dir.cleanup()
5115

16+
import unittest
5217

5318
if __name__ == "__main__":
5419
unittest.main()

‎test/deprecated/auto_parallel/test_pass_amp_deprecated.py

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -12,43 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
import os
16-
import subprocess
17-
import sys
18-
import tempfile
1915
import unittest
2016

21-
22-
class TestAMPPass(unittest.TestCase):
23-
def test_mp2(self):
24-
file_dir = os.path.dirname(os.path.abspath(__file__))
25-
launch_model_path = os.path.join(file_dir, "amp_pass_unittest.py")
26-
27-
if os.environ.get("WITH_COVERAGE", "OFF") == "ON":
28-
coverage_args = ["-m", "coverage", "run", "--branch", "-p"]
29-
else:
30-
coverage_args = []
31-
32-
tmp_dir = tempfile.TemporaryDirectory()
33-
cmd = [
34-
sys.executable,
35-
"-u",
36-
*coverage_args,
37-
"-m",
38-
"paddle.distributed.launch",
39-
"--devices",
40-
"0,1",
41-
"--log_dir",
42-
tmp_dir.name,
43-
launch_model_path,
44-
]
45-
46-
process = subprocess.Popen(cmd)
47-
process.wait()
48-
self.assertEqual(process.returncode, 0)
49-
50-
tmp_dir.cleanup()
51-
52-
5317
if __name__ == "__main__":
5418
unittest.main()

‎test/deprecated/auto_parallel/test_pass_quantization_deprecated.py

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,45 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
import os
16-
import subprocess
17-
import sys
18-
import tempfile
1915
import unittest
2016

21-
22-
class TestQuantizationPass(unittest.TestCase):
23-
def test_mp2(self):
24-
file_dir = os.path.dirname(os.path.abspath(__file__))
25-
launch_model_path = os.path.join(
26-
file_dir, "quantization_pass_unittest.py"
27-
)
28-
29-
if os.environ.get("WITH_COVERAGE", "OFF") == "ON":
30-
coverage_args = ["-m", "coverage", "run", "--branch", "-p"]
31-
else:
32-
coverage_args = []
33-
34-
tmp_dir = tempfile.TemporaryDirectory()
35-
cmd = [
36-
sys.executable,
37-
"-u",
38-
*coverage_args,
39-
"-m",
40-
"paddle.distributed.launch",
41-
"--devices",
42-
"0,1",
43-
"--log_dir",
44-
tmp_dir.name,
45-
launch_model_path,
46-
]
47-
48-
process = subprocess.Popen(cmd)
49-
process.wait()
50-
self.assertEqual(process.returncode, 0)
51-
52-
tmp_dir.cleanup()
53-
54-
5517
if __name__ == "__main__":
5618
unittest.main()

0 commit comments

Comments
 (0)