Skip to content
This repository was archived by the owner on Jan 24, 2024. It is now read-only.

Commit 423fd0e

Browse files
committed
change project name
1 parent 8875a00 commit 423fd0e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+104
-96
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ __pycache__
22
*.sw*
33
user_tag
44
build/
5-
symbolic_trace.egg-info/
5+
symbolic_opcode_translator.egg-info/
66

77
# Editor config
88
.vscode

CONTRIBUTING.md

Lines changed: 10 additions & 14 deletions

examples/graph_break.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import numpy as np
22

33
import paddle
4-
from symbolic_trace.trace import symbolic_trace
4+
from symbolic_opcode_translator.translate import symbolic_translate
55

66

77
def foo(cond: paddle.Tensor, x: paddle.Tensor):
@@ -17,11 +17,13 @@ def main():
1717
cond = paddle.to_tensor(True)
1818
x = paddle.to_tensor(0)
1919
dygraph_out = foo(cond, x)
20-
symbolic_trace_out = symbolic_trace(foo)(cond, x)
20+
symbolic_translate_out = symbolic_translate(foo)(cond, x)
2121

2222
print("dygraph_out:", dygraph_out)
23-
print("symbolic_trace_out:", symbolic_trace_out)
24-
np.testing.assert_allclose(dygraph_out.numpy(), symbolic_trace_out.numpy())
23+
print("symbolic_translate_out:", symbolic_translate_out)
24+
np.testing.assert_allclose(
25+
dygraph_out.numpy(), symbolic_translate_out.numpy()
26+
)
2527

2628

2729
if __name__ == '__main__':

examples/guard.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import paddle
2-
from symbolic_trace.trace import symbolic_trace
2+
from symbolic_opcode_translator.translate import symbolic_translate
33

44

55
def foo(x: paddle.Tensor, y: paddle.Tensor, z: paddle.Tensor):
@@ -14,12 +14,12 @@ def main():
1414
c = paddle.rand([4])
1515
d = paddle.rand([5, 6])
1616
e = paddle.rand([])
17-
sym_foo = symbolic_trace(foo)
17+
sym_foo = symbolic_translate(foo)
1818
dygraph_out = foo(a, b, c)
19-
symbolic_trace_out = sym_foo(a, b, c)
19+
symbolic_translate_out = sym_foo(a, b, c)
2020

2121
print("dygraph_out:", dygraph_out)
22-
print("symbolic_trace_out:", symbolic_trace_out)
22+
print("symbolic_translate_out:", symbolic_translate_out)
2323

2424
# cache hit
2525
sym_foo(a, b, d)

examples/trace_basic.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import numpy as np
22

33
import paddle
4-
from symbolic_trace.trace import symbolic_trace
4+
from symbolic_opcode_translator.translate import symbolic_translate
55

66

77
def foo(x: paddle.Tensor, y: paddle.Tensor):
@@ -13,11 +13,13 @@ def main():
1313
x = paddle.rand([2, 3])
1414
y = paddle.rand([2, 3])
1515
dygraph_out = foo(x, y)
16-
symbolic_trace_out = symbolic_trace(foo)(x, y)
16+
symbolic_translate_out = symbolic_translate(foo)(x, y)
1717

1818
print("dygraph_out:", dygraph_out)
19-
print("symbolic_trace_out:", symbolic_trace_out)
20-
np.testing.assert_allclose(dygraph_out.numpy(), symbolic_trace_out.numpy())
19+
print("symbolic_translate_out:", symbolic_translate_out)
20+
np.testing.assert_allclose(
21+
dygraph_out.numpy(), symbolic_translate_out.numpy()
22+
)
2123

2224

2325
if __name__ == '__main__':

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ skip-string-normalization = true
55
[tool.isort]
66
profile = "black"
77
line_length = 80
8-
known_first_party = ["paddle", "symbolic_trace"]
8+
known_first_party = ["paddle", "symbolic_translate"]
99

1010
[tool.ruff]
1111
target-version = "py37"
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
from .translate import symbolic_translate
2+
3+
__all__ = [
4+
"symbolic_translate",
5+
]

symbolic_trace/opcode_translator/executor/opcode_executor.py renamed to symbolic_opcode_translator/opcode_translator/executor/opcode_executor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ def step(self, instr):
292292
)
293293
log(
294294
3,
295-
f"[Trace {self._name}]: {instr.opname} {instr.argval}, stack is {self._stack}\n",
295+
f"[Translate {self._name}]: {instr.opname} {instr.argval}, stack is {self._stack}\n",
296296
)
297297
return getattr(self, instr.opname)(instr) # run single step.
298298

symbolic_trace/opcode_translator/skip_files.py renamed to symbolic_opcode_translator/opcode_translator/skip_files.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,12 @@ def _module_dir(m: types.ModuleType):
9191
}
9292

9393

