Skip to content

代码退场，清除了与python2相关的一些条件分支 #46696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Oct 11, 2022
Merged

代码退场，清除了与python2相关的一些条件分支 #46696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fa95cfd
Update README.md
caolonghao Sep 26, 2022
bd836e0
Update README.md
caolonghao Sep 26, 2022
ef6c30c
Merge branch 'develop' of https://github.com/caolonghao/Paddle into d…
caolonghao Oct 1, 2022
afb25ec
Remove a conditional branch related to Python2
caolonghao Oct 1, 2022
0c98d7e
Remove conditional branch with Python version <= 3.0
caolonghao Oct 1, 2022
0df2a64
Remove a conditional branch in setting string encoder
caolonghao Oct 1, 2022
0592d5a
Remove conditional branches related to Python2 in rnn layer
caolonghao Oct 1, 2022
508e81a
Remove conditional branches related to Python2 in unittests
caolonghao Oct 1, 2022
992b46e
Remove conditional branches related to Python2 in tools
caolonghao Oct 1, 2022
bebfb39
Remove conditional branches related to Python2
caolonghao Oct 1, 2022
07d8a8a
Rearrange codes: delete 'integer_types'
caolonghao Oct 1, 2022
a94ca93
Revert two changes in auto-generated ps_pb2.py files
caolonghao Oct 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 5 additions & 21 deletions python/paddle/fluid/layers/rnn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,43 +126,27 @@ def get_initial_states(self,
Variable: tensor variable[s] packed in the same structure provided \
by shape, representing the initialized states.
"""
if sys.version_info < (3, ):
integer_types = (
int,
long,
)
else:
integer_types = (int, )
check_variable_and_dtype(batch_ref, 'batch_ref',
['float32', 'float64', 'int32', 'int64'],
'RNNCell')
check_type(shape, 'shape', (list, tuple, type(None), integer_types),
'RNNCell')
check_type(shape, 'shape', (list, tuple, type(None), int), 'RNNCell')
if isinstance(shape, (list, tuple)):
shapes = map_structure(lambda x: x, shape)
if isinstance(shape, list):
for i, _shape in enumerate(shapes):
check_type(_shape, 'shapes[' + str(i) + ']', integer_types,
'RNNCell')
check_type(_shape, 'shapes[' + str(i) + ']', int, 'RNNCell')
else:
check_type(shapes, 'shapes', integer_types, 'RNNCell')
check_type(shapes, 'shapes', int, 'RNNCell')
Copy link
Member

@SigureMo SigureMo Oct 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里的 PR-CI-Coverage 覆盖率不过与本 PR 无关，是否可以豁免掉？

image

Copy link
Contributor

@luotao1 luotao1 Oct 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

已经豁免

check_dtype(dtype, 'dtype', ['float32', 'float64'], 'RNNCell')

# TODO: use inputs and batch_size
batch_ref = flatten(batch_ref)[0]

def _is_shape_sequence(seq):
if sys.version_info < (3, ):
integer_types = (
int,
long,
)
else:
integer_types = (int, )
"""For shape, list/tuple of integer is the finest-grained objection"""
if (isinstance(seq, list) or isinstance(seq, tuple)):
if reduce(lambda flag, x: isinstance(x, integer_types) and flag,
seq, True):
if reduce(lambda flag, x: isinstance(x, int) and flag, seq,
True):
return False
# TODO: Add check for the illegal
if isinstance(seq, dict):
Expand Down
5 changes: 1 addition & 4 deletions python/paddle/fluid/param_attr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,7 @@ def __init__(self,
do_model_average=True,
need_clip=True):

if sys.version_info.major == 2:
check_type(name, "name", (str, type(None), unicode), "ParamAttr")
else:
check_type(name, "name", (str, type(None)), "ParamAttr")
check_type(name, "name", (str, type(None)), "ParamAttr")
check_type(learning_rate, "learning_rate", (float, int), "ParamAttr")
check_type(trainable, "trainable", (bool), "ParamAttr")
check_type(do_model_average, "do_model_average", (bool), "ParamAttr")
Expand Down
5 changes: 1 addition & 4 deletions python/paddle/fluid/tests/unittests/test_fs_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@
class FSTest(unittest.TestCase):

def _test_method(self, func):
if sys.version_info[0] <= 2:
args = inspect.getargspec(func).args
else:
args = inspect.getfullargspec(func).args
args = inspect.getfullargspec(func).args

a = None
try:
Expand Down
5 changes: 1 addition & 4 deletions python/paddle/fluid/tests/unittests/test_imperative_data_loader_exit_func.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@
import paddle.compat as cpt
from paddle.fluid.framework import _test_eager_guard

if sys.version_info[0] == 2:
import Queue as queue
else:
import queue
import queue

from paddle.fluid.reader import multiprocess_queue_set, _cleanup, CleanupFuncRegistrar

Expand Down
5 changes: 1 addition & 4 deletions python/paddle/fluid/tests/unittests/test_imperative_data_loader_process.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@
from paddle.fluid.reader import _reader_process_loop
from paddle.fluid.framework import _test_eager_guard

if sys.version_info[0] == 2:
import Queue as queue
else:
import queue
import queue


def get_random_images_and_labels(image_shape, label_shape):
Expand Down
11 changes: 2 additions & 9 deletions python/paddle/nn/layer/rnn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,17 +188,10 @@ def get_initial_states(self,
batch_ref = flatten(batch_ref)[0]

def _is_shape_sequence(seq):
if sys.version_info < (3, ):
integer_types = (
int,
long,
)
else:
integer_types = (int, )
"""For shape, list/tuple of integer is the finest-grained objection"""
if (isinstance(seq, list) or isinstance(seq, tuple)):
if reduce(lambda flag, x: isinstance(x, integer_types) and flag,
seq, True):
if reduce(lambda flag, x: isinstance(x, int) and flag, seq,
True):
return False
# TODO: Add check for the illegal
if isinstance(seq, dict):
Expand Down
4 changes: 0 additions & 4 deletions python/paddle/tests/test_callback_visualdl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ def tearDown(self):
shutil.rmtree(self.save_dir)

def func_visualdl_callback(self):
# visualdl not support python2
if sys.version_info < (3, ):
return

inputs = [InputSpec([-1, 1, 28, 28], 'float32', 'image')]
labels = [InputSpec([None, 1], 'int64', 'label')]

Expand Down
8 changes: 2 additions & 6 deletions python/setup.py.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,12 +735,8 @@ else:
yield

# Log for PYPI
if sys.version_info > (3,0):
with open("@PADDLE_BINARY_DIR@/python/paddle/README.rst", "r", encoding='UTF-8') as f:
long_description = f.read()
else:
with open("@PADDLE_BINARY_DIR@/python/paddle/README.rst", "r")as f:
long_description = unicode(f.read(), 'UTF-8')
with open("@PADDLE_BINARY_DIR@/python/paddle/README.rst", "r", encoding='UTF-8') as f:
long_description = f.read()

# strip *.so to reduce package size
if '${WITH_STRIP}' == 'ON':
Expand Down
35 changes: 11 additions & 24 deletions tools/prune_for_jetson.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,11 @@ def find_kernel(content, pattern):

def prune_phi_kernels():
tool_dir = os.path.dirname(os.path.abspath(__file__))
if sys.version_info[0] == 3:
all_op = glob.glob(os.path.join(tool_dir,
'../paddle/phi/kernels/**/*.cc'),
recursive=True)
all_op += glob.glob(os.path.join(tool_dir,
'../paddle/phi/kernels/**/*.cu'),
recursive=True)
elif sys.version_info[0] == 2:
all_op = find_type_files(
os.path.join(tool_dir, '../paddle/phi/kernels/'), '.cc')
all_op = find_type_files(
os.path.join(tool_dir, '../paddle/phi/kernels/'), '.cu', all_op)

all_op = glob.glob(os.path.join(tool_dir, '../paddle/phi/kernels/**/*.cc'),
recursive=True)
all_op += glob.glob(os.path.join(tool_dir, '../paddle/phi/kernels/**/*.cu'),
recursive=True)

register_op_count = 0
for op_file in all_op:
Expand Down Expand Up @@ -139,18 +132,12 @@ def append_fluid_kernels():
#2. add op and kernel register
op_white_list.append("tensorrt_engine")
tool_dir = os.path.dirname(os.path.abspath(__file__))
if sys.version_info[0] == 3:
all_op = glob.glob(os.path.join(tool_dir,
'../paddle/fluid/operators/**/*.cc'),
recursive=True)
all_op += glob.glob(os.path.join(tool_dir,
'../paddle/fluid/operators/**/*.cu'),
recursive=True)
elif sys.version_info[0] == 2:
all_op = find_type_files(
os.path.join(tool_dir, '../paddle/fluid/operators/'), '.cc')
all_op = find_type_files(
os.path.join(tool_dir, '../paddle/fluid/operators/'), '.cu', all_op)
all_op = glob.glob(os.path.join(tool_dir,
'../paddle/fluid/operators/**/*.cc'),
recursive=True)
all_op += glob.glob(os.path.join(tool_dir,
'../paddle/fluid/operators/**/*.cu'),
recursive=True)

for op_file in all_op:
with io.open(op_file, 'r', encoding='utf-8') as f:
Expand Down
18 changes: 6 additions & 12 deletions tools/remove_grad_op_and_kernel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,12 @@ def update_operator_cmake(cmake_file):

tool_dir = os.path.dirname(os.path.abspath(__file__))

if sys.version_info[0] == 3:
all_op = glob.glob(os.path.join(tool_dir,
'../paddle/fluid/operators/**/*.cc'),
recursive=True)
all_op += glob.glob(os.path.join(tool_dir,
'../paddle/fluid/operators/**/*.cu'),
recursive=True)
elif sys.version_info[0] == 2:
all_op = find_type_files(
os.path.join(tool_dir, '../paddle/fluid/operators/'), '.cc')
all_op = find_type_files(
os.path.join(tool_dir, '../paddle/fluid/operators/'), '.cu', all_op)
all_op = glob.glob(os.path.join(tool_dir,
'../paddle/fluid/operators/**/*.cc'),
recursive=True)
all_op += glob.glob(os.path.join(tool_dir,
'../paddle/fluid/operators/**/*.cu'),
recursive=True)

spec_ops = ['activation_op.cc']

Expand Down