Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 16 additions & 0 deletions tensorflow_quantum/core/ops/math_ops/inner_product_grad_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,14 @@ def test_inner_product_grad_inputs(self):
symbol_names, symbol_values_array,
util.convert_to_tensor(other_batch), prev_grad)

with self.assertRaisesRegex(tf.errors.InvalidArgumentError,
'programs must be rank 1. Got rank 0'):
# Circuit tensor is a scalar.
inner_product_op._inner_product_grad(
util.convert_to_tensor(circuit_batch)[0],
symbol_names, symbol_values_array,
util.convert_to_tensor(other_batch), prev_grad)

with self.assertRaisesRegex(tf.errors.InvalidArgumentError,
'symbol_names must be rank 1.'):
# symbol_names tensor has too many dimensions.
Expand All @@ -72,6 +80,14 @@ def test_inner_product_grad_inputs(self):
np.array([symbol_names]), symbol_values_array,
util.convert_to_tensor(other_batch), prev_grad)

with self.assertRaisesRegex(tf.errors.InvalidArgumentError,
'symbol_names must be rank 1. Got rank 0'):
# symbol_names tensor is a scalar.
inner_product_op._inner_product_grad(
util.convert_to_tensor(circuit_batch),
tf.constant(symbol_names[0]), symbol_values_array,
util.convert_to_tensor(other_batch), prev_grad)

with self.assertRaisesRegex(tf.errors.InvalidArgumentError,
'symbol_values must be rank 2.'):
# symbol_values_array tensor has too many dimensions.
Expand Down
7 changes: 7 additions & 0 deletions tensorflow_quantum/core/ops/math_ops/inner_product_op_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,13 @@ def test_inner_product_inputs(self):
util.convert_to_tensor([circuit_batch]), symbol_names,
symbol_values_array, util.convert_to_tensor(other_batch))

with self.assertRaisesRegex(tf.errors.InvalidArgumentError,
'programs must be rank 1. Got rank 0'):
# Circuit tensor is a scalar.
inner_product_op.inner_product(
util.convert_to_tensor(circuit_batch)[0], symbol_names,
symbol_values_array, util.convert_to_tensor(other_batch))

with self.assertRaisesRegex(tf.errors.InvalidArgumentError,
'symbol_names must be rank 1.'):
# symbol_names tensor has too many dimensions.
Expand Down
28 changes: 28 additions & 0 deletions tensorflow_quantum/core/ops/math_ops/simulate_mps_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,14 @@ def test_simulate_mps_1d_expectation_inputs(self):
symbol_values_array,
util.convert_to_tensor([[x] for x in pauli_sums]))

with self.assertRaisesRegex(tf.errors.InvalidArgumentError,
'programs must be rank 1. Got rank 0'):
# Circuit tensor is a scalar.
simulate_mps.mps_1d_expectation(
util.convert_to_tensor(circuit_batch)[0], symbol_names,
symbol_values_array,
util.convert_to_tensor([[x] for x in pauli_sums]))

with self.assertRaisesRegex(tf.errors.InvalidArgumentError,
'symbol_names must be rank 1.'):
# symbol_names tensor has too many dimensions.
Expand Down Expand Up @@ -904,6 +912,26 @@ def test_simulate_mps1d_sampled_expectation_inputs(self):
util.convert_to_tensor([[small_pauli] for _ in pauli_sums]),
num_samples)

def test_simulate_mps1d_sampled_expectation_scalar_programs(self):
"""Make sure sampled expectation op rejects a scalar programs input."""
batch_size = 5
symbol_names = ['alpha']
qubits = cirq.GridQubit.rect(1, 5)
circuit_batch = [
cirq.Circuit(cirq.X(qubits[0])**sympy.Symbol(symbol_names[0]))
for _ in range(batch_size)
]
symbol_values_array = np.full((batch_size, 1), 0.123)
pauli_sums = util.random_pauli_sums(qubits, 3, batch_size)

with self.assertRaisesRegex(tf.errors.InvalidArgumentError,
'programs must be rank 1. Got rank 0'):
simulate_mps.mps_1d_sampled_expectation(
util.convert_to_tensor(circuit_batch)[0], symbol_names,
symbol_values_array,
util.convert_to_tensor([[x] for x in pauli_sums]),
[[10]] * batch_size)

def test_simulate_sampled_mps_1d_expectation_simple(self):
"""Makes sure that the op shows the same result with Cirq."""
n_qubits = 5
Expand Down
5 changes: 5 additions & 0 deletions tensorflow_quantum/core/ops/math_ops/tfq_inner_product.cc
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ class TfqInnerProductOp : public tensorflow::OpKernel {
tensorflow::errors::InvalidArgument(absl::StrCat(
"Expected 4 inputs, got ", num_inputs, " inputs.")));

OP_REQUIRES(context, context->input(0).dims() == 1,
tensorflow::errors::InvalidArgument(
absl::StrCat("programs must be rank 1. Got rank ",
context->input(0).dims(), ".")));

