Skip to content

Commit 5a6824a

Browse files
committed
Adding pip install excitationsolve to ci_basic. Put ExcSolve behind try import block
1 parent 9695d0f commit 5a6824a

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

.github/workflows/ci_basic.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
pip install -r requirements.txt
3131
# test default simulator against in-house simulator
3232
pip install git+https://github.com/Mikel-Ma/spex@devel
33+
pip install excitationsolve
3334
- name: Lint with flake8
3435
run: |
3536
pip install flake8

src/tequila/optimizers/__init__.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ class _Optimizers:
2626
cls=OptimizerSciPy, minimize=minimize_scipy, methods=OptimizerSciPy.available_methods()
2727
)
2828
INSTALLED_OPTIMIZERS["gd"] = _Optimizers(cls=OptimizerGD, minimize=minimize_gd, methods=OptimizerGD.available_methods())
29-
INSTALLED_OPTIMIZERS["excitationsolve"] = _Optimizers(
30-
cls=OptimizerExcitationSolve, minimize=minimize_excsolve, methods=OptimizerExcitationSolve.available_methods()
31-
)
3229

3330

3431
has_gpyopt = False
@@ -43,6 +40,18 @@ class _Optimizers:
4340
except ImportError:
4441
has_gpyopt = False
4542

43+
has_excsolve = False
44+
try:
45+
from tequila.optimizers.optimizer_excsolve import OptimizerExcitationSolve
46+
from tequila.optimizers.optimizer_excsolve import minimize as minimize_excsolve
47+
48+
INSTALLED_OPTIMIZERS["excitationsolve"] = _Optimizers(
49+
cls=OptimizerExcitationSolve, minimize=minimize_excsolve, methods=OptimizerExcitationSolve.available_methods()
50+
)
51+
has_excsolve = True
52+
except ImportError:
53+
has_excsolve = False
54+
4655

4756
def show_available_optimizers(module=None):
4857
"""

src/tequila/optimizers/optimizer_excsolve.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ def __call__(
111111
res = self.opt.minimize(E, param_values, *args, **kwargs)
112112

113113
if self.save_history:
114-
self.history.energy_calls = self.opt.energies
114+
self.history.energies = self.opt.energies
115+
self.history.angles = self.opt.params
116+
# self.history.gradients = self.opt.energies_shiftste
115117

116118
return SciPyResults(energy=res.fun, history=self.history, variables=res.x, scipy_result=res)
117119

@@ -127,6 +129,7 @@ def minimize(
127129
):
128130
optimize = OptimizerExcitationSolve(
129131
maxiter=maxiter,
132+
save_parameters=True,
130133
*args,
131134
**kwargs,
132135
)

0 commit comments

Comments
 (0)