From 6e276036228d2d24ab98097d52744994cb815e30 Mon Sep 17 00:00:00 2001
From: "A. Unique TensorFlower" <gardener@tensorflow.org>
Date: Mon, 11 Jul 2016 06:30:38 -0800
Subject: [PATCH] Internal only change. Change: 127084359
---
tensorflow/python/ops/variable_scope.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tensorflow/python/ops/variable_scope.py b/tensorflow/python/ops/variable_scope.py
index 9defc23ac9c..5e16fe4d988 100644
--- a/tensorflow/python/ops/variable_scope.py
+++ b/tensorflow/python/ops/variable_scope.py
@@ -259,7 +259,7 @@ class _VariableStore(object):
shape = tensor_shape.as_shape(shape)
if initializing_from_value:
- shape = initializer.get_shape()
+ shape = shape.merge_with(initializer.get_shape())
if not reuse_without_partition:
if not shape.is_fully_defined():