Fixed merge conflicts in skflow

eigen.BUILD

@@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-archive_dir = "eigen-eigen-0a13bf3e579d"
+archive_dir = "eigen-eigen-4b9c7d45d069"
 
 cc_library(
     name = "eigen",

tensorflow/contrib/ffmpeg/OWNERS

@@ -0,0 +1,3 @@
+adarob
+deck
+fredbertsch

tensorflow/contrib/skflow/__init__.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 from python import *

tensorflow/contrib/skflow/__init__.py.orig

@@ -0,0 +1,23 @@
+# Copyright 2016 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+<<<<<<< HEAD
+from __future__ import division, print_function, absolute_import
+=======
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+>>>>>>> 99e298a84775fcfe91ce0e2d40566d4bd00f53f9
+
+from python import *

tensorflow/contrib/skflow/python/__init__.py

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 from skflow import * 

tensorflow/contrib/skflow/python/__init__.py.orig

@@ -0,0 +1,23 @@
+# Copyright 2016 Google Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+<<<<<<< HEAD
+from __future__ import division, print_function, absolute_import
+=======
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+>>>>>>> 99e298a84775fcfe91ce0e2d40566d4bd00f53f9
+
+from skflow import *

tensorflow/contrib/skflow/python/skflow/__init__.py

@@ -13,10 +13,11 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-## Check existance of sklearn and it's version
-
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
+## Check existance of sklearn and it's version
 try:
     import sklearn
 except ImportError:

tensorflow/contrib/skflow/python/skflow/addons/__init__.py

@@ -12,7 +12,8 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 from tensorflow.contrib.skflow.python.skflow.addons.config_addon import ConfigAddon

tensorflow/contrib/skflow/python/skflow/addons/config_addon.py

@@ -12,8 +12,9 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import tensorflow as tf
 

tensorflow/contrib/skflow/python/skflow/estimators/__init__.py

@@ -12,8 +12,9 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 from tensorflow.contrib.skflow.python.skflow.estimators.base import TensorFlowEstimator
 from tensorflow.contrib.skflow.python.skflow.estimators.linear import TensorFlowLinearClassifier

tensorflow/contrib/skflow/python/skflow/estimators/base.py

@@ -12,8 +12,9 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import datetime
 import json

tensorflow/contrib/skflow/python/skflow/estimators/dnn.py

@@ -12,8 +12,9 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 from sklearn.base import ClassifierMixin, RegressorMixin
 

tensorflow/contrib/skflow/python/skflow/estimators/linear.py

@@ -12,8 +12,9 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 from sklearn.base import ClassifierMixin, RegressorMixin
 

tensorflow/contrib/skflow/python/skflow/estimators/rnn.py

@@ -12,8 +12,9 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 from sklearn.base import ClassifierMixin, RegressorMixin
 

tensorflow/contrib/skflow/python/skflow/io/__init__.py

@@ -12,8 +12,9 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 from tensorflow.contrib.skflow.python.skflow.io.pandas_io import *
 from tensorflow.contrib.skflow.python.skflow.io.dask_io import *

tensorflow/contrib/skflow/python/skflow/io/dask_io.py

@@ -12,8 +12,9 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import numpy as np
 

tensorflow/contrib/skflow/python/skflow/io/data_feeder.py

@@ -13,8 +13,9 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import itertools
 import math

tensorflow/contrib/skflow/python/skflow/io/pandas_io.py

@@ -12,8 +12,9 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 try:
     import pandas as pd

tensorflow/contrib/skflow/python/skflow/models.py

@@ -12,8 +12,9 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import tensorflow as tf
 

tensorflow/contrib/skflow/python/skflow/monitors.py

@@ -13,7 +13,9 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import sys
 import numpy as np

tensorflow/contrib/skflow/python/skflow/ops/__init__.py

@@ -12,8 +12,9 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 from tensorflow.contrib.skflow.python.skflow.ops.array_ops import *
 from tensorflow.contrib.skflow.python.skflow.ops.conv_ops import *

tensorflow/contrib/skflow/python/skflow/ops/__init__.py.orig

@@ -0,0 +1,31 @@
+"""Various TensorFlow Ops."""
+#  Copyright 2015-present The Scikit Flow Authors. All Rights Reserved.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+<<<<<<< HEAD
+
+from __future__ import division, print_function, absolute_import
+=======
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+>>>>>>> 99e298a84775fcfe91ce0e2d40566d4bd00f53f9
+
+from tensorflow.contrib.skflow.python.skflow.ops.array_ops import *
+from tensorflow.contrib.skflow.python.skflow.ops.conv_ops import *
+from tensorflow.contrib.skflow.python.skflow.ops.dnn_ops import *
+from tensorflow.contrib.skflow.python.skflow.ops.dropout_ops import *
+from tensorflow.contrib.skflow.python.skflow.ops.embeddings_ops import *
+from tensorflow.contrib.skflow.python.skflow.ops.losses_ops import *
+from tensorflow.contrib.skflow.python.skflow.ops.seq2seq_ops import *
+from tensorflow.contrib.skflow.python.skflow.ops.batch_norm_ops import *

tensorflow/contrib/skflow/python/skflow/ops/array_ops.py

@@ -12,8 +12,9 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import tensorflow as tf
 

tensorflow/contrib/skflow/python/skflow/ops/batch_norm_ops.py

@@ -12,8 +12,9 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import tensorflow as tf
 

tensorflow/contrib/skflow/python/skflow/ops/conv_ops.py

@@ -12,8 +12,9 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import tensorflow as tf
 from .batch_norm_ops import batch_normalize

tensorflow/contrib/skflow/python/skflow/ops/dnn_ops.py

@@ -12,8 +12,9 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import tensorflow as tf
 

tensorflow/contrib/skflow/python/skflow/ops/dropout_ops.py

@@ -12,8 +12,9 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import tensorflow as tf
 

tensorflow/contrib/skflow/python/skflow/ops/embeddings_ops.py

@@ -16,8 +16,9 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import tensorflow as tf
 

tensorflow/contrib/skflow/python/skflow/ops/losses_ops.py

@@ -12,8 +12,9 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import tensorflow as tf
 

tensorflow/contrib/skflow/python/skflow/ops/seq2seq_ops.py

@@ -12,8 +12,9 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import tensorflow as tf
 

tensorflow/contrib/skflow/python/skflow/ops/tests/__init__.py

@@ -11,4 +11,6 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-from __future__ import division, print_function, absolute_import
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function