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

Merge stable/0.3 into master #76

Merged
merged 64 commits into from
Sep 6, 2023
Merged

Merge stable/0.3 into master #76

merged 64 commits into from
Sep 6, 2023

Conversation

Zhaoyilunnn
Copy link
Collaborator

@Zhaoyilunnn Zhaoyilunnn commented Sep 6, 2023 •
edited
Loading

What changed

There're lots of patches in stable/0.3 branch and it already left behind master by 58 commits. Directly pull request from stable/0.3 to master results in lots of conflicts. Thus I manually merge it into master and open this PR.

Some representative patches include

  1. Fix for this issue: Bug: Submit task asynchronously #50
  2. Small fixes for visualization: 69e5cd6#diff-46c0cf9254b62a2775beb8330c109aa659359067199d5b1f0d0d0ed1433de9d6
  3. Add task database for to help retrieve tasks (This has been merged into master but in wrong directory)31572b0

Test

  1. Unit test
pytest tests/
  1. Send a task to backend and execution successfully finished

Zhaoyilunnn and others added 30 commits August 8, 2023 08:06
@Zhaoyilunnn
Update v0.3.4
6ea2a8c
@Zhaoyilunnn
fix: partial measurement error
e1c56e5
@chensgit169
Merge pull request ScQ-Cloud#51 from Zhaoyilunnn/patch-cbits
b708d3f 
fix: partial measurement error
@chensgit169
fix cbits bug in measure()
357ed3b
@chensgit169
Merge pull request ScQ-Cloud#53 from chensgit169/stable/0.3
bdd6aee 
fix cbits bug in measure()
@chensgit169
merge from my-master branch
f5cdf86
@chensgit169
merge user
4595dc2
@chensgit169
merge task from local master
9e4d156
@chensgit169
merge backends.py from local master
53e2a46
@chensgit169
Revert "merge from my-master branch"
88b76f6 
This reverts commit f5cdf86.
@chensgit169 @Zhaoyilunnn
merge from my-master branch
0e47f00
@chensgit169 @Zhaoyilunnn
merge user
cf649f0
@chensgit169 @Zhaoyilunnn
merge task from local master
c96b317
@chensgit169 @Zhaoyilunnn
merge backends.py from local master
325d124
@chensgit169 @Zhaoyilunnn
Revert "merge from my-master branch"
46981a6 
This reverts commit f5cdf86.
@chensgit169
fix typing style not supported by python3.8
9517041
@Zhaoyilunnn
update 0.3.5
f185b6a
@chensgit169
fix measures problem in retrieve
8403899
@chensgit169
fix measures problem in retrieve
4be2d01
@chensgit169
fix measures problem in retrieve
f1afb07
@chensgit169
fix measures problem in retrieve
db2c8f5
@chensgit169
Merge remote-tracking branch 'origin/stable/0.3' into stable/0.3
b462bcc 
# Conflicts:
#	src/quafu/tasks/tasks.py
@chensgit169
recover indexed_cbits and squeezed_cbits
45eee21
@chensgit169 @Zhaoyilunnn
merge from my-master branch
1b8f9c3
@chensgit169 @Zhaoyilunnn
Revert "merge from my-master branch"
86bce76 
This reverts commit f5cdf86.
@chensgit169 @Zhaoyilunnn
fix typing style not supported by python3.8
3068188
@chensgit169 @Zhaoyilunnn
fix measures problem in retrieve
6893686
@chensgit169 @Zhaoyilunnn
fix measures problem in retrieve
60874c1
@chensgit169 @Zhaoyilunnn
fix measures problem in retrieve
647e0fc
@chensgit169 @Zhaoyilunnn
fix measures problem in retrieve
6d60051
chensgit169 and others added 28 commits August 22, 2023 20:39
@chensgit169 @Zhaoyilunnn
fix cbits subscript
d00167c
@chensgit169
some small fix
cd197d6
@chensgit169
Merge branch 'ScQ-Cloud:stable/0.3' into stable/0.3
6cf094e
@chensgit169
fix name error of PhaseGate
bf888c6
@chensgit169
Merge remote-tracking branch 'origin/stable/0.3' into stable/0.3
8938296
@chensgit169
correct '>' -> '>='
f4f25b8
@chensgit169 @Zhaoyilunnn
some small fix
12bf4a2
@chensgit169 @Zhaoyilunnn
fix name error of PhaseGate
8bd86f6
@chensgit169 @Zhaoyilunnn
correct '>' -> '>='
b7012b1
@chensgit169
fix name error of PhaseGate
69e5cd6
@chensgit169
delete local test lines
f2fcc99
@chensgit169
fix status code
f8b7498 
Use ``quafu_status`` as status code of quafu backends, check response.status_code earlier. Perhaps still some TODOs.
@chensgit169
Merge remote-tracking branch 'origin/stable/0.3' into stable/0.3
8310d1e
@chensgit169
Merge branch 'stable/0.3' into stable/0.3
a603edd
@chensgit169
Merge pull request #3 from ScQ-Cloud/stable/0.3
830b577 
Stable/0.3: fix status code
@chensgit169
Add TaskDatabase
60ba527
@chensgit169 @Zhaoyilunnn
Add TaskDatabase
31572b0
@Zhaoyilunnn
feat: restructure directory
7f2cc8b
@Zhaoyilunnn
fix: remove a unnecessary comment
3522861
@chensgit169
pull from master
26fd311
@chensgit169
some error corrected in master branch before
2ba05ba
@Zhaoyilunnn
Merge remote-tracking branch 'upstream/master'
f0503b8
@Zhaoyilunnn
feat: Hamiltonian demo
d350b4c
@chensgit169
set default send_time=None to allow insert data from Task.send_hi…
047439d 
…story
@chensgit169
Merge branch 'stable/0.3' into stable/0.3
295a310
@Zhaoyilunnn
Merge pull request ScQ-Cloud#72 from chensgit169/stable/0.3
12414af 
Stable/0.3: correct some errors
@Zhaoyilunnn
Merge remote-tracking branch 'upstream/master'
dae296a
@Zhaoyilunnn
Merge branch 'stable/0.3'
f5c814f
@chensgit169 chensgit169 merged commit 3a1ef2c into ScQ-Cloud:master Sep 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chensgit169 chensgit169 chensgit169 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Zhaoyilunnn @chensgit169