Remove __future__ imports from many files

dreiss · dreiss · commit 8e429e625c06 · 2020-05-20T07:57:17.000-07:00
Summary:
Python 2 has reached end-of-life and is no longer supported by PyTorch.
These future imports are already implied in Python 3.

Test Plan:
CI

[ghstack-poisoned]
diff --git a/test/backward_compatibility/check_backward_compatibility.py b/test/backward_compatibility/check_backward_compatibility.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import argparse
 import datetime
 import re
diff --git a/test/backward_compatibility/dump_all_function_schemas.py b/test/backward_compatibility/dump_all_function_schemas.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import argparse
 import torch
 
diff --git a/test/distributed/rpc/test_dist_optimizer_spawn.py b/test/distributed/rpc/test_dist_optimizer_spawn.py
@@ -1,6 +1,4 @@
 #!/usr/bin/env python3
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from torch.testing._internal.distributed.rpc.dist_optimizer_test import DistOptimizerTest
 from torch.testing._internal.common_distributed import MultiProcessTestCase
 from torch.testing._internal.common_utils import TEST_WITH_ASAN, run_tests
diff --git a/test/distributed/test_c10d.py b/test/distributed/test_c10d.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import copy
 import math
 import os
diff --git a/test/distributed/test_distributed.py b/test/distributed/test_distributed.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
 import copy
 import errno
 import fcntl
diff --git a/test/jit/test_class_type.py b/test/jit/test_class_type.py
@@ -1,4 +1,3 @@
-from __future__ import division
 import io
 import os
 import sys
diff --git a/test/quantization/test_qat_module.py b/test/quantization/test_qat_module.py
@@ -1,8 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import math
 import torch
 import torch.nn as nn
diff --git a/test/quantization/test_quantized_op.py b/test/quantization/test_quantized_op.py
@@ -1,4 +1,3 @@
-from __future__ import division
 from builtins import round
 
 import itertools
diff --git a/test/run_test.py b/test/run_test.py
@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import print_function
-
 import argparse
 from datetime import datetime
 import modulefinder
diff --git a/test/simulate_nccl_errors.py b/test/simulate_nccl_errors.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import torch.distributed as c10d
 import torch
 import argparse
diff --git a/test/te_utils.py b/test/te_utils.py
@@ -1,8 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import torch
 
 class ExecutionCounter(object):
diff --git a/test/test_function_schema.py b/test/test_function_schema.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import torch
 from torch.testing._internal.common_utils import TestCase, run_tests
 from torch._C import parse_schema
diff --git a/test/test_jit.py b/test/test_jit.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division
 import torch
 
 # This is how we include tests located in test/jit/...
diff --git a/test/test_jit_fuser.py b/test/test_jit_fuser.py
@@ -1,8 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import unittest
 import torch
 import torch.nn as nn
diff --git a/test/test_jit_fuser_te.py b/test/test_jit_fuser_te.py
@@ -1,8 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import unittest
 import torch
 import torch.nn as nn
diff --git a/test/test_mkldnn.py b/test/test_mkldnn.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
 import copy
 import unittest
 
diff --git a/test/test_multiprocessing_spawn.py b/test/test_multiprocessing_spawn.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import os
 import random
 import signal
diff --git a/test/test_tensorboard.py b/test/test_tensorboard.py
@@ -1,8 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import io
 import numpy as np
 import os
diff --git a/test/test_throughput_benchmark.py b/test/test_throughput_benchmark.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import torch
 import tempfile
 from torch.utils import ThroughputBenchmark
diff --git a/test/test_type_hints.py b/test/test_type_hints.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
 import unittest
 from torch.testing._internal.common_utils import TestCase, run_tests
 import tempfile
diff --git a/test/test_utils.py b/test/test_utils.py
@@ -1,4 +1,3 @@
-from __future__ import print_function
 import sys
 import os
 import re
diff --git a/test/test_xnnpack_integration.py b/test/test_xnnpack_integration.py
@@ -1,5 +1,3 @@
-from __future__ import division
-
 import unittest
 
 import torch
diff --git a/torch/_utils_internal.py b/torch/_utils_internal.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import os
 import inspect
 
diff --git a/torch/backends/quantized/__init__.py b/torch/backends/quantized/__init__.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
 import sys
 import torch
 import types
diff --git a/torch/backends/xnnpack/__init__.py b/torch/backends/xnnpack/__init__.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
 import sys
 import torch
 import types
diff --git a/torch/distributed/__init__.py b/torch/distributed/__init__.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import torch
 
 
diff --git a/torch/distributed/autograd/__init__.py b/torch/distributed/autograd/__init__.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import sys
 import torch
 
