1111#include " optimizer.h"
1212#include < utility>
1313
14- using namespace cudaqx ;
15-
1614namespace cudaq ::solvers {
1715
1816// / @brief A vqe_result encapsulates all the data produced
@@ -47,7 +45,7 @@ static inline vqe_result vqe(QuantumKernel &&kernel, const spin_op &hamiltonian,
4745 optim::optimizer &optimizer,
4846 observe_gradient &gradient,
4947 const std::vector<double > &initial_parameters,
50- heterogeneous_map options = heterogeneous_map()) {
48+ cudaqx:: heterogeneous_map options = cudaqx:: heterogeneous_map()) {
5149 if (!optimizer.requiresGradients ())
5250 throw std::runtime_error (" [vqe] provided optimizer does not require "
5351 " gradients, yet gradient instance provided." );
@@ -83,13 +81,13 @@ static inline vqe_result vqe(QuantumKernel &&kernel, const spin_op &hamiltonian,
8381 const std::string &optName,
8482 const std::string &gradName,
8583 const std::vector<double > &initial_parameters,
86- heterogeneous_map options = heterogeneous_map()) {
84+ cudaqx:: heterogeneous_map options = cudaqx:: heterogeneous_map()) {
8785
8886 if (!cudaq::optim::optimizer::is_registered (optName))
8987 throw std::runtime_error (" provided optimizer is not valid." );
9088
9189 if (!cudaq::observe_gradient::is_registered (gradName))
92- throw std::runtime_error (" provided optimizer is not valid." );
90+ throw std::runtime_error (" provided gradient strategy is not valid." );
9391
9492 auto optimizer = cudaq::optim::optimizer::get (optName);
9593 auto gradient = cudaq::observe_gradient::get (gradName, kernel, hamiltonian);
@@ -128,7 +126,7 @@ template <typename QuantumKernel>
128126static inline vqe_result vqe (QuantumKernel &&kernel, const spin_op &hamiltonian,
129127 const std::string &optName,
130128 const std::vector<double > &initial_parameters,
131- heterogeneous_map options = heterogeneous_map()) {
129+ cudaqx:: heterogeneous_map options = cudaqx:: heterogeneous_map()) {
132130
133131 if (!cudaq::optim::optimizer::is_registered (optName))
134132 throw std::runtime_error (" provided optimizer is not valid." );
@@ -166,7 +164,7 @@ static inline vqe_result vqe(QuantumKernel &&kernel, const spin_op &hamiltonian,
166164 const std::string &optName,
167165 observe_gradient &gradient,
168166 const std::vector<double > &initial_parameters,
169- heterogeneous_map options = heterogeneous_map()) {
167+ cudaqx:: heterogeneous_map options = cudaqx:: heterogeneous_map()) {
170168
171169 if (!cudaq::optim::optimizer::is_registered (optName))
172170 throw std::runtime_error (" provided optimizer is not valid." );
@@ -207,10 +205,10 @@ static inline vqe_result vqe(QuantumKernel &&kernel, const spin_op &hamiltonian,
207205 optim::optimizer &optimizer,
208206 const std::string &gradName,
209207 const std::vector<double > &initial_parameters,
210- heterogeneous_map options = heterogeneous_map()) {
208+ cudaqx:: heterogeneous_map options = cudaqx:: heterogeneous_map()) {
211209
212210 if (!cudaq::observe_gradient::is_registered (gradName))
213- throw std::runtime_error (" provided optimizer is not valid." );
211+ throw std::runtime_error (" provided gradient strategy is not valid." );
214212
215213 auto gradient = cudaq::observe_gradient::get (gradName, kernel, hamiltonian);
216214
@@ -247,11 +245,11 @@ template <typename QuantumKernel>
247245static inline vqe_result vqe (QuantumKernel &&kernel, const spin_op &hamiltonian,
248246 optim::optimizer &optimizer,
249247 const std::vector<double > &initial_parameters,
250- heterogeneous_map options = heterogeneous_map()) {
248+ cudaqx:: heterogeneous_map options = cudaqx:: heterogeneous_map()) {
251249
252250 if (optimizer.requiresGradients ())
253- throw std::runtime_error (" [vqe] provided optimizer does not require "
254- " gradients, yet gradient instance provided." );
251+ throw std::runtime_error (" [vqe] provided optimizer requires "
252+ " gradients, yet no gradient instance provided." );
255253
256254 options.insert (" initial_parameters" , initial_parameters);
257255
@@ -278,7 +276,7 @@ template <typename QuantumKernel>
278276 requires std::invocable<QuantumKernel, std::vector<double >>
279277static inline vqe_result vqe (QuantumKernel &&kernel, const spin_op &hamiltonian,
280278 const std::vector<double > &initial_parameters,
281- heterogeneous_map options = heterogeneous_map()) {
279+ cudaqx:: heterogeneous_map options = cudaqx:: heterogeneous_map()) {
282280
283281 auto optimizer = optim::optimizer::get (" cobyla" );
284282 options.insert (" initial_parameters" , initial_parameters);
@@ -307,7 +305,7 @@ static inline vqe_result vqe(QuantumKernel &&kernel, const spin_op &hamiltonian,
307305 optim::optimizer &optimizer,
308306 const std::vector<double > &initial_parameters,
309307 ArgTranslator &&translator,
310- heterogeneous_map options = heterogeneous_map()) {
308+ cudaqx:: heterogeneous_map options = cudaqx:: heterogeneous_map()) {
311309
312310 if (optimizer.requiresGradients ())
313311 throw std::runtime_error (" [vqe] provided optimizer requires "
@@ -341,7 +339,7 @@ template <typename QuantumKernel, typename ArgTranslator>
341339static inline vqe_result vqe (QuantumKernel &&kernel, const spin_op &hamiltonian,
342340 const std::vector<double > &initial_parameters,
343341 ArgTranslator &&translator,
344- heterogeneous_map options = heterogeneous_map()) {
342+ cudaqx:: heterogeneous_map options = cudaqx:: heterogeneous_map()) {
345343
346344 auto optimizer = optim::optimizer::get (" cobyla" );
347345 options.insert (" initial_parameters" , initial_parameters);
@@ -373,7 +371,7 @@ static inline vqe_result
373371vqe (QuantumKernel &&kernel, const spin_op &hamiltonian,
374372 optim::optimizer &optimizer, observe_gradient &gradient,
375373 const std::vector<double > &initial_parameters, ArgTranslator &&translator,
376- heterogeneous_map options = heterogeneous_map()) {
374+ cudaqx:: heterogeneous_map options = cudaqx:: heterogeneous_map()) {
377375
378376 if (!optimizer.requiresGradients ())
379377 throw std::runtime_error (" [vqe] provided optimizer does not require "
0 commit comments