Skip to content

Update tests to use qiskit_algorithms #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mtreinish merged 10 commits into from
Nov 6, 2023
Merged

Update tests to use qiskit_algorithms #34

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9f40c7d
Update tests to use qiskit_algorithms
ElePT Oct 24, 2023
b2992f3
Update python versions
ElePT Oct 24, 2023
5803f97
Add exception for python 3.10
ElePT Oct 24, 2023
635f24d
Merge branch 'main' into update-algorithms
ElePT Oct 24, 2023
dcb2a21
Skip nature test
ElePT Oct 25, 2023
631fba2
Merge branch 'update-algorithms' of https://github.com/ElePT/qiskit-n…
ElePT Oct 25, 2023
5949ed2
Revert "Skip nature test"
ElePT Oct 26, 2023
e4f469b
Add conditional skip
ElePT Oct 26, 2023
2074421
Update skip rule
ElePT Oct 30, 2023
b7b2328
Merge branch 'main' into update-algorithms
mtreinish Oct 30, 2023
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
6 changes: 3 additions & 3 deletions qiskit_neko/tests/machine_learning/test_neural_network_classifier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"""Tests for quantum neural networks classifier."""
import numpy as np
from ddt import ddt, data
from qiskit.algorithms.optimizers import COBYLA
from qiskit_algorithms.optimizers import COBYLA
from qiskit_algorithms.utils import algorithm_globals
from qiskit.primitives import Sampler as ReferenceSampler
from qiskit.utils import algorithm_globals
from qiskit_aer.primitives import Sampler as AerSampler
from qiskit_machine_learning.algorithms.classifiers import VQC

Expand Down Expand Up @@ -49,7 +49,7 @@ def test_neural_network_classifier(self, implementation):
num_qubits=2,
optimizer=COBYLA(maxiter=100),
sampler=sampler,
initial_point=np.zeros((2, 4)),
initial_point=None,
)

vqc.fit(x, y01)
Expand Down
5 changes: 3 additions & 2 deletions qiskit_neko/tests/nature/test_ground_state_solver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

"""Test ground state solvers."""

from qiskit.algorithms.minimum_eigensolvers import NumPyMinimumEigensolver, VQE
from qiskit.algorithms.optimizers import SLSQP
from qiskit_algorithms import NumPyMinimumEigensolver, VQE
from qiskit_algorithms.optimizers import SLSQP
from qiskit.primitives import Estimator
from qiskit_nature.second_q.algorithms import GroundStateEigensolver
from qiskit_nature.second_q.circuit.library import HartreeFock, UCCSD
Expand Down Expand Up @@ -49,6 +49,7 @@ def test_ground_state_solver(self):
vqe_solver.initial_point = [0.0] * ansatz.num_parameters
calc = GroundStateEigensolver(qubit_mapper, vqe_solver)
result = calc.solve(es_problem)

# Calculate expected result from numpy solver
numpy_solver = NumPyMinimumEigensolver()
np_calc = GroundStateEigensolver(qubit_mapper, numpy_solver)
Expand Down
4 changes: 2 additions & 2 deletions qiskit_neko/tests/primitives/test_vqe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

"""Test primitives with vqe."""

from qiskit.algorithms.minimum_eigensolvers import VQE, SamplingVQE
from qiskit.algorithms.optimizers import SPSA
from qiskit_algorithms import VQE, SamplingVQE
from qiskit_algorithms.optimizers import SPSA
from qiskit.circuit.library import TwoLocal
from qiskit.opflow import PauliSumOp
from qiskit.primitives import BackendEstimator, BackendSampler
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
qiskit-terra
qiskit-algorithms
qiskit-aer
qiskit-nature[pyscf]
qiskit-experiments
Expand Down
3 changes: 2 additions & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ commands =
stestr --test-path ./tests run {posargs}

[testenv:neko]
;exclude nature tests until qiskit_nature 0.7 is released
commands =
stestr run {posargs}
stestr run --exclude-regex 'test_ground_state_solver' {posargs}

@mtreinish mtreinish Oct 25, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it make more sense to have the test in question raise a skip exception or use the skip decorators https://docs.python.org/3/library/unittest.html#skipping-tests-and-expected-failures ?

@ElePT ElePT Oct 26, 2023

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it would. Let me change that


[testenv:lint]
envdir = .tox/lint
Expand Down