experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge conflicts with master

Browse Source
This commit is contained in:
Katherine Tian 2020-08-11 02:46:32 +00:00
parent fb3b5e7f39
commit a1e5b65f08
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tensorflow/core/kernels/map_kernels.h
View File

@ -176,8 +176,6 @@ class TensorMapHasKey : public OpKernel {
} }
}; };
<<<<<<< HEAD
template <typename Device> template <typename Device>
Status TensorMapBinaryAdd(OpKernelContext* c, const TensorMap& a, Status TensorMapBinaryAdd(OpKernelContext* c, const TensorMap& a,
const TensorMap& b, TensorMap* out) { const TensorMap& b, TensorMap* out) {
@ -196,7 +194,6 @@ Status TensorMapBinaryAdd(OpKernelContext* c, const TensorMap& a,
return Status::OK(); return Status::OK();
} }
template <typename Device> template <typename Device>
Status TensorMapZerosLike(OpKernelContext* c, const TensorMap& x, TensorMap* y) { Status TensorMapZerosLike(OpKernelContext* c, const TensorMap& x, TensorMap* y) {
for (const std::pair<TensorKey,Tensor>& p : x.tensors()) { for (const std::pair<TensorKey,Tensor>& p : x.tensors()) {
@ -207,9 +204,6 @@ Status TensorMapZerosLike(OpKernelContext* c, const TensorMap& x, TensorMap* y)
return Status::OK(); return Status::OK();
} }
=======
>>>>>>> master
} // namespace tensorflow } // namespace tensorflow
#endif // TENSORFLOW_CORE_KERNELS_MAP_KERNELS_H_ #endif // TENSORFLOW_CORE_KERNELS_MAP_KERNELS_H_

3
tensorflow/python/kernel_tests/map_ops_test.py
View File

@ -207,7 +207,6 @@ class MapOpsTest(test_util.TensorFlowTestCase, parameterized.TestCase):
self.assertAllClose(g3, 7) self.assertAllClose(g3, 7)
del tape del tape
<<<<<<< HEAD
def testDiffKeySameValueGrad(self): def testDiffKeySameValueGrad(self):
with backprop.GradientTape(persistent=True) as tape: with backprop.GradientTape(persistent=True) as tape:
m = map_ops.empty_tensor_map() m = map_ops.empty_tensor_map()
@ -395,8 +394,6 @@ class MapOpsTest(test_util.TensorFlowTestCase, parameterized.TestCase):
s = map_ops.tensor_map_size(m) s = map_ops.tensor_map_size(m)
self.assertAllEqual(s, 0) self.assertAllEqual(s, 0)
self.assertAllClose(e, v) self.assertAllClose(e, v)
=======
>>>>>>> master
if __name__ == "__main__": if __name__ == "__main__":
test.main() test.main()