Skip to content
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

Separate import from docplex and quantum_provider #311

Merged
merged 6 commits into from
Sep 17, 2024
Merged

Separate import from docplex and quantum_provider #311

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c111556
do not import specific function from docplex module in init file
gcattan Sep 17, 2024
a59cbbb
expose only quantum_provider too
gcattan Sep 17, 2024
953893f
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 17, 2024
26c8211
missing modification in test_utils_mean
gcattan Sep 17, 2024
b770628
group imports
gcattan Sep 17, 2024
079ca54
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 17, 2024
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
Next Next commit
do not import specific function from docplex module in init file
  • Loading branch information
@gcattan
gcattan committed Sep 17, 2024
commit c1115560093510e937cabeb6289a283094461dbc
8 changes: 5 additions & 3 deletions pyriemann_qiskit/classification.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,16 @@
from sklearn.svm import SVC

from .datasets import get_feature_dimension
from .utils import (
get_provider,
get_device,
from .utils.docplex import (
get_simulator,
set_global_optimizer,
ClassicalOptimizer,
NaiveQAOAOptimizer,
)
from .utils.quantum_provider import (
get_provider,
get_device
)
from .utils.distance import (
distance_functions,
qdistance_logeuclid_to_convex_hull,
Expand Down
20 changes: 2 additions & 18 deletions pyriemann_qiskit/utils/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
from . import hyper_params_factory, filtering, preprocessing
from .quantum_provider import get_provider, get_device, get_simulator
from .math import cov_to_corr_matrix, union_of_diff
from .docplex import (
square_cont_mat_var,
square_int_mat_var,
square_bin_mat_var,
ClassicalOptimizer,
NaiveQAOAOptimizer,
QAOACVOptimizer,
set_global_optimizer,
get_global_optimizer,
)
from . import docplex
from .firebase_connector import (
FirebaseConnector,
Cache,
Expand All @@ -32,14 +23,7 @@
"get_simulator",
"cov_to_corr_matrix",
"union_of_diff",
"square_cont_mat_var",
"square_int_mat_var",
"square_bin_mat_var",
"ClassicalOptimizer",
"NaiveQAOAOptimizer",
"QAOACVOptimizer",
"set_global_optimizer",
"get_global_optimizer",
"docplex",
"distance",
"mean",
"FirebaseConnector",
Expand Down
2 changes: 1 addition & 1 deletion tests/test_docplex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import pytest
from docplex.mp.model import Model
from docplex.mp.vartype import ContinuousVarType, IntegerVarType, BinaryVarType
from pyriemann_qiskit.utils import (
from pyriemann_qiskit.utils.docplex import (
square_cont_mat_var,
square_int_mat_var,
square_bin_mat_var,
Expand Down
2 changes: 1 addition & 1 deletion tests/test_utils_distance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import pytest
import numpy as np
from pyriemann_qiskit.utils import (
from pyriemann_qiskit.utils.docplex import (
ClassicalOptimizer,
NaiveQAOAOptimizer,
)
Expand Down