diff --git a/torch/distributed/launch.py b/torch/distributed/launch.py
@@ -1,6 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-
-
 r"""
 `torch.distributed.launch` is a module that spawns up multiple distributed
 training processes on each of the training nodes.
diff --git a/torch/distributed/rpc/__init__.py b/torch/distributed/rpc/__init__.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import numbers
 import sys
 
diff --git a/torch/distributed/rpc/_testing/__init__.py b/torch/distributed/rpc/_testing/__init__.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import torch
 
 
diff --git a/torch/distributed/rpc/backend_registry.py b/torch/distributed/rpc/backend_registry.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import collections
 from datetime import timedelta
 import enum
diff --git a/torch/distributions/von_mises.py b/torch/distributions/von_mises.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function
-
 import math
 
 import torch
diff --git a/torch/hub.py b/torch/hub.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
 import errno
 import hashlib
 import os
diff --git a/torch/multiprocessing/_atfork.py b/torch/multiprocessing/_atfork.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 import sys
 
 __all__ = ['register_after_fork']
diff --git a/torch/multiprocessing/spawn.py b/torch/multiprocessing/spawn.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import multiprocessing
 import multiprocessing.connection
 import signal
diff --git a/torch/nn/init.py b/torch/nn/init.py
@@ -1,5 +1,3 @@
-from __future__ import division
-
 import math
 import warnings
 
diff --git a/torch/nn/intrinsic/modules/fused.py b/torch/nn/intrinsic/modules/fused.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
 import torch
 from torch.nn import Conv1d, Conv2d, Conv3d, ReLU, Linear, BatchNorm2d, BatchNorm3d
 
diff --git a/torch/nn/intrinsic/qat/__init__.py b/torch/nn/intrinsic/qat/__init__.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
 from .modules import LinearReLU
 from .modules import ConvReLU2d
 from .modules import ConvBn2d
diff --git a/torch/nn/intrinsic/qat/modules/__init__.py b/torch/nn/intrinsic/qat/modules/__init__.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from .linear_relu import LinearReLU
 from .conv_fused import ConvBn2d, ConvBnReLU2d, ConvReLU2d, update_bn_stats, freeze_bn_stats
 
diff --git a/torch/nn/intrinsic/qat/modules/conv_fused.py b/torch/nn/intrinsic/qat/modules/conv_fused.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
 import math
 import torch
 import torch.nn as nn
diff --git a/torch/nn/intrinsic/qat/modules/linear_relu.py b/torch/nn/intrinsic/qat/modules/linear_relu.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
 import torch.nn.qat as nnqat
 import torch.nn.intrinsic
 import torch.nn.functional as F
diff --git a/torch/nn/intrinsic/quantized/__init__.py b/torch/nn/intrinsic/quantized/__init__.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
 from .modules import LinearReLU
 from .modules import ConvReLU1d, ConvReLU2d, ConvReLU3d
 from .modules import BNReLU2d, BNReLU3d
diff --git a/torch/nn/intrinsic/quantized/modules/bn_relu.py b/torch/nn/intrinsic/quantized/modules/bn_relu.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import torch
 import torch.nn.intrinsic
 import torch.nn.intrinsic.qat
diff --git a/torch/nn/intrinsic/quantized/modules/conv_relu.py b/torch/nn/intrinsic/quantized/modules/conv_relu.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import torch
 import torch.nn.intrinsic
 import torch.nn.intrinsic.qat
diff --git a/torch/nn/intrinsic/quantized/modules/linear_relu.py b/torch/nn/intrinsic/quantized/modules/linear_relu.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
 import torch.nn.quantized as nnq
 import torch.nn.intrinsic
 import torch
diff --git a/torch/nn/modules/batchnorm.py b/torch/nn/modules/batchnorm.py
@@ -1,5 +1,3 @@
-from __future__ import division
-
 import torch
 from ._functions import SyncBatchNorm as sync_batch_norm
 from .module import Module
diff --git a/torch/nn/modules/pooling.py b/torch/nn/modules/pooling.py
@@ -1,8 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 from typing import List, Optional
 
 from torch import Tensor
diff --git a/torch/nn/qat/__init__.py b/torch/nn/qat/__init__.py
@@ -1,2 +1 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
 from .modules import *
diff --git a/torch/nn/qat/modules/conv.py b/torch/nn/qat/modules/conv.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
 import torch.nn as nn
 from torch.nn.intrinsic import ConvReLU2d
 
diff --git a/torch/nn/qat/modules/linear.py b/torch/nn/qat/modules/linear.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
 import torch.nn as nn
 import torch.nn.functional as F
 from torch.nn.intrinsic import LinearReLU
diff --git a/torch/nn/quantized/__init__.py b/torch/nn/quantized/__init__.py
@@ -1,6 +1 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 from .modules import *
diff --git a/torch/nn/quantized/dynamic/__init__.py b/torch/nn/quantized/dynamic/__init__.py
@@ -1,4 +1 @@
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from .modules import *
diff --git a/torch/nn/quantized/dynamic/modules/linear.py b/torch/nn/quantized/dynamic/modules/linear.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
 import torch
 from ....modules.linear import Linear as NNLinear
 import torch.nn.quantized as nnq
diff --git a/torch/nn/quantized/dynamic/modules/rnn.py b/torch/nn/quantized/dynamic/modules/rnn.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import numbers
 import warnings
 
diff --git a/torch/nn/quantized/functional.py b/torch/nn/quantized/functional.py
@@ -1,9 +1,4 @@
 r""" Functional interface (quantized)."""
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 from typing import List, Optional
 
 import torch
diff --git a/torch/nn/quantized/modules/activation.py b/torch/nn/quantized/modules/activation.py
@@ -1,8 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import torch
 import torch.nn.quantized.functional
 
diff --git a/torch/nn/quantized/modules/batchnorm.py b/torch/nn/quantized/modules/batchnorm.py
@@ -1,8 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import torch
 import torch.nn.quantized.functional
 import torch.nn.intrinsic as nni
diff --git a/torch/nn/quantized/modules/conv.py b/torch/nn/quantized/modules/conv.py
@@ -1,11 +1,6 @@
 # coding=utf-8
 r"""Quantized convolution modules."""
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 from typing import Optional, List
 
 import torch
diff --git a/torch/nn/quantized/modules/linear.py b/torch/nn/quantized/modules/linear.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import torch
 
 from torch._jit_internal import Optional  # noqa: F401
diff --git a/torch/nn/utils/fusion.py b/torch/nn/utils/fusion.py
@@ -1,6 +1,3 @@
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import copy
 import torch
 
diff --git a/torch/quantization/__init__.py b/torch/quantization/__init__.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
 from .quantize import *
 from .observer import *
 from .qconfig import *
diff --git a/torch/quantization/_quantize_script.py b/torch/quantization/_quantize_script.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import torch
 from .qconfig import QConfig
 from torch.jit._recursive import wrap_cpp_module
diff --git a/torch/quantization/fake_quantize.py b/torch/quantization/fake_quantize.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
 import torch
 from torch.nn import Module
 from .observer import MovingAverageMinMaxObserver, HistogramObserver, MovingAveragePerChannelMinMaxObserver, _with_args
diff --git a/torch/quantization/fuse_modules.py b/torch/quantization/fuse_modules.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import torch
 import copy
 
diff --git a/torch/quantization/observer.py b/torch/quantization/observer.py
diff --git a/torch/quantization/qconfig.py b/torch/quantization/qconfig.py
diff --git a/torch/quantization/quantize.py b/torch/quantization/quantize.py
diff --git a/torch/testing/_internal/common_distributed.py b/torch/testing/_internal/common_distributed.py
diff --git a/torch/testing/_internal/common_quantization.py b/torch/testing/_internal/common_quantization.py
diff --git a/torch/testing/_internal/common_quantized.py b/torch/testing/_internal/common_quantized.py
diff --git a/torch/testing/_internal/dist_utils.py b/torch/testing/_internal/dist_utils.py
diff --git a/torch/testing/_internal/distributed/rpc/dist_optimizer_test.py b/torch/testing/_internal/distributed/rpc/dist_optimizer_test.py
diff --git a/torch/utils/__init__.py b/torch/utils/__init__.py
diff --git a/torch/utils/_cpp_extension_versioner.py b/torch/utils/_cpp_extension_versioner.py
diff --git a/torch/utils/checkpoint.py b/torch/utils/checkpoint.py
diff --git a/torch/utils/collect_env.py b/torch/utils/collect_env.py
diff --git a/torch/utils/cpp_extension.py b/torch/utils/cpp_extension.py
diff --git a/torch/utils/dlpack.py b/torch/utils/dlpack.py
diff --git a/torch/utils/file_baton.py b/torch/utils/file_baton.py
diff --git a/torch/utils/hooks.py b/torch/utils/hooks.py
diff --git a/torch/utils/mkldnn.py b/torch/utils/mkldnn.py
diff --git a/torch/utils/throughput_benchmark.py b/torch/utils/throughput_benchmark.py

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import absolute_import, division, print_function, unicode_literals`
`2`		`-`
`3`	`1`	`import argparse`
`4`	`2`	`import datetime`
`5`	`3`	`import re`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import absolute_import, division, print_function, unicode_literals`
`2`		`-`
`3`	`1`	`import copy`
`4`	`2`	`import math`
`5`	`3`	`import os`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-from __future__ import absolute_import, division, print_function, unicode_literals`
`2`	`1`	`import copy`
`3`	`2`	`import errno`
`4`	`3`	`import fcntl`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-from __future__ import division`
`2`	`1`	`import io`
`3`	`2`	`import os`
`4`	`3`	`import sys`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-from __future__ import division`
`2`	`1`	`from builtins import round`
`3`	`2`
`4`	`3`	`import itertools`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import absolute_import, division, print_function, unicode_literals`
`2`		`-`
`3`	`1`	`import torch.distributed as c10d`
`4`	`2`	`import torch`
`5`	`3`	`import argparse`