From 7150e533f4643b0b7baa7947a19135e993c3ec9c Mon Sep 17 00:00:00 2001 From: Owen Lockwood <42878312+lockwo@users.noreply.github.com> Date: Sun, 23 Apr 2023 00:18:15 -0600 Subject: [PATCH 1/4] Update spsa_minimizer.py --- tensorflow_quantum/python/optimizers/spsa_minimizer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tensorflow_quantum/python/optimizers/spsa_minimizer.py b/tensorflow_quantum/python/optimizers/spsa_minimizer.py index 471b46d9e..e65f6cf10 100644 --- a/tensorflow_quantum/python/optimizers/spsa_minimizer.py +++ b/tensorflow_quantum/python/optimizers/spsa_minimizer.py @@ -135,7 +135,7 @@ def minimize(expectation_value_function, tolerance=1e-5, max_iterations=200, alpha=0.602, - learning_rate=1.0, + learning_rate=0.1, perturb=1.0, gamma=0.101, blocking=False, @@ -277,7 +277,7 @@ def _body(state): """Main optimization loop.""" new_learning_rate = learning_rate_init / ( (tf.cast(state.num_iterations + 1, tf.float32) + - 0.01 * tf.cast(max_iterations, tf.float32))**state.alpha) + 0.1 * tf.cast(max_iterations, tf.float32))**state.alpha) new_perturb = perturb_init / (tf.cast(state.num_iterations + 1, tf.float32)**state.gamma) From 7e836322989c9979fae6a2675da1c573856a788b Mon Sep 17 00:00:00 2001 From: Owen Lockwood <42878312+lockwo@users.noreply.github.com> Date: Sun, 23 Apr 2023 00:20:33 -0600 Subject: [PATCH 2/4] Update spsa_minimizer_test.py --- tensorflow_quantum/python/optimizers/spsa_minimizer_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tensorflow_quantum/python/optimizers/spsa_minimizer_test.py b/tensorflow_quantum/python/optimizers/spsa_minimizer_test.py index 1de86d86c..51aa2ac44 100644 --- a/tensorflow_quantum/python/optimizers/spsa_minimizer_test.py +++ b/tensorflow_quantum/python/optimizers/spsa_minimizer_test.py @@ -95,7 +95,7 @@ def test_nonlinear_function_optimization(self): func = lambda x: x[0]**2 + x[1]**2 result = spsa_minimizer.minimize(func, tf.random.uniform(shape=[2])) - self.assertAlmostEqual(func(result.position).numpy(), 0, delta=1e-4) + self.assertAlmostEqual(func(result.position).numpy(), 0, delta=1e-5) self.assertTrue(result.converged) def test_quadratic_function_optimization(self): @@ -106,7 +106,7 @@ def test_quadratic_function_optimization(self): func = lambda x: tf.math.reduce_sum(np.power(x, 2) * coefficient) result = spsa_minimizer.minimize(func, tf.random.uniform(shape=[n])) - self.assertAlmostEqual(func(result.position).numpy(), 0, delta=2e-4) + self.assertAlmostEqual(func(result.position).numpy(), 0, delta=1e-5) self.assertTrue(result.converged) def test_noisy_sin_function_optimization(self): From 06ccfde9969959e16364bc700fcbdd22ad3da320 Mon Sep 17 00:00:00 2001 From: Owen Lockwood <42878312+lockwo@users.noreply.github.com> Date: Sun, 23 Apr 2023 00:22:39 -0600 Subject: [PATCH 3/4] Update spsa_minimizer_test.py --- tensorflow_quantum/python/optimizers/spsa_minimizer_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tensorflow_quantum/python/optimizers/spsa_minimizer_test.py b/tensorflow_quantum/python/optimizers/spsa_minimizer_test.py index 51aa2ac44..270c47de2 100644 --- a/tensorflow_quantum/python/optimizers/spsa_minimizer_test.py +++ b/tensorflow_quantum/python/optimizers/spsa_minimizer_test.py @@ -95,7 +95,7 @@ def test_nonlinear_function_optimization(self): func = lambda x: x[0]**2 + x[1]**2 result = spsa_minimizer.minimize(func, tf.random.uniform(shape=[2])) - self.assertAlmostEqual(func(result.position).numpy(), 0, delta=1e-5) + self.assertAlmostEqual(func(result.position).numpy(), 0, delta=1e-4) self.assertTrue(result.converged) def test_quadratic_function_optimization(self): @@ -106,7 +106,7 @@ def test_quadratic_function_optimization(self): func = lambda x: tf.math.reduce_sum(np.power(x, 2) * coefficient) result = spsa_minimizer.minimize(func, tf.random.uniform(shape=[n])) - self.assertAlmostEqual(func(result.position).numpy(), 0, delta=1e-5) + self.assertAlmostEqual(func(result.position).numpy(), 0, delta=1e-4) self.assertTrue(result.converged) def test_noisy_sin_function_optimization(self): From 159affd1fad9c8a275025955928f2e33346ccd73 Mon Sep 17 00:00:00 2001 From: Owen Lockwood <42878312+lockwo@users.noreply.github.com> Date: Sun, 23 Apr 2023 00:25:34 -0600 Subject: [PATCH 4/4] Update spsa_minimizer.py --- tensorflow_quantum/python/optimizers/spsa_minimizer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tensorflow_quantum/python/optimizers/spsa_minimizer.py b/tensorflow_quantum/python/optimizers/spsa_minimizer.py index e65f6cf10..0b2cc11bd 100644 --- a/tensorflow_quantum/python/optimizers/spsa_minimizer.py +++ b/tensorflow_quantum/python/optimizers/spsa_minimizer.py @@ -135,7 +135,7 @@ def minimize(expectation_value_function, tolerance=1e-5, max_iterations=200, alpha=0.602, - learning_rate=0.1, + learning_rate=0.31, perturb=1.0, gamma=0.101, blocking=False,