[WIP] Remove qiskit-algorithms dependency

.github/actions/run-tests/action.yml

@@ -40,7 +40,7 @@ runs:
         if [ "${{ inputs.event-name }}" == "schedule" ] || [ "${{ inputs.run-slow }}" == "true" ]; then
           export QISKIT_TESTS="run_slow"
         fi
-        if [ "${{ inputs.os }}" == "ubuntu-latest" ] && [ "${{ inputs.python-version }}" == "3.8" ]; then
+        if [ "${{ inputs.os }}" == "ubuntu-latest" ] && [ "${{ inputs.python-version }}" == "3.9" ]; then
           export PYTHON="coverage3 run --source qiskit_optimization --parallel-mode"
         fi
         stestr --test-path test run 2> >(tee /dev/stderr out.txt > /dev/null)

.github/workflows/deploy-code.yml

@@ -25,7 +25,7 @@ jobs:
       id-token: write
     strategy:
       matrix:
-        python-version: [3.8]
+        python-version: [3.9]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5

.github/workflows/deploy-docs.yml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python-version: [3.8]
+        python-version: [3.9]
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/main.yml

@@ -36,7 +36,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python-version: [3.8]
+        python-version: [3.9]
     steps:
       - name: Print Concurrency Group
         env:
@@ -119,16 +119,16 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        python-version: [3.8, 3.9, '3.10', 3.11, 3.12]
+        python-version: [3.9, '3.10', 3.11, 3.12]
         include:
           - os: macos-latest
-            python-version: 3.8
+            python-version: 3.9
           - os: macos-latest
             python-version: 3.11
           - os: windows-latest
-            python-version: 3.8
+            python-version: 3.9
           - os: windows-latest
-            python-version: 3.11
+            python-version: 3.12
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -197,7 +197,7 @@ jobs:
           fi
           coverage3 combine
           mv .coverage ./ci-artifact-data/opt.dat
-        if: ${{ matrix.os == 'ubuntu-latest' && matrix.python-version == 3.8 }}
+        if: ${{ matrix.os == 'ubuntu-latest' && matrix.python-version == 3.9 }}
         shell: bash
       - uses: actions/upload-artifact@v4
         with:
@@ -225,7 +225,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        python-version: [3.8, 3.11]
+        python-version: [3.9, 3.12]
     steps:
       - uses: actions/checkout@v4
         with:
@@ -290,30 +290,26 @@ jobs:
           cd docs/_build/html
           mkdir artifacts
           tar -zcvf artifacts/tutorials.tar.gz --exclude=./artifacts .
-        if: ${{ matrix.python-version == 3.8 && !startsWith(github.ref, 'refs/heads/stable') && !startsWith(github.base_ref, 'stable/') }}
+        if: ${{ matrix.python-version == 3.9 && !startsWith(github.ref, 'refs/heads/stable') && !startsWith(github.base_ref, 'stable/') }}
         shell: bash
       - name: Run upload stable tutorials
         uses: actions/upload-artifact@v4
         with:
           name: tutorials-stable${{ matrix.python-version }}
           path: docs/_build/html/artifacts/tutorials.tar.gz
-        if: ${{ matrix.python-version == 3.8 && !startsWith(github.ref, 'refs/heads/stable') && !startsWith(github.base_ref, 'stable/') }}
+        if: ${{ matrix.python-version == 3.9 && !startsWith(github.ref, 'refs/heads/stable') && !startsWith(github.base_ref, 'stable/') }}
   Deprecation_Messages_and_Coverage:
     if: github.repository_owner == 'qiskit-community'
     needs: [Checks, Optimization, Tutorials]
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.8]
+        python-version: [3.9]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-      - uses: actions/download-artifact@v4
-        with:
-          name: ubuntu-latest-3.8
-          path: /tmp/o38
       - uses: actions/download-artifact@v4
         with:
           name: ubuntu-latest-3.9
@@ -332,29 +328,29 @@ jobs:
           path: /tmp/o312
       - uses: actions/download-artifact@v4
         with:
-          name: macos-latest-3.8
-          path: /tmp/m38
+          name: macos-latest-3.9
+          path: /tmp/m39
       - uses: actions/download-artifact@v4
         with:
           name: macos-latest-3.11
-          path: /tmp/m311
+          path: /tmp/m312
       - uses: actions/download-artifact@v4
         with:
-          name: windows-latest-3.8
-          path: /tmp/w38
+          name: windows-latest-3.9
+          path: /tmp/w39
       - uses: actions/download-artifact@v4
         with:
-          name: windows-latest-3.11
-          path: /tmp/w311
+          name: windows-latest-3.12
+          path: /tmp/w312
       - name: Install Dependencies
         run: pip install -U coverage coveralls diff-cover
         shell: bash
       - name: Combined Deprecation Messages
         run: |
-          sort -f -u /tmp/o38/opt.dep /tmp/o39/opt.dep /tmp/o310/opt.dep /tmp/o311/opt.dep /tmp/o312/opt.dep /tmp/m38/opt.dep /tmp/m311/opt.dep /tmp/w38/opt.dep /tmp/w311/opt.dep || true
+          sort -f -u /tmp/o39/opt.dep /tmp/o310/opt.dep /tmp/o311/opt.dep /tmp/o312/opt.dep /tmp/m39/opt.dep /tmp/m311/opt.dep /tmp/w39/opt.dep /tmp/w312/opt.dep || true
         shell: bash
       - name: Coverage combine
-        run: coverage3 combine /tmp/o38/opt.dat
+        run: coverage3 combine /tmp/o39/opt.dat
         shell: bash
       - name: Upload to Coveralls
         env:

constraints.txt

@@ -1,2 +1,2 @@
 numpy>=1.20.0
-ipython<8.13;python_version<'3.9'
+jedi<0.19  # to suppress black format error of jedi in tutorials

pyproject.toml

@@ -4,4 +4,4 @@ build-backend = "setuptools.build_meta"
 
 [tool.black]
 line-length = 100
-target-version = ['py38', 'py39', 'py310', 'py311']
+target-version = ['py39', 'py310', 'py311', 'py312']

qiskit_optimization/__init__.py

@@ -26,7 +26,7 @@
 A uniform interface as well as automatic conversion between different problem representations
 allows users to solve problems using a large set of algorithms, from variational quantum algorithms,
 such as the Quantum Approximate Optimization Algorithm
