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

Jump to bottom

Add reference implementation of EstimatorV2 #11227

Merged
merged 69 commits into from
Jan 30, 2024
Merged

Add reference implementation of EstimatorV2 #11227

merged 69 commits into from
Jan 30, 2024

Commits on Nov 21, 2023

  1. Add EstimatorV2

    @ikkoham
    ikkoham committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    0e428a9 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2023

  1. Merge branch 'main' into primitives/estimator-v2

    @ikkoham
    ikkoham authored Nov 22, 2023
    Configuration menu
    Copy the full SHA
    5564603 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. Merge branch 'main' into primitives/estimator-v2

    @ikkoham
    ikkoham authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    14c3ff3 View commit details
    Browse the repository at this point in the history

  2. Update qiskit/primitives/base/base_estimator.py

    @ikkoham
    ikkoham authored Nov 27, 2023
    Configuration menu
    Copy the full SHA
    4698d74 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2023

  1. Merge branch 'main' into primitives/estimator-v2

    @ikkoham
    ikkoham authored Nov 28, 2023
    Configuration menu
    Copy the full SHA
    a074c82 View commit details
    Browse the repository at this point in the history

  2. Use PositiveInt for shots

    @ikkoham
    ikkoham committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    a3d7643 View commit details
    Browse the repository at this point in the history

  3. improve type hint

    @ikkoham
    ikkoham committed Nov 28, 2023
    Configuration menu
    Copy the full SHA
    c18b209 View commit details
    Browse the repository at this point in the history

  4. Update qiskit/primitives/containers/data_bin.py 

    Co-authored-by: Takashi Imamichi <[email protected]>
    @ikkoham @t-imamichi
    ikkoham and t-imamichi authored Nov 28, 2023
    Configuration menu
    Copy the full SHA
    cc27a64 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. remove _run and make run abstractmethod

    @ikkoham
    ikkoham committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    9d59318 View commit details
    Browse the repository at this point in the history

  2. Apply suggestions from code review 

    Co-authored-by: Ian Hincks <[email protected]>
Co-authored-by: Christopher J. Wood <[email protected]>
    @ikkoham @ihincks @chriseclectic
    3 people authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    556aec2 View commit details
    Browse the repository at this point in the history

  3. fix from review comments

    @ikkoham
    ikkoham committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    2325224 View commit details
    Browse the repository at this point in the history

  4. move test/python/primitives/containers

    @ikkoham
    ikkoham committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    200ef36 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into primitives/estimator-v2

    @ikkoham
    ikkoham authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    a679f17 View commit details
    Browse the repository at this point in the history

  6. Apply suggestions from code review 

    Co-authored-by: Takashi Imamichi <[email protected]>
    @ikkoham @t-imamichi
    ikkoham and t-imamichi authored Nov 29, 2023
    Configuration menu
    Copy the full SHA
    55122f4 View commit details
    Browse the repository at this point in the history

  7. update docs

    @ikkoham
    ikkoham committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    9ffda4e View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2023

  1. rename task to pubs

    @ikkoham
    ikkoham committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    8cfc8ff View commit details
    Browse the repository at this point in the history

  2. Pubs -> Pub

    @ikkoham
    ikkoham committed Nov 30, 2023
    Configuration menu
    Copy the full SHA
    18e7395 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2023

  1. make pydantic optional

    @ikkoham
    ikkoham committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    cd5b70f View commit details
    Browse the repository at this point in the history

  2. Apply suggestions from code review 

    Co-authored-by: Ian Hincks <[email protected]>
    @ikkoham @ihincks
    ikkoham and ihincks authored Dec 1, 2023
    Configuration menu
    Copy the full SHA
    f075b4e View commit details
    Browse the repository at this point in the history

  3. Apply suggestions from code review 

    Co-authored-by: Ian Hincks <[email protected]>
    @ikkoham @ihincks
    ikkoham and ihincks authored Dec 1, 2023
    Configuration menu
    Copy the full SHA
    90447be View commit details
    Browse the repository at this point in the history

  4. fix lint

    @ikkoham
    ikkoham committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    18053bd View commit details
    Browse the repository at this point in the history

  5. type hint

    @ikkoham
    ikkoham committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    998547e View commit details
    Browse the repository at this point in the history

  6. fix type hint for python 3.8

    @ikkoham
    ikkoham committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    c3fd89a View commit details
    Browse the repository at this point in the history

  7. improve BindingsArray

    @ikkoham
    ikkoham committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    2bc2655 View commit details
    Browse the repository at this point in the history

  8. fix docs warning

    @ikkoham
    ikkoham committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    dfcc996 View commit details
    Browse the repository at this point in the history

  9. Remove slots=True in dataclass usage. 

    This argument was introduced in Python 3.10, so we cannot use it yet.
