Remove from __future__ import

lululxvi · lululxvi · commit 11911cd17cc4 · 2021-12-05T12:56:02.000-05:00
diff --git a/deepxde/__init__.py b/deepxde/__init__.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from .__about__ import __version__
 
 # Should import backend before importing anything else
diff --git a/deepxde/backend/__init__.py b/deepxde/backend/__init__.py
@@ -1,9 +1,5 @@
 # References: https://github.com/dmlc/dgl/tree/master/python/dgl/backend
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import importlib
 import json
 import os
diff --git a/deepxde/callbacks.py b/deepxde/callbacks.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import sys
 import time
 
diff --git a/deepxde/config.py b/deepxde/config.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 from .backend import tf
 from .real import Real
 
diff --git a/deepxde/data/__init__.py b/deepxde/data/__init__.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from .constraint import Constraint
 from .dataset import DataSet
 from .fpde import FPDE
diff --git a/deepxde/data/constraint.py b/deepxde/data/constraint.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 from .data import Data
 from .. import config
 from ..backend import tf
diff --git a/deepxde/data/data.py b/deepxde/data/data.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import abc
 
 
diff --git a/deepxde/data/dataset.py b/deepxde/data/dataset.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import numpy as np
 
 from .data import Data
diff --git a/deepxde/data/fpde.py b/deepxde/data/fpde.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import math
 
 import numpy as np
diff --git a/deepxde/data/func_constraint.py b/deepxde/data/func_constraint.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import numpy as np
 
 from .data import Data
diff --git a/deepxde/data/function.py b/deepxde/data/function.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 from .data import Data
 from ..utils import run_if_any_none
 
diff --git a/deepxde/data/helper.py b/deepxde/data/helper.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import numpy as np
 
 
diff --git a/deepxde/data/ide.py b/deepxde/data/ide.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import numpy as np
 
 from .helper import one_function
diff --git a/deepxde/data/mf.py b/deepxde/data/mf.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import numpy as np
 from sklearn import preprocessing
 
diff --git a/deepxde/data/mfopdataset.py b/deepxde/data/mfopdataset.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import numpy as np
 
 from .data import Data
diff --git a/deepxde/data/pde.py b/deepxde/data/pde.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import numpy as np
 
 from .data import Data
diff --git a/deepxde/data/sampler.py b/deepxde/data/sampler.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import numpy as np
 
 
diff --git a/deepxde/data/triple.py b/deepxde/data/triple.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 from .data import Data
 from .sampler import BatchSampler
 
diff --git a/deepxde/display.py b/deepxde/display.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import sys
 
 import numpy as np
diff --git a/deepxde/geometry/__init__.py b/deepxde/geometry/__init__.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-
 from .csg import CSGDifference
 from .csg import CSGIntersection
 from .csg import CSGUnion
diff --git a/deepxde/geometry/csg.py b/deepxde/geometry/csg.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import numpy as np
 
 from . import geometry
diff --git a/deepxde/geometry/geometry.py b/deepxde/geometry/geometry.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import abc
 
 import numpy as np
diff --git a/deepxde/geometry/geometry_1d.py b/deepxde/geometry/geometry_1d.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import numpy as np
 
 from .geometry import Geometry
diff --git a/deepxde/geometry/geometry_2d.py b/deepxde/geometry/geometry_2d.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import numpy as np
 from scipy import spatial
 
diff --git a/deepxde/geometry/geometry_3d.py b/deepxde/geometry/geometry_3d.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import itertools
 
 import numpy as np
diff --git a/deepxde/geometry/geometry_nd.py b/deepxde/geometry/geometry_nd.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import itertools
 
 import numpy as np
diff --git a/deepxde/geometry/sampler.py b/deepxde/geometry/sampler.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 from distutils.version import LooseVersion
 
 import numpy as np
diff --git a/deepxde/geometry/timedomain.py b/deepxde/geometry/timedomain.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import itertools
 
 import numpy as np
diff --git a/deepxde/gradients.py b/deepxde/gradients.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 from .backend import backend_name, tf, torch
 
 __all__ = ["clear", "hessian", "jacobian"]
