Skip to content
Merged
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,6 @@ To use this, enable GitHub Actions and configure the following secrets in the Gi
3. Set `DOKKU_DEPLOYMENT_KEY` to the private key generated in step i.

## License
Copyright (c) 2022 - 2023 ProvideQ
Copyright (c) 2022 - 2026 ProvideQ

This project is available under the [MIT License](./LICENSE).
2 changes: 1 addition & 1 deletion scripts/setup-gams.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ apt-get install curl --yes
# iisaa/gams-docker (https://github.com/iiasa/gams-docker/blob/master/Dockerfile, GPL-3.0 licensed)

# Configure the GAMS version here
GAMS_VERSION_RELEASE_MAJOR=49.3
GAMS_VERSION_RELEASE_MAJOR=49.7
GAMS_VERSION_HOTFIX=0

# download the self-extracting archive to /opt/gams/gams.exe and run/extract it
Expand Down
9 changes: 5 additions & 4 deletions solvers/qiskit/knapsack/knapsack_qiskit.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
import sys

# Qiskit
from qiskit.primitives import Sampler
from qiskit_algorithms.optimizers import COBYLA
from qiskit.primitives import StatevectorSampler
from qiskit_optimization.minimum_eigensolvers import QAOA
from qiskit_optimization.optimizers import COBYLA
from qiskit_optimization.algorithms import MinimumEigenOptimizer
from qiskit_optimization.applications import Knapsack
from qiskit_optimization.converters import QuadraticProgramToQubo
from qiskit_algorithms import QAOA


arg_count = len(sys.argv) - 1
if arg_count != 2:
Expand Down Expand Up @@ -47,7 +48,7 @@
# TODO: Sampler() has to be replaces with StatevectorSampler() in newer versions.
# (currently not yet supported by qiskit-optimization)
# TODO: add a dedicated mixer
qaoa_mes = QAOA(sampler=Sampler(), optimizer=COBYLA())
qaoa_mes = QAOA(sampler=StatevectorSampler(), optimizer=COBYLA())
qaoa = MinimumEigenOptimizer(qaoa_mes)

qaoa_result = qaoa.solve(qubo)
Expand Down
4 changes: 2 additions & 2 deletions solvers/qiskit/knapsack/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file describes the python package requirements for the Qiskit Knapsack solver
qiskit == 1.4.2
qiskit-optimization == 0.6.1
qiskit == 2.2.3
qiskit-optimization == 0.7.0

3 changes: 2 additions & 1 deletion solvers/qiskit/materialsimulation/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
qiskit == 1.4.3
qiskit == 1.0.2
qiskit-algorithms == 0.3.1
qiskit-nature == 0.7.2
pyscf == 2.9.0
8 changes: 4 additions & 4 deletions solvers/qiskit/max-cut/maxCut_qiskit.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

# Qiskit
from qiskit.circuit.library import TwoLocal
from qiskit.primitives import Sampler
from qiskit.primitives import StatevectorSampler
from qiskit_optimization.applications import Maxcut
from qiskit_algorithms import SamplingVQE
from qiskit_algorithms.optimizers import SPSA
from qiskit_optimization.minimum_eigensolvers import SamplingVQE
from qiskit_optimization.optimizers import SPSA


#if len(sys.argv) != 3:
Expand Down Expand Up @@ -86,7 +86,7 @@
# construct VQE
optimizer=SPSA(maxiter=300)
ry = TwoLocal(qubitOp.num_qubits, "ry", "cz", reps=5, entanglement="linear")
vqe = SamplingVQE(sampler=Sampler(), ansatz=ry, optimizer=optimizer)
vqe = SamplingVQE(sampler=StatevectorSampler(), ansatz=ry, optimizer=optimizer)

# run VQE
result = vqe.compute_minimum_eigenvalue(qubitOp)
Expand Down
4 changes: 2 additions & 2 deletions solvers/qiskit/max-cut/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file describes the python package requirements for the Qiskit Max-Cut solver
pygmlparser == 1.0.1
qiskit == 1.4.2
qiskit-optimization == 0.6.1
qiskit == 2.2.3
qiskit-optimization == 0.7.0
numpy
networkx
8 changes: 4 additions & 4 deletions solvers/qiskit/qubo/qubo_qiskit.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import sys
from qp_converter import QpConverter

from qiskit.primitives import Sampler
from qiskit_algorithms import QAOA
from qiskit_algorithms.optimizers import COBYLA
from qiskit.primitives import StatevectorSampler
from qiskit_optimization.minimum_eigensolvers import QAOA
from qiskit_optimization.optimizers import COBYLA
from qiskit_optimization.algorithms import MinimumEigenOptimizer

if len(sys.argv) != 3:
Expand All @@ -19,7 +19,7 @@
# TODO: Sampler() has to be replaces with StatevectorSampler() in newer versions.
# (currently not yet supported by qiskit-optimization)
# TODO: add a dedicated mixer
qaoa_mes = QAOA(sampler=Sampler(), optimizer=COBYLA())
qaoa_mes = QAOA(sampler=StatevectorSampler(), optimizer=COBYLA())
qaoa = MinimumEigenOptimizer(qaoa_mes)

qaoa_result = qaoa.solve(qubo)
Expand Down
4 changes: 2 additions & 2 deletions solvers/qiskit/qubo/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# This file describes the python package requirements for the Qiskit QUBO solver
qiskit == 1.4.2
qiskit-optimization == 0.6.1
qiskit == 2.2.3
qiskit-optimization == 0.7.0
3 changes: 2 additions & 1 deletion solvers/qrisp/qubo/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# This file describes the python package requirements for the Qrisp QUBO solver
qrisp == 0.4.4
numpy == 1.26.4
gurobipy == 11.0.1 # for lp file reading
gurobipy == 13 # for lp file reading
sympy == 1.12.1 # needed but not specified in qrisp requirements
3 changes: 2 additions & 1 deletion solvers/qrisp/sat/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# This file describes the python package requirements for the Qrisp SAT solver
qrisp == 0.4.4
numpy == 1.26.4
numpy == 1.26.4
sympy == 1.12.1 # needed but not specified in qrisp requirements
3 changes: 2 additions & 1 deletion solvers/qrisp/vrp/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# This file describes the python package requirements for the Qrisp VRP solver
qrisp == 0.4.4
numpy == 1.26.4
tsplib95 == 0.7.1 # for tsplib file parsing
tsplib95 == 0.7.1 # for tsplib file parsing
sympy == 1.12.1 # needed but not specified in qrisp requirements