We don't expect that this has any performance impacts, it is just being
used here to make it more difficult to mutate.
    @ihincks
    ihincks committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    ce01d8f View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2023

  1. update from review comments

    @ikkoham
    ikkoham committed Dec 2, 2023
    Configuration menu
    Copy the full SHA
    199aeaa View commit details
    Browse the repository at this point in the history

  2. Update qiskit/primitives/containers/estimator_pub.py 

    Co-authored-by: Christopher J. Wood <[email protected]>
    @ikkoham @chriseclectic
    ikkoham and chriseclectic authored Dec 2, 2023
    Configuration menu
    Copy the full SHA
    388d2bf View commit details
    Browse the repository at this point in the history

  3. Update qiskit/primitives/base/base_estimator.py 

    Co-authored-by: Ian Hincks <[email protected]>
    @ikkoham @ihincks
    ikkoham and ihincks authored Dec 2, 2023
    Configuration menu
    Copy the full SHA
    7777dea View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. Merge branch 'main' into primitives/estimator-v2

    @ikkoham
    ikkoham authored Dec 4, 2023
    Configuration menu
    Copy the full SHA
    5d320e9 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2023

  1. Apply suggestions from code review 

    Co-authored-by: Takashi Imamichi <[email protected]>
    @ikkoham @t-imamichi
    ikkoham and t-imamichi authored Dec 19, 2023
    Configuration menu
    Copy the full SHA
    5307922 View commit details
    Browse the repository at this point in the history

  2. lint

    @ikkoham
    ikkoham committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    bcdf842 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2023

  1. Merge branch 'main' into primitives/estimator-v2

    @ikkoham
    ikkoham authored Dec 21, 2023
    Configuration menu
    Copy the full SHA
    b6d9376 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2024

  1. Merge branch 'main' into primitives/estimator-v2

    @ikkoham
    ikkoham authored Jan 4, 2024
    Configuration menu
    Copy the full SHA
    48bddad View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2024

  1. Merge branch 'main' into primitives/estimator-v2

    @ikkoham
    ikkoham authored Jan 9, 2024
    Configuration menu
    Copy the full SHA
    3066fb1 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. Merge branch 'main' into primitives/estimator-v2

    @ikkoham
    ikkoham authored Jan 11, 2024
    Configuration menu
    Copy the full SHA
    4bbb67f View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2024

  1. Add BaseEstimatorV2 class 

    Taken from 11227, but modified to
- remove options from BaseEstimatorV2
- add precision attribute to BaseEstimatorV2 and EstimatorPub
- remove BasePrimitiveV2 and BasePub

