Skip to content
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.

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

Remove py36 code in .py files #48426

Merged
merged 4 commits into from
Nov 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 0 additions & 18 deletions python/paddle/distributed/spawn.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,6 @@ def __init__(self):
self.selected_devices = None


def _py_supported_check():
if not sys.version_info >= (3, 4):
raise RuntimeError(
"Use `paddle.distributed.spawn` to start parallel training "
"requires python version greater than 3.4, if your python "
"is lower than this version, please use "
"`paddle.distributed.launch` instead."
)


def _options_valid_check(options):
# `print_config` keeped as a debug options, not show to users
supported_options = [
Expand Down Expand Up @@ -414,7 +404,6 @@ def _func_wrapper(func, args, error_queue, return_queue, env_dict, backend):

class MultiprocessContext:
def __init__(self, processes, error_queues, return_queues):
_py_supported_check()
self.error_queues = error_queues
# NOTE(chenweihang): The `spawn` method is mainly used
# to wrap the outermost execution function of the program for
Expand Down Expand Up @@ -598,13 +587,6 @@ def train(print_result=False):
if __name__ == '__main__':
dist.spawn(train, args=(True,), nprocs=2, gpus='4,5')
"""
# NOTE(chenweihang): [ why only supports python3.4+ ? ]
# Python supported setting the child process startup method
# since 3.4. The previous version can only use the default startup
# method, while the default startup method of Unix is fork, which
# cannot support CUDA runtime multi-process
_py_supported_check()

# Give an error hint when the users enter a configuration option
# that does not exist
_options_valid_check(options)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# limitations under the License.

import os
import sys
import unittest

from parallel_dygraph_mnist import TestMnist
Expand Down Expand Up @@ -64,7 +63,7 @@ def test_mnist_xpu(self):

class TestParallelDygraphMnistSpawn(TestDistSpawnRunner):
def test_mnist_with_spawn(self):
if fluid.core.is_compiled_with_cuda() and sys.version_info >= (3, 4):
if fluid.core.is_compiled_with_cuda():
self.check_dist_result_with_spawn(test_class=TestMnist, delta=1e-5)


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# limitations under the License.

import os
import sys
import unittest

from parallel_dygraph_no_sync import TestNoSync
Expand Down Expand Up @@ -80,7 +79,7 @@ def test_no_sync_control_flow(self):

class TestParallelDygraphNoSyncSpawn(TestDistSpawnRunner):
def test_no_sync_with_spawn(self):
if fluid.core.is_compiled_with_cuda() and sys.version_info >= (3, 4):
if fluid.core.is_compiled_with_cuda():
self.check_dist_result_with_spawn(test_class=TestNoSync, delta=1e-5)


Expand All @@ -89,7 +88,7 @@ def _args_config(self, args):
args.find_unused_parameters = True

def test_no_sync_with_spawn(self):
if fluid.core.is_compiled_with_cuda() and sys.version_info >= (3, 4):
if fluid.core.is_compiled_with_cuda():
self.check_dist_result_with_spawn(
test_class=TestNoSyncUnusedParam, delta=1e-5
)
Expand All @@ -100,7 +99,7 @@ def _args_config(self, args):
args.find_unused_parameters = True

def test_no_sync_with_spawn(self):
if fluid.core.is_compiled_with_cuda() and sys.version_info >= (3, 4):
if fluid.core.is_compiled_with_cuda():
self.check_dist_result_with_spawn(
test_class=TestNoSyncControlFlow, delta=1e-5
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# limitations under the License.

import os
import sys
import unittest

from parallel_dygraph_se_resnext import TestSeResNeXt
Expand Down Expand Up @@ -43,7 +42,7 @@ def test_se_resnext(self):

class TestParallelDygraphSeResNeXtSpawn(TestDistSpawnRunner):
def test_se_resnext_with_spawn(self):
if fluid.core.is_compiled_with_cuda() and sys.version_info >= (3, 4):
if fluid.core.is_compiled_with_cuda():
self.check_dist_result_with_spawn(
test_class=TestSeResNeXt, delta=0.01
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# limitations under the License.

import os
import sys
import unittest

from parallel_dygraph_sparse_embedding import TestSparseEmbedding
Expand Down Expand Up @@ -61,7 +60,7 @@ def test_sparse_embedding_fp64(self):

class TestParallelDygraphSparseEmdeddingSpawn(TestDistSpawnRunner):
def test_sparse_embedding_with_spawn(self):
if fluid.core.is_compiled_with_cuda() and sys.version_info >= (3, 4):
if fluid.core.is_compiled_with_cuda():
self.check_dist_result_with_spawn(
test_class=TestSparseEmbedding, delta=1e-5
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# limitations under the License.

import os
import sys
import unittest

from parallel_dygraph_sparse_embedding_over_height import (
Expand Down Expand Up @@ -47,7 +46,7 @@ def test_sparse_embedding(self):

class TestParallelDygraphSparseEmdeddingOverHeightSpawn(TestDistSpawnRunner):
def test_sparse_embedding_with_spawn(self):
if fluid.core.is_compiled_with_cuda() and sys.version_info >= (3, 4):
if fluid.core.is_compiled_with_cuda():
self.check_dist_result_with_spawn(
test_class=TestSparseEmbeddingOverHeight, delta=1e-5
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# limitations under the License.

import os
import sys
import unittest

from parallel_dygraph_unused_variables import TestSparseEmbeddingUnusedVars
Expand Down Expand Up @@ -51,7 +50,7 @@ def _setup_config(self):

class TestSparseEmbeddingUnusedVarsSpawn(TestDistSpawnRunner):
def test_mnist_with_spawn(self):
if fluid.core.is_compiled_with_cuda() and sys.version_info >= (3, 4):
if fluid.core.is_compiled_with_cuda():
self.check_dist_result_with_spawn(
test_class=TestSparseEmbeddingUnusedVars, delta=1e-5
)
Expand Down
7 changes: 1 addition & 6 deletions python/paddle/fluid/tests/unittests/test_paddle_save_load.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import unittest
import numpy as np
import os
import sys
from io import BytesIO
import tempfile

Expand Down Expand Up @@ -149,11 +148,7 @@ def test_pickle_protocol(self):
with self.assertRaises(ValueError):
paddle.save(save_dict, path, 5)

protocols = [
2,
]
if sys.version_info.major >= 3 and sys.version_info.minor >= 4:
protocols += [3, 4]
protocols = [2, 3, 4]
for protocol in protocols:
paddle.save(save_dict, path, pickle_protocol=protocol)
dict_load = paddle.load(path)
Expand Down
7 changes: 1 addition & 6 deletions python/paddle/fluid/tests/unittests/test_static_save_load.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import sys

import unittest
import paddle
Expand Down Expand Up @@ -1798,11 +1797,7 @@ def test_pickle_protocol(self):
with self.assertRaises(ValueError):
paddle.fluid.save(prog, path, 5)

protocols = [
2,
]
if sys.version_info.major >= 3 and sys.version_info.minor >= 4:
protocols += [3, 4]
protocols = [2, 3, 4]
for protocol in protocols:
paddle.fluid.save(prog, path, protocol)
# set var to zero
Expand Down
12 changes: 1 addition & 11 deletions python/paddle/hapi/progressbar.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import time
import numpy as np
import struct
from collections import namedtuple

__all__ = []

Expand Down Expand Up @@ -57,16 +56,7 @@ def __init__(
)

def _get_max_width(self):
if sys.version_info > (3, 3):
from shutil import get_terminal_size
else:
try:
from backports.shutil_get_terminal_size import get_terminal_size
except:

def get_terminal_size():
terminal_size = namedtuple("terminal_size", "columns lines")
return terminal_size(80, 24)
from shutil import get_terminal_size

terminal_width, _ = get_terminal_size()
terminal_width = terminal_width if terminal_width > 0 else 80
Expand Down
9 changes: 0 additions & 9 deletions python/paddle/incubate/multiprocessing/reductions.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
# TODO: check serializing named tensor
# TODO: check influence on autograd
import sys
import warnings
import copy
import threading
from multiprocessing.util import register_after_fork
Expand All @@ -34,14 +33,6 @@ def _supported_check():

return False

if not sys.version_info >= (3, 4):
warnings.warn(
"Use `paddle.multiprocessing` to share paddle tensor "
"requires python version greater than 3.4 ."
" `paddle.multiprocessing` will not take any effect !!!"
)
return False

return True


Expand Down
11 changes: 1 addition & 10 deletions python/paddle/vision/datasets/folder.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# limitations under the License.

import os
import sys
from PIL import Image

import paddle
Expand Down Expand Up @@ -246,15 +245,7 @@ def _find_classes(self, dir):
and class_to_idx is a dictionary.

"""
if sys.version_info >= (3, 5):
# Faster and available in Python 3.5 and above
classes = [d.name for d in os.scandir(dir) if d.is_dir()]
else:
classes = [
d
for d in os.listdir(dir)
if os.path.isdir(os.path.join(dir, d))
]
classes = [d.name for d in os.scandir(dir) if d.is_dir()]
classes.sort()
class_to_idx = {classes[i]: i for i in range(len(classes))}
return classes, class_to_idx
Expand Down
4 changes: 0 additions & 4 deletions tools/dockerfile/build_scripts/ssl-check.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@

print("Testing SSL certificate checking for Python:", sys.version)

if sys.version_info[:2] < (2, 7) or sys.version_info[:2] < (3, 4):
print("This version never checks SSL certs; skipping tests")
sys.exit(0)

if sys.version_info[0] >= 3:
from urllib.request import urlopen

Expand Down