Skip to content

Fix merge gone wrong #1014

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.

Sign up for GitHub

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

Merged
martinwicke merged 10 commits into from
Feb 8, 2016
Merged

Fix merge gone wrong #1014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
81cb344
Remove duplicate import
martinwicke Feb 8, 2016
bcefd8e
Remove duplicate import
martinwicke Feb 8, 2016
3cd2b96
Remove duplicate import
martinwicke Feb 8, 2016
f0ad2c1
Remove duplicate import
martinwicke Feb 8, 2016
b285262
Remove duplicate import
martinwicke Feb 8, 2016
aae4438
Remove duplicate import
martinwicke Feb 8, 2016
8415088
Remove duplicate srcs_version
martinwicke Feb 8, 2016
effbc04
Remove duplicate link
martinwicke Feb 8, 2016
b84e9ef
Remove duplicate link
martinwicke Feb 8, 2016
a581a31
Remove duplicate link
martinwicke Feb 8, 2016
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
1 change: 0 additions & 1 deletion tensorflow/core/kernels/serialize_sparse_op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ limitations under the License.
#include <unordered_map>
#include <utility>
#include <vector>
#include <numeric>

#include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/framework/register_types.h"
Expand Down
1 change: 0 additions & 1 deletion tensorflow/core/kernels/sparse_concat_op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ limitations under the License.
#include <unordered_map>
#include <utility>
#include <vector>
#include <numeric>

#include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/framework/register_types.h"
Expand Down
1 change: 0 additions & 1 deletion tensorflow/core/kernels/sparse_reorder_op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ limitations under the License.
#include <numeric>
#include <unordered_map>
#include <utility>
#include <numeric>

#include "tensorflow/core/framework/op_kernel.h"
#include "tensorflow/core/framework/register_types.h"
Expand Down
1 change: 0 additions & 1 deletion tensorflow/core/kernels/sparse_to_dense_op.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ limitations under the License.
#include <string>
#include <unordered_map>
#include <utility>
#include <numeric>

#include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
#include "tensorflow/core/framework/op_kernel.h"
Expand Down
1 change: 0 additions & 1 deletion tensorflow/python/framework/function_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import tensorflow.python.platform
# pylint: enable=unused-import,g-bad-import-order

from six.moves import xrange
import time
import numpy as np
from six.moves import xrange # pylint: disable=redefined-builtin
Expand Down
1 change: 0 additions & 1 deletion tensorflow/python/kernel_tests/py_func_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@

from tensorflow.python.framework import errors
from tensorflow.python.ops import script_ops
from six.moves import xrange


class PyOpTest(tf.test.TestCase):
Expand Down
1 change: 0 additions & 1 deletion tensorflow/python/tools/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ py_binary(
],
srcs_version = "PY2AND3",
main = "graph_metrics.py",
srcs_version = "PY2AND3",
deps = [
"//tensorflow:tensorflow_py",
],
Expand Down
2 changes: 1 addition & 1 deletion tensorflow/python/training/adagrad.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@


class AdagradOptimizer(optimizer.Optimizer):
"""Optimizer that implements the Adagrad algorithm. (http://www.jmlr.org/papers/volume12/duchi11a/duchi11a.pdf)
"""Optimizer that implements the Adagrad algorithm.

See this [paper](http://www.jmlr.org/papers/volume12/duchi11a/duchi11a.pdf).

Expand Down
2 changes: 1 addition & 1 deletion tensorflow/python/training/adam.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@


class AdamOptimizer(optimizer.Optimizer):
"""Optimizer that implements the Adam algorithm (http://arxiv.org/pdf/1412.6980v7.pdf).
"""Optimizer that implements the Adam algorithm.

See this [paper](http://arxiv.org/pdf/1412.6980v7.pdf).

Expand Down
2 changes: 1 addition & 1 deletion tensorflow/python/training/rmsprop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@


class RMSPropOptimizer(optimizer.Optimizer):
"""Optimizer that implements the RMSProp algorithm (http://www.cs.toronto.edu/~tijmen/csc321/slides/lecture_slides_lec6.pdf).
"""Optimizer that implements the RMSProp algorithm.

See the [paper]
(http://www.cs.toronto.edu/~tijmen/csc321/slides/lecture_slides_lec6.pdf).
Expand Down