Co-Authored-By: Ikko Hamamura <[email protected]>
Co-Authored-By: Ian Hincks <[email protected]>
    @chriseclectic @ikkoham @ihincks
    3 people committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    321cd14 View commit details
    Browse the repository at this point in the history

  2. Fix removal of BasePub

    @chriseclectic
    chriseclectic committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    db9e22a View commit details
    Browse the repository at this point in the history

  3. Remove precision from EstimatorPub

    @chriseclectic
    chriseclectic committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    63ed918 View commit details
    Browse the repository at this point in the history

  4. Add BaseEstimator._make_data_bin() static method

    @ihincks @chriseclectic
    ihincks authored and chriseclectic committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    3db0063 View commit details
    Browse the repository at this point in the history

  5. Apply suggestions from code review 

    Co-authored-by: Ian Hincks <[email protected]>
    @chriseclectic @ihincks
    chriseclectic and ihincks committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    e0101f4 View commit details
    Browse the repository at this point in the history

  6. Apply suggestions from code review 

    Co-authored-by: Ian Hincks <[email protected]>
    @chriseclectic @ihincks
    chriseclectic and ihincks committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    9046da8 View commit details
    Browse the repository at this point in the history

  7. linting

    @chriseclectic
    chriseclectic committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    75ca51c View commit details
    Browse the repository at this point in the history

  8. Move precision to EstimatorPub and Estimator.run

    @chriseclectic
    chriseclectic committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    dea7b3b View commit details
    Browse the repository at this point in the history

  9. Update EstimatorV2 run return type, fix some typos

    @chriseclectic
    chriseclectic committed Jan 16, 2024
    Configuration menu
    Copy the full SHA
    a5d1e55 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2024

  1. Fix some minor problems

    @ihincks
    ihincks committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    b2b74e4 View commit details
    Browse the repository at this point in the history

  2. add tests

    @ihincks
    ihincks committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    3d694ac View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into primitives/estimator-v2

    @ikkoham
    ikkoham authored Jan 17, 2024
    Configuration menu
    Copy the full SHA
    4d917c6 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'primitives/estimator-v2-redux' into primitives/estimato… 

    …r-v2
    @ikkoham
    ikkoham committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    c12bb3c View commit details
    Browse the repository at this point in the history

  5. update

    @ikkoham
    ikkoham committed Jan 17, 2024
    Configuration menu
    Copy the full SHA
    8387f27 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2024

  1. Merge branch 'main' into primitives/estimator-v2

    @ikkoham
    ikkoham authored Jan 18, 2024
    Configuration menu
    Copy the full SHA
    5bb3833 View commit details
    Browse the repository at this point in the history

  2. Apply suggestions from code review 

    Co-authored-by: Ian Hincks <[email protected]>
    @ikkoham @ihincks
    ikkoham and ihincks authored Jan 18, 2024
    Configuration menu
    Copy the full SHA
    1d37ddb View commit details
    Browse the repository at this point in the history

  3. Update qiskit/primitives/statevector_estimator.py 

    Co-authored-by: Ian Hincks <[email protected]>
    @ikkoham @ihincks
    ikkoham and ihincks authored Jan 18, 2024
    Configuration menu
    Copy the full SHA
    a095154 View commit details
    Browse the repository at this point in the history

  4. revert BasePrimitiveV1

    @ikkoham
    ikkoham committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    bfaf4c0 View commit details
    Browse the repository at this point in the history

  5. update

    @ikkoham
    ikkoham committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    105551d View commit details
    Browse the repository at this point in the history

  6. rm base_pub.py

    @ikkoham
    ikkoham committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    47b2302 View commit details
    Browse the repository at this point in the history

  7. options do not have precision

    @ikkoham
    ikkoham committed Jan 18, 2024
    Configuration menu
    Copy the full SHA
    71a814a View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2024

  1. remove Options

    @ikkoham
    ikkoham committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    1aa8e4a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into primitives/estimator-v2

    @ikkoham
    ikkoham authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    d37ce1b View commit details
    Browse the repository at this point in the history

  3. refactoring

    @ikkoham
    ikkoham committed Jan 19, 2024
    Configuration menu
    Copy the full SHA
    c2c97dd View commit details
    Browse the repository at this point in the history

  4. Update qiskit/primitives/statevector_estimator.py

    @ihincks
    ihincks authored Jan 19, 2024
    Configuration menu
    Copy the full SHA
    8e26f18 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2024

  1. Merge branch 'main' into primitives/estimator-v2

    @ikkoham
    ikkoham authored Jan 24, 2024
    Configuration menu
    Copy the full SHA
    49a1275 View commit details
    Browse the repository at this point in the history

  2. add seed

    @ikkoham
    ikkoham committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    f30debb View commit details
    Browse the repository at this point in the history

  3. Update qiskit/primitives/statevector_estimator.py 

    Co-authored-by: Takashi Imamichi <[email protected]>
    @ikkoham @t-imamichi
    ikkoham and t-imamichi authored Jan 24, 2024
    Configuration menu
    Copy the full SHA
    10648a7 View commit details
    Browse the repository at this point in the history

  4. clean

    @ikkoham
    ikkoham committed Jan 24, 2024
    Configuration menu
    Copy the full SHA
    00a7acf View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2024

  1. validate non hermitian

    @ikkoham
    ikkoham committed Jan 25, 2024
    Configuration menu
    Copy the full SHA
    98af76c View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2024

  1. Merge branch 'main' into primitives/estimator-v2

    @ikkoham
    ikkoham authored Jan 26, 2024
    Configuration menu
    Copy the full SHA
    a128546 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2024

  1. Update qiskit/primitives/statevector_estimator.py 

    Co-authored-by: Ian Hincks <[email protected]>
    @ikkoham @ihincks
    ikkoham and ihincks authored Jan 30, 2024
    Configuration menu
    Copy the full SHA
    dbf4363 View commit details
    Browse the repository at this point in the history

  2. black

    @ikkoham
    ikkoham committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    5d2ae1b View commit details
    Browse the repository at this point in the history