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.

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

[Return-types #3] QNode integration, enable and disable functions #2860

Merged
merged 131 commits into from
Aug 5, 2022
Merged
Changes from 1 commit
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
a38477a
draft
antalszava Jul 13, 2022
f3c7f9c
more
antalszava Jul 14, 2022
f9c8767
Merge branch 'master' into refactor_return_shot_vector
antalszava Jul 14, 2022
61b932e
First working version
rmoyard Jul 14, 2022
d6125df
fix a bug; shot vector Counts returns tuple; Autograd interface update
antalszava Jul 14, 2022
6e3b347
Merge branch 'master' into refactor_return_shot_vector
antalszava Jul 14, 2022
7d32c4e
test file
antalszava Jul 14, 2022
8cee2e1
single_measurement
antalszava Jul 14, 2022
e1b7fb1
more tests
antalszava Jul 14, 2022
966cf99
test
rmoyard Jul 15, 2022
39865d4
first multi-meas attempt
antalszava Jul 15, 2022
e5d49b6
multi_measures
antalszava Jul 16, 2022
903e8b3
Update
rmoyard Jul 18, 2022
06579b2
Update
rmoyard Jul 18, 2022
61040ba
Merge branch 'return_types' into refactor_return_shot_vector
rmoyard Jul 18, 2022
8f5053a
merge
rmoyard Jul 18, 2022
005a89f
Update
rmoyard Jul 18, 2022
bf55fe4
Merge branch 'master' into return_types
rmoyard Jul 18, 2022
941da8b
Merge branch 'return_types' into refactor_return_shot_vector
rmoyard Jul 18, 2022
2a615b5
update
rmoyard Jul 19, 2022
9eb4d32
Merge branch 'refactor_return_shot_vector' of https://github.com/Penn…
rmoyard Jul 19, 2022
b86f752
Update
rmoyard Jul 19, 2022
08d9c65
Merge branch 'return_types' of https://github.com/PennyLaneAI/pennyla…
rmoyard Jul 19, 2022
c934fa9
Remove autograd_changes
rmoyard Jul 19, 2022
7f3608c
Comment
rmoyard Jul 20, 2022
465e3d4
Update
rmoyard Jul 20, 2022
57a22d3
Coverage
rmoyard Jul 20, 2022
d31b786
Typo
rmoyard Jul 20, 2022
b5f510c
Add tests
rmoyard Jul 20, 2022
9a1e963
Merge branch 'return_types' into refactor_return_shot_vector
rmoyard Jul 20, 2022
8d8d456
Move tests
rmoyard Jul 20, 2022
8521d50
Revert autograd
rmoyard Jul 20, 2022
48d481a
Unecessary change
rmoyard Jul 20, 2022
b28fdfd
Solve issue
rmoyard Jul 20, 2022
47fcae9
Add statistics new
rmoyard Jul 20, 2022
392dcd7
Merge branch 'master' into return_types
rmoyard Jul 21, 2022
5a15ee1
Merge branch 'master' into return_types
rmoyard Jul 21, 2022
2f0797f
Update tests/test_new_return_types.py
rmoyard Jul 22, 2022
bec1648
Update pennylane/_qubit_device.py
rmoyard Jul 22, 2022
b3cb3a2
:memo: Update from review
rmoyard Jul 22, 2022
8a08be1
:white_check_mark: Update test
rmoyard Jul 22, 2022
2ec1f53
Merge branch 'return_types' of https://github.com/PennyLaneAI/pennyla…
rmoyard Jul 22, 2022
eb471cc
:sparkles: QNode integration
rmoyard Jul 25, 2022
8e0d25f
:recycle: Remove global
rmoyard Jul 25, 2022
9b49eed
Merge branch 'return_types' into refactor_return_shot_vector
antalszava Jul 25, 2022
c6fcf73
[skip-ci]
antalszava Jul 25, 2022
fbda016
:white_check_mark: Add tests for QNode integration
rmoyard Jul 25, 2022
7d344c0
more test cases for probs and sample multi (proj; tensor product)
antalszava Jul 25, 2022
bca05b7
more test cases for probs and sample multi (proj; tensor product)
antalszava Jul 25, 2022
5c04ab0
multi-measure: Counts tests
antalszava Jul 25, 2022
0a4f288
test docstrings
antalszava Jul 25, 2022
6f20785
:sparkles: Support Autograd Jacobian
rmoyard Jul 26, 2022
3623a98
Merge branch 'refactor_return_shot_vector' into return_types_qnode
rmoyard Jul 26, 2022
2d59341
adjust test
antalszava Jul 26, 2022
c5d842d
resolve
antalszava Jul 26, 2022
05982e3
Merge branch 'master' into return_types
antalszava Jul 26, 2022
07e94d7
Merge branch 'return_types' into refactor_return_shot_vector
antalszava Jul 26, 2022
8d43f30
no more is_sampled; probs sample with obs test
antalszava Jul 26, 2022
2dd9717
probs and sample test
antalszava Jul 26, 2022
bc9009b
:sparkles: All interface backprop Jacobian
rmoyard Jul 26, 2022
4b8b579
:white_check_mark: Update tests
rmoyard Jul 26, 2022
74a356d
more tests
antalszava Jul 26, 2022
1de79a2
probs tests
antalszava Jul 26, 2022
e7f9a2c
more more tests
antalszava Jul 27, 2022
fb394bf
refactor
antalszava Jul 27, 2022
bfe3a65
refactor tests
antalszava Jul 27, 2022
0a30c53
update cov; add vanilla counts test (xfail) for finite shots
antalszava Jul 27, 2022
3993fbd
restore statistics docstring
antalszava Jul 27, 2022
5c249de
Merge branch 'refactor_return_shot_vector' into return_types_qnode
rmoyard Jul 27, 2022
3759fd6
Update tests/test_new_return_types.py
rmoyard Jul 27, 2022
8ece6e0
process counts for finite shots
antalszava Jul 27, 2022
82e42ac
create shot_vec_statistics aux method
antalszava Jul 27, 2022
7219640
Apply suggestions from code review
antalszava Jul 27, 2022
0d86242
fix
antalszava Jul 27, 2022
4a5224e
suggestion
antalszava Jul 27, 2022
77286a3
refactors
antalszava Jul 27, 2022
ae35bc5
revert to have squeeze in expval
antalszava Jul 27, 2022
85a8a80
docstring and more tests
antalszava Jul 27, 2022
5f50c11
Update pennylane/interfaces/execution.py
rmoyard Jul 27, 2022
66b7dfc
:white_check_mark: Add default mixed to tests
rmoyard Jul 27, 2022
73e5e3c
Merge branch 'master' into return_types
rmoyard Jul 27, 2022
3a13558
Merge branch 'refactor_return_shot_vector' into return_types_qnode
rmoyard Jul 27, 2022
fbd3120
:white_check_mark: Upddate test due to merge issues
rmoyard Jul 27, 2022
3dfd26e
:bug: Bug introduced due to checking backprop
rmoyard Jul 27, 2022
a656083
:bug: Bug introduced due to checking backprop
rmoyard Jul 27, 2022
3541fb1
Merge branch 'master' into return_types
rmoyard Jul 28, 2022
72f7757
Merge branch 'master' into return_types
rmoyard Jul 28, 2022
84ab21f
:white_check_mark: Separate the tape and qnode tests
rmoyard Jul 28, 2022
badddc1
:recycle: Refactor after review
rmoyard Jul 29, 2022
2544b7a
Merge branch 'master' into return_types
antalszava Jul 29, 2022
7a32588
[Return-types #2] Refactor return types (shot vector cases) (#2815)
antalszava Jul 29, 2022
9dccc8c
resolve
antalszava Jul 29, 2022
80a7d63
Merge branch 'master' into return_types_qnode
rmoyard Aug 2, 2022
828e7e3
Merge branch 'master' into return_types_qnode
rmoyard Aug 2, 2022
dae1e8d
Update
rmoyard Aug 2, 2022
d738dec
:white_check_mark: Update counts
rmoyard Aug 2, 2022
c6a6ca6
Merge branch 'master' into return_types_qnode
rmoyard Aug 2, 2022
7e4819d
:sparkles: Support Tf autograph
rmoyard Aug 3, 2022
5fd794a
:white_check_mark: Update test
rmoyard Aug 3, 2022
8205c80
Merge branch 'master' into return_types_qnode
rmoyard Aug 3, 2022
e3bf149
:sparkles: Fix one element list
rmoyard Aug 3, 2022
64f4ede
Merge branch 'return_types_qnode' of https://github.com/PennyLaneAI/p…
rmoyard Aug 3, 2022
9c488b0
Typo
rmoyard Aug 3, 2022
aa88ef0
Merge branch 'master' into return_types_qnode
rmoyard Aug 3, 2022
3ff4208
Default mixed asarray
rmoyard Aug 3, 2022
0793e99
Merge branch 'return_types_qnode' of https://github.com/PennyLaneAI/p…
rmoyard Aug 3, 2022
fcc12cd
Trigger CI
rmoyard Aug 3, 2022
11b5e86
Trigger CI
rmoyard Aug 4, 2022
c5ef086
:white_check_mark: More tests
rmoyard Aug 4, 2022
f58f2ef
Typo
rmoyard Aug 4, 2022
af935d1
Trigger CI
rmoyard Aug 4, 2022
cb331d6
Update tests/math/test_functions.py
rmoyard Aug 4, 2022
cd4d135
Update tests/math/test_functions.py
rmoyard Aug 4, 2022
3cb7630
:white_check_mark: Rework test suite
rmoyard Aug 4, 2022
d12b3e3
:white_check_mark: Test interfaces forward part
rmoyard Aug 5, 2022
690e7d9
Merge branch 'return_types_qnode' of https://github.com/PennyLaneAI/p…
rmoyard Aug 5, 2022
6bb3591
Update tests/math/test_functions.py
rmoyard Aug 5, 2022
e295776
Typo
rmoyard Aug 5, 2022
7dfcc89
Merge branch 'return_types_qnode' of https://github.com/PennyLaneAI/p…
rmoyard Aug 5, 2022
526c831
Merge branch 'master' into return_types_qnode
rmoyard Aug 5, 2022
ebec1d7
More
rmoyard Aug 5, 2022
0147c49
Merge branch 'master' into return_types_qnode
rmoyard Aug 5, 2022
a1e3d3b
Add runner
rmoyard Aug 5, 2022
efc51c2
Merge branch 'return_types_qnode' of https://github.com/PennyLaneAI/p…
rmoyard Aug 5, 2022
167e717
Return marker and pragma
rmoyard Aug 5, 2022
dd09548
Merge branch 'master' into return_types_qnode
rmoyard Aug 5, 2022
33a3e40
Update .github/workflows/tests.yml
rmoyard Aug 5, 2022
5111af2
Merge branch 'master' into return_types_qnode
rmoyard Aug 5, 2022
a42e31d
Trigger CI
rmoyard Aug 5, 2022
c0c11f8
Merge branch 'return_types_qnode' of https://github.com/PennyLaneAI/p…
rmoyard Aug 5, 2022
45d40da
Trigger CI
rmoyard Aug 5, 2022
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
Prev Previous commit
Next Next commit
suggestion
  • Loading branch information
antalszava committed Jul 27, 2022
commit 4a5224e8eda071aa0f73937d95b8792fe24f18ef
2 changes: 1 addition & 1 deletion pennylane/_qubit_device.py
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ def execute_new(self, circuit, **kwargs):
self.apply(circuit.operations, rotations=circuit.diagonalizing_gates, **kwargs)

# generate computational basis samples
if self.shots is not None or circuit.is_sampled:
if self.shots is not None:
self._samples = self.generate_samples()

# compute the required statistics
Expand Down