-(:class:`~qiskit_algorithms.QAOA`), to
+(:class:`~qiskit_optimization.minimum_eigensolvers.QAOA`), to
 `Grover Adaptive Search <https://arxiv.org/abs/quant-ph/9607014>`_
 (:class:`~algorithms.GroverOptimizer`), leveraging
 fundamental `minimum eigensolvers
@@ -85,7 +85,7 @@
 
 """
 
-from .exceptions import QiskitOptimizationError, AlgorithmError
+from .exceptions import AlgorithmError, QiskitOptimizationError
 from .infinity import INFINITY  # must be at the top of the file
 from .problems.quadratic_program import QuadraticProgram
 from .version import __version__

qiskit_optimization/algorithms/admm_optimizer.py

@@ -1,6 +1,6 @@
 # This code is part of a Qiskit project.
 #
-# (C) Copyright IBM 2020, 2024.
+# (C) Copyright IBM 2020, 2025.
 #
 # This code is licensed under the Apache License, Version 2.0. You may
 # obtain a copy of this license in the LICENSE.txt file in the root directory
@@ -17,9 +17,9 @@
 from typing import List, Optional, Tuple, cast
 
 import numpy as np
-from qiskit_algorithms import NumPyMinimumEigensolver
 
 from ..converters import MaximizeToMinimize
+from ..minimum_eigensolvers import NumPyMinimumEigensolver
 from ..problems.constraint import Constraint
 from ..problems.linear_constraint import LinearConstraint
 from ..problems.linear_expression import LinearExpression

qiskit_optimization/algorithms/grover_optimizer.py

@@ -1,6 +1,6 @@
 # This code is part of a Qiskit project.
 #
-# (C) Copyright IBM 2020, 2024.
+# (C) Copyright IBM 2020, 2025.
 #
 # This code is licensed under the Apache License, Version 2.0. You may
 # obtain a copy of this license in the LICENSE.txt file in the root directory
@@ -21,19 +21,18 @@
 from qiskit import QuantumCircuit, QuantumRegister
 from qiskit.circuit.library import QuadraticForm
 from qiskit.primitives import BaseSampler
-from qiskit_algorithms import AmplificationProblem
-from qiskit_algorithms.amplitude_amplifiers.grover import Grover
-from qiskit_algorithms.utils import algorithm_globals
 
 from qiskit_optimization.algorithms.optimization_algorithm import (
     OptimizationAlgorithm,
     OptimizationResult,
     OptimizationResultStatus,
     SolutionSample,
 )
+from qiskit_optimization.amplitude_amplifiers.grover import AmplificationProblem, Grover
 from qiskit_optimization.converters import QuadraticProgramConverter, QuadraticProgramToQubo
 from qiskit_optimization.exceptions import QiskitOptimizationError
 from qiskit_optimization.problems import QuadraticProgram, Variable
+from qiskit_optimization.utils import algorithm_globals
 
 logger = logging.getLogger(__name__)
 

qiskit_optimization/algorithms/minimum_eigen_optimizer.py

@@ -15,15 +15,15 @@
 
 import numpy as np
 from qiskit.quantum_info import SparsePauliOp
+
+from ..converters.quadratic_program_to_qubo import QuadraticProgramConverter, QuadraticProgramToQubo
+from ..exceptions import QiskitOptimizationError
 from ..minimum_eigensolvers import (
     NumPyMinimumEigensolver,
     NumPyMinimumEigensolverResult,
     SamplingMinimumEigensolver,
     SamplingMinimumEigensolverResult,
 )
-
-from ..converters.quadratic_program_to_qubo import QuadraticProgramConverter, QuadraticProgramToQubo
-from ..exceptions import QiskitOptimizationError
 from ..problems.quadratic_program import QuadraticProgram, Variable
 from .optimization_algorithm import (
     OptimizationAlgorithm,
@@ -109,7 +109,7 @@ class MinimumEigenOptimizer(OptimizationAlgorithm):
 
     .. code-block::
 
-        from qiskit_algorithms import QAOA
+        from qiskit_optimization.minimum_eigensolvers import QAOA
         from qiskit_optimization.problems import QuadraticProgram
         from qiskit_optimization.algorithms import MinimumEigenOptimizer
         problem = QuadraticProgram()
@@ -222,7 +222,8 @@ def _solve_internal(
                 raise QiskitOptimizationError(
                     "MinimumEigenOptimizer does not support this minimum eigensolver "
                     f"{type(self._min_eigen_solver)}. "
-                    "You can use qiskit_algorithms.SamplingMinimumEigensolver instead."
+                    "You can use qiskit_optimization.minimum_eigensolvers."
+                    "SamplingMinimumEigensolver instead."
                 )
             if eigen_result.eigenstate is not None:
                 raw_samples = self._eigenvector_to_solutions(

qiskit_optimization/algorithms/optimization_algorithm.py

@@ -131,7 +131,9 @@ def __init__(  # pylint: disable=too-many-positional-arguments
                     f"variables: size {len(variables)} {[v.name for v in variables]}"
                 )
             self._x = np.asarray(x)
-            self._variables_dict = dict(zip(self._variable_names, self._x))
+            self._variables_dict = {
+                name: val.item() for name, val in zip(self._variable_names, self._x)
+            }
 
         self._fval = fval
         self._raw_results = raw_results

qiskit_optimization/algorithms/qrao/__init__.py

@@ -1,6 +1,6 @@
 # This code is part of a Qiskit project.
 #
-# (C) Copyright IBM 2023.
+# (C) Copyright IBM 2023, 2025.
 #
 # This code is licensed under the Apache License, Version 2.0. You may
 # obtain a copy of this license in the LICENSE.txt file in the root directory
@@ -48,8 +48,8 @@
 
 .. code-block:: python
 
-    from qiskit_algorithms.optimizers import COBYLA
-    from qiskit_algorithms import VQE
+    from qiskit_optimization.optimizers import COBYLA
+    from qiskit_optimization.minimum_eigensolvers import VQE
     from qiskit.circuit.library import RealAmplitudes
     from qiskit.primitives import Estimator
 

qiskit_optimization/algorithms/qrao/magic_rounding.py

@@ -1,6 +1,6 @@
 # This code is part of a Qiskit project.
 #
-# (C) Copyright IBM 2023, 2024.
+# (C) Copyright IBM 2023, 2025.
 #
 # This code is licensed under the Apache License, Version 2.0. You may
 # obtain a copy of this license in the LICENSE.txt file in the root directory
@@ -19,10 +19,9 @@
 from qiskit import QuantumCircuit
 from qiskit.primitives import BaseSampler
 from qiskit.quantum_info import SparsePauliOp
-from qiskit_algorithms.exceptions import AlgorithmError
 
 from qiskit_optimization.algorithms import OptimizationResultStatus, SolutionSample
-from qiskit_optimization.exceptions import QiskitOptimizationError
+from qiskit_optimization.exceptions import AlgorithmError, QiskitOptimizationError
 
 from .quantum_random_access_encoding import (
     _z_to_21p_qrac_basis_circuit,

qiskit_optimization/algorithms/qrao/quantum_random_access_optimizer.py

@@ -1,6 +1,6 @@
 # This code is part of a Qiskit project.
 #
-# (C) Copyright IBM 2023.
+# (C) Copyright IBM 2023, 2025.
 #
 # This code is licensed under the Apache License, Version 2.0. You may
 # obtain a copy of this license in the LICENSE.txt file in the root directory
@@ -13,16 +13,10 @@
 """Quantum Random Access Optimizer class."""
 from __future__ import annotations
 
-from typing import cast, List
+from typing import List, cast
 
 import numpy as np
 from qiskit import QuantumCircuit
-from qiskit_algorithms import (
-    MinimumEigensolver,
-    MinimumEigensolverResult,
-    NumPyMinimumEigensolverResult,
-    VariationalResult,
-)
 
 from qiskit_optimization.algorithms import (
     OptimizationAlgorithm,
@@ -31,7 +25,13 @@
     SolutionSample,
 )
 from qiskit_optimization.converters import QuadraticProgramToQubo
+from qiskit_optimization.minimum_eigensolvers import (
+    MinimumEigensolver,
+    MinimumEigensolverResult,
+    NumPyMinimumEigensolverResult,
+)
 from qiskit_optimization.problems import QuadraticProgram, Variable
+from qiskit_optimization.variational_algorithm import VariationalResult
 
 from .quantum_random_access_encoding import QuantumRandomAccessEncoding
 from .rounding_common import RoundingContext, RoundingResult, RoundingScheme

qiskit_optimization/algorithms/recursive_minimum_eigen_optimizer.py

@@ -1,6 +1,6 @@
 # This code is part of a Qiskit project.
 #
-# (C) Copyright IBM 2020, 2024.
+# (C) Copyright IBM 2020, 2025.
 #
 # This code is licensed under the Apache License, Version 2.0. You may
 # obtain a copy of this license in the LICENSE.txt file in the root directory
@@ -17,13 +17,13 @@
 from typing import Dict, List, Optional, Tuple, Union, cast
 
 import numpy as np
-from qiskit_algorithms import NumPyMinimumEigensolver
-from qiskit_algorithms.utils.validation import validate_min
 
 from ..converters.quadratic_program_to_qubo import QuadraticProgramConverter, QuadraticProgramToQubo
 from ..exceptions import QiskitOptimizationError
+from ..minimum_eigensolvers import NumPyMinimumEigensolver
 from ..problems import Variable
 from ..problems.quadratic_program import QuadraticProgram
+from ..utils.validation import validate_min
 from .minimum_eigen_optimizer import MinimumEigenOptimizationResult, MinimumEigenOptimizer
 from .optimization_algorithm import (
     OptimizationAlgorithm,
@@ -117,7 +117,7 @@ class RecursiveMinimumEigenOptimizer(OptimizationAlgorithm):
 
     .. code-block:: python
 
-        from qiskit_algorithms import QAOA
+        from qiskit_optimization.minimum_eigensolvers import QAOA
         from qiskit_optimization.problems import QuadraticProgram
         from qiskit_optimization.algorithms import (
             MinimumEigenOptimizer, RecursiveMinimumEigenOptimizer
@@ -161,7 +161,7 @@ def __init__(  # pylint: disable=too-many-positional-arguments
             min_num_vars_optimizer: This optimizer is used after the recursive scheme for the
                 problem with the remaining variables. Default value is
                 :class:`~qiskit_optimization.algorithms.MinimumEigenOptimizer` created on top of
-                :class:`~qiskit_algorithms.NumPyMinimumEigensolver`.
+                :class:`~qiskit_optimization.minimum_eigensolvers.NumPyMinimumEigensolver`.
             penalty: The factor that is used to scale the penalty terms corresponding to linear
                 equality constraints.
             history: Whether the intermediate results are stored.