Modified layers to use .shape instead of len when dealing with Tensor…

…s. (tensorflow#168) Co-authored-by: Michael Broughton <[email protected]>
hongyunnchen · Mar 21, 2020 · 3461d74 · 3461d74
1 parent 260ad7e
commit 3461d74
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/tensorflow_quantum/python/layers/circuit_executors/expectation.py b/tensorflow_quantum/python/layers/circuit_executors/expectation.py
@@ -344,7 +344,7 @@ def call(self,
             if self._w is None:
                 # don't re-add variable.
                 self._w = self.add_weight(name='circuit_learnable_parameters',
-                                          shape=[len(symbol_names)],
+                                          shape=symbol_names.shape,
                                           initializer=initializer)
 
             symbol_values = tf.tile(tf.expand_dims(self._w, axis=0),

diff --git a/tensorflow_quantum/python/layers/circuit_executors/sampled_expectation.py b/tensorflow_quantum/python/layers/circuit_executors/sampled_expectation.py
@@ -382,7 +382,7 @@ def call(self,
             if self._w is None:
                 # don't re-add variable.
                 self._w = self.add_weight(name='circuit_learnable_parameters',
-                                          shape=[len(symbol_names)],
+                                          shape=symbol_names.shape,
                                           initializer=initializer)
 
             symbol_values = tf.tile(tf.expand_dims(self._w, axis=0),

diff --git a/tensorflow_quantum/python/layers/high_level/controlled_pqc.py b/tensorflow_quantum/python/layers/high_level/controlled_pqc.py
@@ -160,11 +160,12 @@ def __init__(self,
             raise TypeError("model_circuit must be a cirq.Circuit object."
                             " Given: ".format(model_circuit))
 
-        self._symbols = tf.constant(
-            list(sorted(util.get_circuit_symbols(model_circuit))))
+        self._symbols_list = list(
+            sorted(util.get_circuit_symbols(model_circuit)))
+        self._symbols = tf.constant([str(x) for x in self._symbols_list])
         self._circuit = util.convert_to_tensor([model_circuit])
 
-        if len(self._symbols) == 0:
+        if len(self._symbols_list) == 0:
             raise ValueError("model_circuit has no sympy.Symbols. Please "
                              "provide a circuit that contains symbols so "
                              "that their values can be trained.")

diff --git a/tensorflow_quantum/python/layers/high_level/pqc.py b/tensorflow_quantum/python/layers/high_level/pqc.py
@@ -180,10 +180,11 @@ def __init__(
         if not isinstance(model_circuit, cirq.Circuit):
             raise TypeError("model_circuit must be a cirq.Circuit object."
                             " Given: {}".format(model_circuit))
-        self._symbols = tf.constant(
-            list(sorted(util.get_circuit_symbols(model_circuit))))
+        self._symbols_list = list(
+            sorted(util.get_circuit_symbols(model_circuit)))
+        self._symbols = tf.constant([str(x) for x in self._symbols_list])
         self._model_circuit = util.convert_to_tensor([model_circuit])
-        if len(self._symbols) == 0:
+        if len(self._symbols_list) == 0:
             raise ValueError("model_circuit has no sympy.Symbols. Please "
                              "provide a circuit that contains symbols so "
                              "that their values can be trained.")
@@ -250,7 +251,7 @@ def __init__(
         # Weight creation is not placed in a Build function because the number
         # of weights is independent of the input shape.
         self.parameters = self.add_weight('parameters',
-                                          shape=[len(self._symbols)],
+                                          shape=self._symbols.shape,
                                           initializer=self.initializer,
                                           regularizer=self.regularizer,
                                           constraint=self.constraint,