diff --git a/deepxde/icbcs/boundary_conditions.py b/deepxde/icbcs/boundary_conditions.py
@@ -1,9 +1,5 @@
 """Boundary conditions."""
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 __all__ = [
     "BC",
     "DirichletBC",
diff --git a/deepxde/icbcs/initial_conditions.py b/deepxde/icbcs/initial_conditions.py
@@ -1,9 +1,5 @@
 """Initial conditions."""
 
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 __all__ = ["IC"]
 
 import numpy as np
diff --git a/deepxde/losses.py b/deepxde/losses.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 from . import backend as bkd
 from . import config
 from .backend import tf
diff --git a/deepxde/metrics.py b/deepxde/metrics.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import numpy as np
 from sklearn import metrics
 
diff --git a/deepxde/model.py b/deepxde/model.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 __all__ = ["Model", "TrainState", "LossHistory"]
 
 
@@ -546,7 +542,7 @@ def predict(self, x, operator=None, callbacks=None):
 
         # operator is not None
         if utils.get_num_args(operator) == 3:
-            auxiliary_vars = self.data.auxiliary_var_fn(x).astype(config.real(np))
+            aux_vars = self.data.auxiliary_var_fn(x).astype(config.real(np))
         if backend_name == "tensorflow.compat.v1":
             if utils.get_num_args(operator) == 2:
                 op = operator(self.net.inputs, self.net.outputs)
@@ -555,7 +551,7 @@ def predict(self, x, operator=None, callbacks=None):
                 op = operator(
                     self.net.inputs, self.net.outputs, self.net.auxiliary_vars
                 )
-                feed_dict = self.net.feed_dict(False, x, auxiliary_vars=auxiliary_vars)
+                feed_dict = self.net.feed_dict(False, x, auxiliary_vars=aux_vars)
             y = self.sess.run(op, feed_dict=feed_dict)
         elif backend_name == "tensorflow":
             if utils.get_num_args(operator) == 2:
@@ -570,7 +566,7 @@ def op(inputs):
                 @tf.function
                 def op(inputs):
                     y = self.net(inputs)
-                    return operator(inputs, y, auxiliary_vars)
+                    return operator(inputs, y, aux_vars)
 
             y = op(x)
             y = utils.to_numpy(y)
@@ -583,7 +579,7 @@ def op(inputs):
                 y = operator(inputs, outputs)
             elif utils.get_num_args(operator) == 3:
                 # TODO: Pytorch backend Implementation of Auxiliary variables.
-                # y = operator(inputs, outputs, torch.as_tensor(auxiliary_vars))
+                # y = operator(inputs, outputs, torch.as_tensor(aux_vars))
                 raise NotImplementedError(
                     "Model.predict() with auxiliary variable hasn't been implemented for backend pytorch."
                 )
diff --git a/deepxde/nn/activations.py b/deepxde/nn/activations.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 from .. import backend as bkd
 from .. import config
 from ..backend import backend_name, tf
diff --git a/deepxde/nn/initializers.py b/deepxde/nn/initializers.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import math
 
 from .. import config
diff --git a/deepxde/nn/pytorch/__init__.py b/deepxde/nn/pytorch/__init__.py
@@ -1,5 +1,4 @@
 """Package for pytorch NN modules."""
-from __future__ import absolute_import
 
 from .fnn import FNN
 
diff --git a/deepxde/nn/regularizers.py b/deepxde/nn/regularizers.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 from ..backend import tf
 
 
diff --git a/deepxde/nn/tensorflow/__init__.py b/deepxde/nn/tensorflow/__init__.py
@@ -1,5 +1,4 @@
 """Package for tensorflow NN modules."""
-from __future__ import absolute_import
 
 from .deeponet import DeepONetCartesianProd
 from .fnn import FNN
diff --git a/deepxde/nn/tensorflow/deeponet.py b/deepxde/nn/tensorflow/deeponet.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 from .fnn import FNN
 from .nn import NN
 from .. import activations
diff --git a/deepxde/nn/tensorflow/fnn.py b/deepxde/nn/tensorflow/fnn.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 from .nn import NN
 from .. import activations
 from .. import initializers
diff --git a/deepxde/nn/tensorflow/nn.py b/deepxde/nn/tensorflow/nn.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 from ...backend import tf
 
 
diff --git a/deepxde/nn/tensorflow_compat_v1/__init__.py b/deepxde/nn/tensorflow_compat_v1/__init__.py
@@ -1,5 +1,4 @@
 """Package for tensorflow.compat.v1 NN modules."""
-from __future__ import absolute_import
 
 from .bionet import BiONet
 from .deeponet import DeepONet, DeepONetCartesianProd, FourierDeepONetCartesianProd
diff --git a/deepxde/nn/tensorflow_compat_v1/bionet.py b/deepxde/nn/tensorflow_compat_v1/bionet.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 from .nn import NN
 from .. import activations
 from .. import initializers
diff --git a/deepxde/nn/tensorflow_compat_v1/deeponet.py b/deepxde/nn/tensorflow_compat_v1/deeponet.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import numpy as np
 
 from .nn import NN
diff --git a/deepxde/nn/tensorflow_compat_v1/fnn.py b/deepxde/nn/tensorflow_compat_v1/fnn.py
@@ -1,7 +1,3 @@
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
 import math
 
 from .nn import NN
diff --git a/deepxde/nn/tensorflow_compat_v1/mfnn.py b/deepxde/nn/tensorflow_compat_v1/mfnn.py
diff --git a/deepxde/nn/tensorflow_compat_v1/mfonet.py b/deepxde/nn/tensorflow_compat_v1/mfonet.py
diff --git a/deepxde/nn/tensorflow_compat_v1/msffn.py b/deepxde/nn/tensorflow_compat_v1/msffn.py
diff --git a/deepxde/nn/tensorflow_compat_v1/nn.py b/deepxde/nn/tensorflow_compat_v1/nn.py
diff --git a/deepxde/nn/tensorflow_compat_v1/resnet.py b/deepxde/nn/tensorflow_compat_v1/resnet.py
diff --git a/deepxde/optimizers/tensorflow_compat_v1/optimizers.py b/deepxde/optimizers/tensorflow_compat_v1/optimizers.py
diff --git a/deepxde/optimizers/tensorflow_compat_v1/scipy_optimizer.py b/deepxde/optimizers/tensorflow_compat_v1/scipy_optimizer.py
diff --git a/deepxde/postprocessing.py b/deepxde/postprocessing.py
diff --git a/deepxde/real.py b/deepxde/real.py
diff --git a/deepxde/utils/array_ops_compat.py b/deepxde/utils/array_ops_compat.py
diff --git a/deepxde/utils/external.py b/deepxde/utils/external.py
diff --git a/deepxde/utils/internal.py b/deepxde/utils/internal.py
diff --git a/deepxde/utils/tensorflow_compat_v1.py b/deepxde/utils/tensorflow_compat_v1.py

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import absolute_import`
`2`		`-`
`3`	`1`	`from .__about__ import __version__`
`4`	`2`
`5`	`3`	`# Should import backend before importing anything else`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import absolute_import`
`2`		`-`
`3`	`1`	`from .constraint import Constraint`
`4`	`2`	`from .dataset import DataSet`
`5`	`3`	`from .fpde import FPDE`