Skip to content

Commit 9f0d9df

Browse files
authored
hide variable API (#12307)
* hide variable API * edit API.spec
1 parent 19639e3 commit 9f0d9df

File tree

7 files changed

+7
-16
lines changed

7 files changed

+7
-16
lines changed

paddle/fluid/API.spec

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
paddle.fluid.Variable.__init__ ArgSpec(args=['self', 'block', 'type', 'name', 'shape', 'dtype', 'lod_level', 'capacity', 'persistable', 'error_clip', 'stop_gradient', 'is_data'], varargs=None, keywords='kwargs', defaults=(VarType.LOD_TENSOR, None, None, None, None, None, None, None, False, False))
2-
paddle.fluid.Variable.astype ArgSpec(args=['self', 'dtype'], varargs=None, keywords=None, defaults=None)
3-
paddle.fluid.Variable.set_desc ArgSpec(args=['self', 'input'], varargs=None, keywords=None, defaults=None)
4-
paddle.fluid.Variable.set_error_clip ArgSpec(args=['self', 'error_clip'], varargs=None, keywords=None, defaults=None)
5-
paddle.fluid.Variable.to_string ArgSpec(args=['self', 'throw_on_error', 'with_details'], varargs=None, keywords=None, defaults=(False,))
61
paddle.fluid.Program.__init__ ArgSpec(args=['self'], varargs=None, keywords=None, defaults=None)
72
paddle.fluid.Program.block ArgSpec(args=['self', 'index'], varargs=None, keywords=None, defaults=None)
83
paddle.fluid.Program.clone ArgSpec(args=['self', 'for_test'], varargs=None, keywords=None, defaults=(False,))
@@ -33,8 +28,6 @@ paddle.fluid.Operator.set_attr ArgSpec(args=['self', 'name', 'val'], varargs=Non
3328
paddle.fluid.Operator.to_string ArgSpec(args=['self', 'throw_on_error'], varargs=None, keywords=None, defaults=None)
3429
paddle.fluid.Parameter.__init__ ArgSpec(args=['self', 'block', 'shape', 'dtype'], varargs=None, keywords='kwargs', defaults=None)
3530
paddle.fluid.Parameter.astype ArgSpec(args=['self', 'dtype'], varargs=None, keywords=None, defaults=None)
36-
paddle.fluid.Parameter.set_desc ArgSpec(args=['self', 'input'], varargs=None, keywords=None, defaults=None)
37-
paddle.fluid.Parameter.set_error_clip ArgSpec(args=['self', 'error_clip'], varargs=None, keywords=None, defaults=None)
3831
paddle.fluid.Parameter.to_string ArgSpec(args=['self', 'throw_on_error', 'with_details'], varargs=None, keywords=None, defaults=(False,))
3932
paddle.fluid.default_startup_program ArgSpec(args=[], varargs=None, keywords=None, defaults=None)
4033
paddle.fluid.default_main_program ArgSpec(args=[], varargs=None, keywords=None, defaults=None)

python/paddle/fluid/framework.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import unique_name
3333

3434
__all__ = [
35-
'Variable',
3635
'Program',
3736
'Operator',
3837
'Parameter',
@@ -302,7 +301,7 @@ def to_string(self, throw_on_error, with_details=False):
302301

303302
__repr__ = __str__
304303

305-
def set_desc(self, input):
304+
def _set_desc(self, input):
306305
"""
307306
Set the variable description.
308307
@@ -347,7 +346,7 @@ def lod_level(self):
347346
def type(self):
348347
return self.desc.type()
349348

350-
def set_error_clip(self, error_clip):
349+
def _set_error_clip(self, error_clip):
351350
"""
352351
Set the error_clip.
353352

python/paddle/fluid/tests/test_error_clip.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
avg_cost = fluid.layers.mean(cost)
3737

3838
prog_clip = prog.clone()
39-
prog_clip.block(0).var(hidden1.name).set_error_clip(
39+
prog_clip.block(0).var(hidden1.name)._set_error_clip(
4040
fluid.clip.ErrorClipByValue(
4141
max=CLIP_MAX, min=CLIP_MIN))
4242

python/paddle/fluid/tests/unittests/op_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ def _calc_output(self, place, parallel=False):
251251
for out_name, out_dup in Operator.get_op_outputs(self.op_type):
252252
fetch_list.append(str(out_name))
253253
# fetch_list = map(block.var, fetch_list)
254-
if not isinstance(fetch_list[0], Variable):
254+
if not isinstance(fetch_list[0], fluid.framework.Variable):
255255
fetch_list = map(block.var, fetch_list)
256256
outs = executor.run(program,
257257
feed=feed_map,

python/paddle/fluid/tests/unittests/test_parallel_op.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ def _run_test_impl_(self,
120120
pd = fluid.layers.ParallelDo(places, use_nccl=use_nccl)
121121
data = next(generator)
122122

123-
if isinstance(data, fluid.Variable):
123+
if isinstance(data, fluid.framework.Variable):
124124
data = [data]
125125

126126
with pd.do():

python/paddle/fluid/transpiler/distribute_transpiler.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
from .. import core, framework
3939
from ..framework import Program, default_main_program, \
4040
default_startup_program, Block, \
41-
Variable, Parameter, grad_var_name
41+
Parameter, grad_var_name
4242
from details import *
4343

4444
LOOKUP_TABLE_TYPE = "lookup_table"
@@ -1044,7 +1044,6 @@ def create_splited_vars(self, source_var, block, tag):
10441044
]
10451045

10461046
def _clone_var(self, block, var, persistable=True):
1047-
assert isinstance(var, Variable)
10481047
return block.create_var(
10491048
name=var.name,
10501049
shape=var.shape,

python/paddle/fluid/transpiler/memory_optimization_transpiler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
from collections import defaultdict
1616
from .. import core
17-
from ..framework import Program, default_main_program, Parameter, Variable
17+
from ..framework import Program, default_main_program, Parameter
1818
from ..backward import _rename_arg_
1919

2020
dtype_to_size = {

0 commit comments

Comments
 (0)