Shots and feature map exposure #14

gcattan · 2021-11-19T19:16:12Z

Expose the number of shots and the feature map (part of issue #13)

This reverts commit 2ad611f.

This reverts commit 6501bc9.

…9577d00d

sylvchev

Nice work!

qbarthelemy

LGTM! Only minor comments.

pyriemann_qiskit/classification.py

pyriemann_qiskit/utils/hyper_params_factory.py

pyriemann_qiskit/classification.py

Co-authored-by: Quentin Barthélemy <q.barthelemy@gmail.com>

…-qiskit into gc/hyperparams

This reverts commit 78b9677.

This reverts commit f16bd5d.

This reverts commit cd20619.

This reverts commit c771e53.

https://stackoverflow.com/questions/32688688/how-to-write-setup-py-to-include-a-git-repository-as-a-dependency

gcattan · 2021-11-23T19:47:29Z

Thank you for the comments. There is still some problem with the pipeline. I should investigate it deeper, but it seems that git failed to be installed on the doc pipeline. If you have an idea do not hesitate :)

qbarthelemy

Again, some minor remarks.

More generally:

1 - don't merge master in your branch, but rebase your branch on master; otherwise, it is really difficult to understand if modifications com from branch and from master.

2 - to easily update your fork master on the pyRiemann-qiskit master, do:
git remote add upstream https://github.com/pyriemann/pyriemann-qiskit.git
Then, before creating a branch, pull from upstream.

See SciPy guidelines: https://docs.scipy.org/doc/scipy/reference/dev/contributor/development_workflow.html

pyriemann_qiskit/classification.py

pyriemann_qiskit/utils/hyper_params_factory.py

pyriemann_qiskit/classification.py

pyriemann_qiskit/utils/hyper_params_factory.py

qbarthelemy · 2021-11-23T21:50:00Z

There is still some problem with the pipeline. I should investigate it deeper, but it seems that git failed to be installed on the doc pipeline. If you have an idea do not hesitate :)

I think that the problem comes from the new module datasets of pyRiemann, not declared in init file. Its import fails when we are not in pyRiemann package. This should be corrected after merge of
pyRiemann/pyRiemann@91c62e1
@sylvchev

Co-authored-by: Quentin Barthélemy <q.barthelemy@gmail.com>

- correct and improve description of gen_zz_feature_map

qbarthelemy

Great job!
Last comments, then it will be ok for me.

tests/test_utils_hyper_params_factory.py

tests/conftest.py

gcattan · 2021-11-25T09:37:37Z

Thank you for the useful comments! There is still some CI/CD error. I will wait for the aforementioned commit to be merged and come back to this if required :)

qbarthelemy

Thx @gcattan !

gcattan added 8 commits November 19, 2021 19:42

hyperparams object?

2ad611f

Revert "hyperparams object?"

37d03b9

This reverts commit 2ad611f.

expose shots parameter

26681ef

expose feature map

03ece51

push factory

bfd0355

add pooch in setup requirements

6501bc9

Revert "add pooch in setup requirements"

e26db6c

This reverts commit 6501bc9.

update doc requirements according to a3e4e650b83a2a9ccfa5eb9a8b4234d9…

68c7550

…9577d00d

gcattan marked this pull request as ready for review November 19, 2021 21:29

gcattan added 2 commits November 21, 2021 13:33

add documentation for factory

e6efe84

flake8

2339f3d

sylvchev self-requested a review November 21, 2021 23:06

sylvchev assigned gcattan Nov 21, 2021

sylvchev approved these changes Nov 21, 2021

View reviewed changes

qbarthelemy requested changes Nov 22, 2021

View reviewed changes

gcattan and others added 15 commits November 23, 2021 10:06

add gen_zz_feature_map to API

d3edc8c

move import of gen_zz_feature_map to the end of import section

ebab3d0

Improve documentation for gen_zz_feature_map

a75ca04

Update pyriemann_qiskit/classification.py

a1b1133

Co-authored-by: Quentin Barthélemy <q.barthelemy@gmail.com>

