diff --git a/README.md b/README.md index 1c896dfc..70448e05 100644 --- a/README.md +++ b/README.md @@ -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). diff --git a/scripts/setup-gams.sh b/scripts/setup-gams.sh index 8ce91fca..64309e47 100755 --- a/scripts/setup-gams.sh +++ b/scripts/setup-gams.sh @@ -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 diff --git a/solvers/qiskit/knapsack/knapsack_qiskit.py b/solvers/qiskit/knapsack/knapsack_qiskit.py index ae6416cd..7c27712f 100644 --- a/solvers/qiskit/knapsack/knapsack_qiskit.py +++ b/solvers/qiskit/knapsack/knapsack_qiskit.py @@ -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: @@ -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) diff --git a/solvers/qiskit/knapsack/requirements.txt b/solvers/qiskit/knapsack/requirements.txt index 3f34f649..e42d620d 100644 --- a/solvers/qiskit/knapsack/requirements.txt +++ b/solvers/qiskit/knapsack/requirements.txt @@ -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 diff --git a/solvers/qiskit/materialsimulation/requirements.txt b/solvers/qiskit/materialsimulation/requirements.txt index f67cfe6b..3b430447 100644 --- a/solvers/qiskit/materialsimulation/requirements.txt +++ b/solvers/qiskit/materialsimulation/requirements.txt @@ -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 \ No newline at end of file diff --git a/solvers/qiskit/max-cut/maxCut_qiskit.py b/solvers/qiskit/max-cut/maxCut_qiskit.py index 2cf67fc4..84529daf 100644 --- a/solvers/qiskit/max-cut/maxCut_qiskit.py +++ b/solvers/qiskit/max-cut/maxCut_qiskit.py @@ -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: @@ -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) diff --git a/solvers/qiskit/max-cut/requirements.txt b/solvers/qiskit/max-cut/requirements.txt index 7823972c..d32d0f32 100644 --- a/solvers/qiskit/max-cut/requirements.txt +++ b/solvers/qiskit/max-cut/requirements.txt @@ -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 diff --git a/solvers/qiskit/qubo/qubo_qiskit.py b/solvers/qiskit/qubo/qubo_qiskit.py index d7b3469d..d63e20a0 100644 --- a/solvers/qiskit/qubo/qubo_qiskit.py +++ b/solvers/qiskit/qubo/qubo_qiskit.py @@ -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: @@ -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) diff --git a/solvers/qiskit/qubo/requirements.txt b/solvers/qiskit/qubo/requirements.txt index 04bd3e61..4bb8653e 100644 --- a/solvers/qiskit/qubo/requirements.txt +++ b/solvers/qiskit/qubo/requirements.txt @@ -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 diff --git a/solvers/qrisp/qubo/requirements.txt b/solvers/qrisp/qubo/requirements.txt index 10cb2e71..c3de9c57 100644 --- a/solvers/qrisp/qubo/requirements.txt +++ b/solvers/qrisp/qubo/requirements.txt @@ -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 \ No newline at end of file +gurobipy == 13 # for lp file reading +sympy == 1.12.1 # needed but not specified in qrisp requirements \ No newline at end of file diff --git a/solvers/qrisp/sat/requirements.txt b/solvers/qrisp/sat/requirements.txt index 30f9c9c3..b6c8cce0 100644 --- a/solvers/qrisp/sat/requirements.txt +++ b/solvers/qrisp/sat/requirements.txt @@ -1,3 +1,4 @@ # This file describes the python package requirements for the Qrisp SAT solver qrisp == 0.4.4 -numpy == 1.26.4 \ No newline at end of file +numpy == 1.26.4 +sympy == 1.12.1 # needed but not specified in qrisp requirements \ No newline at end of file diff --git a/solvers/qrisp/vrp/requirements.txt b/solvers/qrisp/vrp/requirements.txt index c7737696..c6f0918b 100644 --- a/solvers/qrisp/vrp/requirements.txt +++ b/solvers/qrisp/vrp/requirements.txt @@ -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 \ No newline at end of file +tsplib95 == 0.7.1 # for tsplib file parsing +sympy == 1.12.1 # needed but not specified in qrisp requirements \ No newline at end of file