Skip to content

Commit

Permalink
Remove __future__ imports for legacy Python2 supports (pytorch#45033)
Browse files Browse the repository at this point in the history
Summary:
There is a module called `2to3` which you can target for future specifically to remove these, the directory of `caffe2` has the most redundant imports:

```2to3 -f future -w caffe2```

Pull Request resolved: pytorch#45033

Reviewed By: seemethere

Differential Revision: D23808648

Pulled By: bugra

fbshipit-source-id: 38971900f0fe43ab44a9168e57f2307580d36a38
  • Loading branch information
bugra authored and facebook-github-bot committed Sep 24, 2020
1 parent e9aa689 commit 27c7158
Show file tree
Hide file tree
Showing 597 changed files with 2,086 additions and 2,086 deletions.
8 changes: 4 additions & 4 deletions caffe2/contrib/aten/aten_test.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





from caffe2.python import core, dyndep
from hypothesis import given
Expand Down
8 changes: 4 additions & 4 deletions caffe2/contrib/fakelowp/test/test_batchmatmul_nnpi_fp16.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





import numpy as np
import unittest
Expand Down
8 changes: 4 additions & 4 deletions caffe2/contrib/fakelowp/test/test_batchnorm_nnpi_fp16.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





import numpy as np
import unittest
Expand Down
2 changes: 1 addition & 1 deletion caffe2/contrib/fakelowp/test/test_deq_swish_quant_nnpi.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from __future__ import absolute_import, division, print_function, unicode_literals


import numpy as np
import caffe2.python.fakelowp.init_shared_libs # noqa
Expand Down
8 changes: 4 additions & 4 deletions caffe2/contrib/fakelowp/test/test_fc_nnpi_fp16.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





import numpy as np
import unittest
Expand Down
2 changes: 1 addition & 1 deletion caffe2/contrib/fakelowp/test/test_fusions.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from __future__ import absolute_import, division, print_function, unicode_literals


# Must happen before importing caffe2.python.*
import caffe2.python.fakelowp.init_shared_libs # noqa
Expand Down
2 changes: 1 addition & 1 deletion caffe2/contrib/fakelowp/test/test_int8_ops_nnpi.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from __future__ import absolute_import, division, print_function, unicode_literals


import caffe2.python.fakelowp.init_shared_libs # noqa
import numpy as np
Expand Down
2 changes: 1 addition & 1 deletion caffe2/contrib/fakelowp/test/test_int8_quant.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from __future__ import absolute_import, division, print_function, unicode_literals


# Must happen before importing caffe2.python.*
import caffe2.python.fakelowp.init_shared_libs # noqa
Expand Down
8 changes: 4 additions & 4 deletions caffe2/contrib/fakelowp/test/test_layernorm_nnpi_fp16.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





import numpy as np
import caffe2.python.fakelowp.init_shared_libs # noqa
Expand Down
8 changes: 4 additions & 4 deletions caffe2/contrib/fakelowp/test/test_op_nnpi_fp16.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





import numpy as np

Expand Down
8 changes: 4 additions & 4 deletions caffe2/contrib/fakelowp/test/test_sls_4bit_nnpi_fp16.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





import numpy as np
import unittest
Expand Down
2 changes: 1 addition & 1 deletion caffe2/contrib/fakelowp/test/test_sls_8bit_nnpi_fp16.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from __future__ import absolute_import, division, print_function, unicode_literals


import unittest

Expand Down
2 changes: 1 addition & 1 deletion caffe2/contrib/fakelowp/test/test_sls_8bit_nnpi_fp32.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from __future__ import absolute_import, division, print_function, unicode_literals


import unittest

Expand Down
8 changes: 4 additions & 4 deletions caffe2/contrib/gloo/gloo_test.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/usr/bin/env python

from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





from hypothesis import given, settings
import hypothesis.strategies as st
Expand Down
8 changes: 4 additions & 4 deletions caffe2/contrib/nccl/nccl_ops_test.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





import unittest
import hypothesis.strategies as st
Expand Down
8 changes: 4 additions & 4 deletions caffe2/contrib/nnpack/nnpack_ops_test.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





import unittest
import hypothesis.strategies as st
Expand Down
8 changes: 4 additions & 4 deletions caffe2/contrib/playground/AnyExp.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





from abc import abstractmethod

Expand Down
8 changes: 4 additions & 4 deletions caffe2/contrib/playground/AnyExpOnTerm.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





import argparse
import json
Expand Down
8 changes: 4 additions & 4 deletions caffe2/contrib/playground/ModuleRegister.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





import inspect
import logging
Expand Down
8 changes: 4 additions & 4 deletions caffe2/contrib/playground/checkpoint.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





import numpy as np
import pickle
Expand Down
8 changes: 4 additions & 4 deletions caffe2/contrib/playground/compute_loss.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





import caffe2.contrib.playground.meter as Meter
from caffe2.python import workspace
Expand Down
8 changes: 4 additions & 4 deletions caffe2/contrib/playground/compute_topk_accuracy.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





import caffe2.contrib.playground.meter as Meter
from caffe2.python import workspace
Expand Down
8 changes: 4 additions & 4 deletions caffe2/contrib/playground/meter.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





from abc import abstractmethod

Expand Down
8 changes: 4 additions & 4 deletions caffe2/contrib/playground/module_map.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





# Input
import caffe2.contrib.playground.resnetdemo.\
Expand Down
8 changes: 4 additions & 4 deletions caffe2/contrib/playground/output_generator.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





from caffe2.python import timeout_guard

Expand Down
8 changes: 4 additions & 4 deletions caffe2/contrib/playground/resnetdemo/IN1k_resnet.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





import numpy as np

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





import numpy as np

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





import caffe2.python.models.resnet as resnet

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals






def gen_param_update_builder_fun(self, model, dataset, is_train):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





import logging
logging.basicConfig()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





from caffe2.python import workspace, core
from caffe2.proto import caffe2_pb2
Expand Down
8 changes: 4 additions & 4 deletions caffe2/contrib/playground/resnetdemo/gfs_IN1k.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





# # example1 using gfs as input source.

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





def checkpoint(self, epoch):
self.model_path = None
Expand Down
8 changes: 4 additions & 4 deletions caffe2/contrib/playground/resnetdemo/rendezvous_filestore.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





from caffe2.python import core, workspace
from caffe2.python import dyndep
Expand Down
8 changes: 4 additions & 4 deletions caffe2/contrib/prof/cuda_profile_ops_test.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





import unittest
from caffe2.proto import caffe2_pb2
Expand Down
8 changes: 4 additions & 4 deletions caffe2/contrib/tensorboard/tensorboard.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals





import click
import collections
Expand Down
Loading

0 comments on commit 27c7158

Please sign in to comment.