94-
symbolic_trace_path = os.path.dirname(__file__).rpartition("/")[0] + "/"
94+
symbolic_opcode_translator_path = (
95+
os.path.dirname(__file__).rpartition("/")[0] + "/"
96+
)
9597
paddle_path = sys.modules["paddle"].__file__.rpartition("/")[0] + "/"
9698

97-
skip_file_names.add(symbolic_trace_path)
99+
skip_file_names.add(symbolic_opcode_translator_path)
98100
skip_file_names.add(paddle_path)
99101
skip_file_names.add(
100102
"<frozen importlib",

symbolic_trace/trace.py renamed to symbolic_opcode_translator/translate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from .opcode_translator import eval_frame_callback
44

55

6-
def symbolic_trace(func):
6+
def symbolic_translate(func):
77
def impl(*args, **kwargs):
88
paddle.fluid.core.set_eval_frame(eval_frame_callback)
99
try:

symbolic_trace/__init__.py

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

tests/test_09_f_string.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from test_case_base import TestCaseBase
88

99
import paddle
10-
from symbolic_trace.utils import ASSERT
10+
from symbolic_opcode_translator.utils import ASSERT
1111

1212

1313
def foo(x: paddle.Tensor):

tests/test_12_for_loop.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from test_case_base import TestCaseBase
1010

1111
import paddle
12-
from symbolic_trace import symbolic_trace
12+
from symbolic_opcode_translator import symbolic_translate
1313

1414

1515
def gener():
@@ -113,26 +113,26 @@ def test_dict(self):
113113
def test_fallback(self):
114114
a = paddle.to_tensor(1)
115115

116-
sym_output = symbolic_trace(for_iter)(a, gener())
116+
sym_output = symbolic_translate(for_iter)(a, gener())
117117
paddle_output = for_iter(a, gener())
118118
self.assert_nest_match(sym_output, paddle_output)
119119

120120
def test_for_for_fallback(self):
121121
a = paddle.to_tensor(1)
122122

123-
sym_output = symbolic_trace(for_iter)(a, gener())
123+
sym_output = symbolic_translate(for_iter)(a, gener())
124124
paddle_output = for_iter(a, gener())
125125
self.assert_nest_match(sym_output, paddle_output)
126126

127127
def test_for_break(self):
128128
a = paddle.to_tensor(1)
129-
sym_output = symbolic_trace(for_break)(a, gener())
129+
sym_output = symbolic_translate(for_break)(a, gener())
130130
paddle_output = for_break(a, gener())
131131
self.assert_nest_match(sym_output, paddle_output)
132132

133133
def test_for_continue(self):
134134
a = paddle.to_tensor(1)
135-
sym_output = symbolic_trace(for_continue)(a, gener())
135+
sym_output = symbolic_translate(for_continue)(a, gener())
136136
paddle_output = for_continue(a, gener())
137137
self.assert_nest_match(sym_output, paddle_output)
138138

tests/test_analysis_inputs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import unittest
33

44
import paddle
5-
from symbolic_trace.opcode_translator.instruction_utils import (
5+
from symbolic_opcode_translator.opcode_translator.instruction_utils import (
66
analysis_inputs,
77
calc_offset_from_bytecode_offset,
88
get_instructions,

tests/test_break_graph.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
from test_case_base import TestCaseBase
44

55
import paddle
6-
from symbolic_trace.utils.paddle_api_config import add_break_graph_apis
6+
from symbolic_opcode_translator.utils.paddle_api_config import (
7+
add_break_graph_apis,
8+
)
79

810

911
def ifelse_func(x, y):

tests/test_case_base.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import numpy as np
55

66
import paddle
7-
from symbolic_trace import symbolic_trace
8-
from symbolic_trace.opcode_translator.executor.opcode_executor import (
7+
from symbolic_opcode_translator import symbolic_translate
8+
from symbolic_opcode_translator.opcode_translator.executor.opcode_executor import (
99
InstructionTranslatorCache,
1010
)
1111

@@ -48,6 +48,6 @@ def assert_nest_match(self, x, y):
4848
self.assertEqual(x, y)
4949

5050
def assert_results(self, func, *inputs):
51-
sym_output = symbolic_trace(func)(*inputs)
51+
sym_output = symbolic_translate(func)(*inputs)
5252
paddle_output = func(*inputs)
5353
self.assert_nest_match(sym_output, paddle_output)

tests/test_instruction_translator_cache.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
from test_case_base import test_instruction_translator_cache_context
99

10-
from symbolic_trace.opcode_translator.executor.opcode_executor import (
10+
from symbolic_opcode_translator.opcode_translator.executor.opcode_executor import (
1111
InstructionTranslatorCache,
1212
)
1313

@@ -80,7 +80,7 @@ def reset(self):
8080
InstructionTranslatorCache().clear()
8181

8282
@patch(
83-
"symbolic_trace.opcode_translator.executor.opcode_executor.start_translate",
83+
"symbolic_opcode_translator.opcode_translator.executor.opcode_executor.start_translate",
8484
mock_start_translate,
8585
)
8686
def test_cache_hit(self):
@@ -96,7 +96,7 @@ def test_cache_hit(self):
9696
self.assertEqual(ctx.translate_count, 1)
9797

9898
@patch(
99-
"symbolic_trace.opcode_translator.executor.opcode_executor.start_translate",
99+
"symbolic_opcode_translator.opcode_translator.executor.opcode_executor.start_translate",
100100
mock_start_translate,
101101
)
102102
def test_cache_miss_due_to_unknown_code(self):
@@ -112,7 +112,7 @@ def test_cache_miss_due_to_unknown_code(self):
112112
self.assertEqual(ctx.translate_count, 2)
113113

114114
@patch(
115-
"symbolic_trace.opcode_translator.executor.opcode_executor.start_translate",
115+
"symbolic_opcode_translator.opcode_translator.executor.opcode_executor.start_translate",
116116
mock_start_translate,
117117
)
118118
def test_cache_miss_due_to_check_failed(self):
@@ -128,7 +128,7 @@ def test_cache_miss_due_to_check_failed(self):
128128
self.assertEqual(ctx.translate_count, 2)
129129

130130
@patch(
131-
"symbolic_trace.opcode_translator.executor.opcode_executor.start_translate",
131+
"symbolic_opcode_translator.opcode_translator.executor.opcode_executor.start_translate",
132132
mock_start_translate,
133133
)
134134
def test_skip_frame(self):

tests/test_resnet50_backward.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010

1111
import paddle
1212
from paddle.vision import resnet50
13-
from symbolic_trace import symbolic_trace
14-
from symbolic_trace.utils.utils import execute_time
13+
from symbolic_opcode_translator import symbolic_translate
14+
from symbolic_opcode_translator.utils.utils import execute_time
1515

1616

1717
def resnet_call(net: paddle.nn.Layer, x: paddle.Tensor):
@@ -41,7 +41,7 @@ def run_symbolic_optimizer(inp):
4141
np.random.seed(2021)
4242
random.seed(2021)
4343
net = resnet50()
44-
net_wrapper = symbolic_trace(resnet_call)
44+
net_wrapper = symbolic_translate(resnet_call)
4545
optimizer = paddle.optimizer.SGD(
4646
learning_rate=0.03, parameters=net.parameters()
4747
)
@@ -78,7 +78,7 @@ def test(self):
7878
np.random.seed(2021)
7979
random.seed(2021)
8080
inp = paddle.rand((3, 3, 255, 255))
81-
print("Start Run SymbolicTrace:")
81+
print("Start Run SymbolicTranslate:")
8282
out2 = run_symbolic_optimizer(inp)[0].numpy()
8383
print("Start Run Dygraph:")
8484
out1 = run_dygraph_optimizer(inp)[0].numpy()

tests/test_sir_rollback.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,15 @@
66
from test_case_base import TestCaseBase
77

88
import paddle
9-
from symbolic_trace.opcode_translator.executor.function_graph import (
9+
from symbolic_opcode_translator.opcode_translator.executor.function_graph import (
1010
FunctionGraph,
1111
)
12-
from symbolic_trace.opcode_translator.executor.tracker import DummyTracker
13-
from symbolic_trace.opcode_translator.executor.variables import VariableFactory
12+
from symbolic_opcode_translator.opcode_translator.executor.tracker import (
13+
DummyTracker,
14+
)
15+
from symbolic_opcode_translator.opcode_translator.executor.variables import (
16+
VariableFactory,
17+
)
1418

1519

1620
def compute(x, y):

tests/tests_legacy/error_test_resnet_with_trace_cache.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
import paddle
1313
from paddle.vision import resnet50
14-
from symbolic_trace import symbolic_trace
15-
from symbolic_trace.symbolic.compile_cache import CompileSIRCache
16-
from symbolic_trace.trace_cache_entrance import trace_cache
17-
from symbolic_trace.utils.utils import execute_time
14+
from symbolic_opcode_translator import symbolic_translate
15+
from symbolic_opcode_translator.symbolic.compile_cache import CompileSIRCache
16+
from symbolic_opcode_translator.trace_cache_entrance import trace_cache
17+
from symbolic_opcode_translator.utils.utils import execute_time
1818

1919

2020
@trace_cache
@@ -43,7 +43,7 @@ def run_dygraph_optimizer(inp, to_static):
4343
net = resnet50()
4444
if to_static:
4545
net.forward = MethodType(forward_with_cache, net)
46-
net.forward = symbolic_trace(net.forward)
46+
net.forward = symbolic_translate(net.forward)
4747
# net = paddle.jit.to_static(net)
4848
optimizer = paddle.optimizer.SGD(
4949
learning_rate=0.03, parameters=net.parameters()

0 commit comments

Comments
 (0)