OP_REQUIRES(
context, context->input(3).dims() == 2,
tensorflow::errors::InvalidArgument(absl::StrCat(
Expand Down
10 changes: 10 additions & 0 deletions tensorflow_quantum/core/ops/math_ops/tfq_inner_product_grad.cc
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,16 @@ class TfqInnerProductGradOp : public tensorflow::OpKernel {
tensorflow::errors::InvalidArgument(absl::StrCat(
"Expected 5 inputs, got ", num_inputs, " inputs.")));

OP_REQUIRES(context, context->input(0).dims() == 1,
tensorflow::errors::InvalidArgument(
absl::StrCat("programs must be rank 1. Got rank ",
context->input(0).dims(), ".")));

OP_REQUIRES(context, context->input(1).dims() == 1,
tensorflow::errors::InvalidArgument(
absl::StrCat("symbol_names must be rank 1. Got rank ",
context->input(1).dims(), ".")));

OP_REQUIRES(
context, context->input(3).dims() == 2,
tensorflow::errors::InvalidArgument(absl::StrCat(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ class TfqSimulateMPS1DExpectationOp : public tensorflow::OpKernel {
tensorflow::errors::InvalidArgument(absl::StrCat(
"Expected 4 inputs, got ", num_inputs, " inputs.")));

OP_REQUIRES(context, context->input(0).dims() == 1,
tensorflow::errors::InvalidArgument(
absl::StrCat("programs must be rank 1. Got rank ",
context->input(0).dims(), ".")));

OP_REQUIRES(
context, context->input(3).dims() == 2,
tensorflow::errors::InvalidArgument(absl::StrCat(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,11 @@ class TfqSimulateMPS1DSampledExpectationOp : public tensorflow::OpKernel {
tensorflow::errors::InvalidArgument(absl::StrCat(
"Expected 5 inputs, got ", num_inputs, " inputs.")));

OP_REQUIRES(context, context->input(0).dims() == 1,
tensorflow::errors::InvalidArgument(
absl::StrCat("programs must be rank 1. Got rank ",
context->input(0).dims(), ".")));
Comment thread
mhucka marked this conversation as resolved.
Resolved

OP_REQUIRES(
context, context->input(3).dims() == 2,
tensorflow::errors::InvalidArgument(absl::StrCat(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,14 @@ def test_noisy_expectation_inputs(self):
symbol_values_array,
util.convert_to_tensor([[x] for x in pauli_sums]), num_samples)

with self.assertRaisesRegex(tf.errors.InvalidArgumentError,
'programs must be rank 1. Got rank 0'):
# Circuit tensor is a scalar.
noisy_expectation_op.expectation(
util.convert_to_tensor(circuit_batch)[0], symbol_names,
symbol_values_array,
util.convert_to_tensor([[x] for x in pauli_sums]), num_samples)

with self.assertRaisesRegex(tf.errors.InvalidArgumentError,
'symbol_names must be rank 1.'):
# symbol_names tensor has too many dimensions.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,14 @@ def test_noisy_expectation_inputs(self):
symbol_values_array,
util.convert_to_tensor([[x] for x in pauli_sums]), num_samples)

with self.assertRaisesRegex(tf.errors.InvalidArgumentError,
'programs must be rank 1. Got rank 0'):
# Circuit tensor is a scalar.
noisy_sampled_expectation_op.sampled_expectation(
util.convert_to_tensor(circuit_batch)[0], symbol_names,
symbol_values_array,
util.convert_to_tensor([[x] for x in pauli_sums]), num_samples)

with self.assertRaisesRegex(tf.errors.InvalidArgumentError,
'symbol_names must be rank 1.'):
# symbol_names tensor has too many dimensions.
Expand Down
5 changes: 5 additions & 0 deletions tensorflow_quantum/core/ops/noise/tfq_noisy_expectation.cc
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ class TfqNoisyExpectationOp : public tensorflow::OpKernel {
tensorflow::errors::InvalidArgument(absl::StrCat(
"Expected 5 inputs, got ", num_inputs, " inputs.")));

OP_REQUIRES(context, context->input(0).dims() == 1,
tensorflow::errors::InvalidArgument(
absl::StrCat("programs must be rank 1. Got rank ",
context->input(0).dims(), ".")));
Comment thread
mhucka marked this conversation as resolved.
Resolved

OP_REQUIRES(
context, context->input(3).dims() == 2,
tensorflow::errors::InvalidArgument(absl::StrCat(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ class TfqNoisySampledExpectationOp : public tensorflow::OpKernel {
tensorflow::errors::InvalidArgument(absl::StrCat(
"Expected 5 inputs, got ", num_inputs, " inputs.")));

OP_REQUIRES(context, context->input(0).dims() == 1,
tensorflow::errors::InvalidArgument(
absl::StrCat("programs must be rank 1. Got rank ",
context->input(0).dims(), ".")));
Comment thread
mhucka marked this conversation as resolved.
Resolved

OP_REQUIRES(
context, context->input(3).dims() == 2,
tensorflow::errors::InvalidArgument(absl::StrCat(
Expand Down
7 changes: 6 additions & 1 deletion tensorflow_quantum/core/ops/tfq_adj_grad_op.cc
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,15 @@ class TfqAdjointGradientOp : public tensorflow::OpKernel {
tensorflow::errors::InvalidArgument(absl::StrCat(
"Expected 5 inputs, got ", num_inputs, " inputs.")));

OP_REQUIRES(context, context->input(0).dims() == 1,
tensorflow::errors::InvalidArgument(
absl::StrCat("programs must be rank 1. Got rank ",
context->input(0).dims(), ".")));
Comment thread
mhucka marked this conversation as resolved.
Resolved

OP_REQUIRES(
context, context->input(2).dims() == 2,
tensorflow::errors::InvalidArgument(absl::StrCat(
"symbol_values must be rank 2. Got ", context->input(3).dims())));
"symbol_values must be rank 2. Got ", context->input(2).dims())));

OP_REQUIRES(
context, context->input(3).dims() == 2,
Expand Down
11 changes: 10 additions & 1 deletion tensorflow_quantum/core/ops/tfq_adj_grad_op_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,15 @@ def test_adj_grad_inputs(self):
util.convert_to_tensor([[x] for x in pauli_sums]),
tf.convert_to_tensor(upstream_grads))

with self.assertRaisesRegex(tf.errors.InvalidArgumentError,
'programs must be rank 1. Got rank 0'):
# Circuit tensor is a scalar.
tfq_adj_grad_op.tfq_adj_grad(
util.convert_to_tensor(circuit_batch)[0], symbol_names,
tf.convert_to_tensor(symbol_values_array),
util.convert_to_tensor([[x] for x in pauli_sums]),
tf.convert_to_tensor(upstream_grads))

with self.assertRaisesRegex(tf.errors.InvalidArgumentError,
'symbol_names must be rank 1.'):
# symbol_names tensor has too many dimensions.
Expand All @@ -71,7 +80,7 @@ def test_adj_grad_inputs(self):
tf.convert_to_tensor(upstream_grads))

with self.assertRaisesRegex(tf.errors.InvalidArgumentError,
'symbol_values must be rank 2.'):
'symbol_values must be rank 2. Got 3'):
# symbol_values_array tensor has too many dimensions.
tfq_adj_grad_op.tfq_adj_grad(
util.convert_to_tensor(circuit_batch), symbol_names,
Expand Down
5 changes: 5 additions & 0 deletions tensorflow_quantum/core/ops/tfq_simulate_expectation_op.cc
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@ class TfqSimulateExpectationOp : public tensorflow::OpKernel {
tensorflow::errors::InvalidArgument(absl::StrCat(
"Expected 4 inputs, got ", num_inputs, " inputs.")));

OP_REQUIRES(context, context->input(0).dims() == 1,
tensorflow::errors::InvalidArgument(
absl::StrCat("programs must be rank 1. Got rank ",
context->input(0).dims(), ".")));

OP_REQUIRES(
context, context->input(3).dims() == 2,
tensorflow::errors::InvalidArgument(absl::StrCat(
Expand Down
16 changes: 16 additions & 0 deletions tensorflow_quantum/core/ops/tfq_simulate_ops_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,14 @@ def test_simulate_expectation_inputs(self):
symbol_values_array,
util.convert_to_tensor([[x] for x in pauli_sums]))

with self.assertRaisesRegex(tf.errors.InvalidArgumentError,
'programs must be rank 1. Got rank 0'):
# Circuit tensor is a scalar.
tfq_simulate_ops.tfq_simulate_expectation(
util.convert_to_tensor(circuit_batch)[0], symbol_names,
symbol_values_array,
util.convert_to_tensor([[x] for x in pauli_sums]))

with self.assertRaisesRegex(tf.errors.InvalidArgumentError,
'symbol_names must be rank 1.'):
# symbol_names tensor has too many dimensions.
Expand Down Expand Up @@ -535,6 +543,14 @@ def test_simulate_sampled_expectation_inputs(self):
symbol_values_array,
util.convert_to_tensor([[x] for x in pauli_sums]), num_samples)

with self.assertRaisesRegex(tf.errors.InvalidArgumentError,
'programs must be rank 1. Got rank 0'):
# Circuit tensor is a scalar.
tfq_simulate_ops.tfq_simulate_sampled_expectation(
util.convert_to_tensor(circuit_batch)[0], symbol_names,
symbol_values_array,
util.convert_to_tensor([[x] for x in pauli_sums]), num_samples)

with self.assertRaisesRegex(tf.errors.InvalidArgumentError,
'symbol_names must be rank 1.'):
# symbol_names tensor has too many dimensions.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ class TfqSimulateSampledExpectationOp : public tensorflow::OpKernel {
tensorflow::errors::InvalidArgument(absl::StrCat(
"Expected 5 inputs, got ", num_inputs, " inputs.")));

OP_REQUIRES(context, context->input(0).dims() == 1,
tensorflow::errors::InvalidArgument(
absl::StrCat("programs must be rank 1. Got rank ",
context->input(0).dims(), ".")));
Comment thread
mhucka marked this conversation as resolved.
Resolved

OP_REQUIRES(
context, context->input(3).dims() == 2,
tensorflow::errors::InvalidArgument(absl::StrCat(
Expand Down