Merge branch 'gc/hyperparams' of https://github.com/gcattan/pyRiemann…

5c6069f

…-qiskit into gc/hyperparams

install git in gh action

f16bd5d

approval missing

78b9677

Revert "approval missing"

d5d5564

This reverts commit 78b9677.

Revert "install git in gh action"

cd5db9a

This reverts commit f16bd5d.

update pyriemann requirements?

cd20619

Revert "update pyriemann requirements?"

06d93cf

This reverts commit cd20619.

upgrade pip in doc pipeline

6c51700

typo in ghpages

c771e53

Revert "typo in ghpages"

951aa66

This reverts commit c771e53.

Merge branch 'main' into gc/hyperparams

c728329

gcattan added 4 commits November 23, 2021 20:29

improve ghpages pipeline

835624a

install git

c770884

fix requirement in setup.py

10ea48d

https://stackoverflow.com/questions/32688688/how-to-write-setup-py-to-include-a-git-repository-as-a-dependency

missing -y option

bf8d690

qbarthelemy requested changes Nov 23, 2021

View reviewed changes

gcattan and others added 11 commits November 24, 2021 09:19

Update pyriemann_qiskit/classification.py

d0bf4eb

Co-authored-by: Quentin Barthélemy <q.barthelemy@gmail.com>

Update pyriemann_qiskit/utils/hyper_params_factory.py

4a560ab

Co-authored-by: Quentin Barthélemy <q.barthelemy@gmail.com>

Update pyriemann_qiskit/classification.py

773bfa8

Co-authored-by: Quentin Barthélemy <q.barthelemy@gmail.com>

Update pyriemann_qiskit/utils/hyper_params_factory.py

12e53f6

Co-authored-by: Quentin Barthélemy <q.barthelemy@gmail.com>

Update pyriemann_qiskit/utils/hyper_params_factory.py

995e2bb

Co-authored-by: Quentin Barthélemy <q.barthelemy@gmail.com>

Update pyriemann_qiskit/utils/hyper_params_factory.py

8b7a0ef

Co-authored-by: Quentin Barthélemy <q.barthelemy@gmail.com>

fix typing of entanglement attribute

f70e7be

- add tests

d5a547a

- correct and improve description of gen_zz_feature_map

various refactoring and linting

65a46e9

typo

514b661

generalize -> string value -> value

2c40e49

qbarthelemy requested changes Nov 24, 2021

View reviewed changes

tests/test_utils_hyper_params_factory.py Outdated Show resolved Hide resolved

tests/conftest.py Outdated Show resolved Hide resolved

gcattan added 2 commits November 25, 2021 10:13

rename feature_dim -> n_features

53b16ef

use pytest.raises(ValueError)

e60dab4

qbarthelemy approved these changes Nov 25, 2021

View reviewed changes

qbarthelemy merged commit f945753 into pyRiemann:main Nov 25, 2021

gcattan deleted the gc/hyperparams branch December 3, 2021 19:22

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Shots and feature map exposure #14

Shots and feature map exposure #14

gcattan commented Nov 19, 2021

sylvchev left a comment

qbarthelemy left a comment

gcattan commented Nov 23, 2021

qbarthelemy left a comment •

edited

Loading

qbarthelemy commented Nov 23, 2021 •

edited

Loading

qbarthelemy left a comment

gcattan commented Nov 25, 2021

qbarthelemy left a comment

Shots and feature map exposure #14

Shots and feature map exposure #14

Conversation

gcattan commented Nov 19, 2021

sylvchev left a comment

Choose a reason for hiding this comment

qbarthelemy left a comment

Choose a reason for hiding this comment

gcattan commented Nov 23, 2021

qbarthelemy left a comment • edited Loading

Choose a reason for hiding this comment

qbarthelemy commented Nov 23, 2021 • edited Loading

qbarthelemy left a comment

Choose a reason for hiding this comment

gcattan commented Nov 25, 2021

qbarthelemy left a comment

Choose a reason for hiding this comment

qbarthelemy left a comment •

edited

Loading

qbarthelemy commented Nov 23, 2021 •

edited

Loading