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

merging the master #1162

Closed
wants to merge 106 commits into from
Closed

merging the master #1162

wants to merge 106 commits into from

Conversation

rahula06
Copy link
Contributor

Checklist:

  • Reviewers confirm new code works as expected.
  • Tests are passing.
  • Coverage does not decrease.
  • Documentation is updated.

AlejandroSopena and others added 30 commits October 16, 2023 17:26
renatomello and others added 26 commits January 10, 2024 13:42
@renatomello
Merge branch 'master' into restrict_topology
38aa9bd
@renatomello
Merge branch 'master' into unary_architecture
52dacc5
@renatomello
Merge branch 'master' into cdr
091fe3a
@AlejandroSopena
code review
94bbd4f
@dependabot
Bump jinja2 from 3.1.2 to 3.1.3
0c3830a 
Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.2 to 3.1.3.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst)
- [Commits](pallets/jinja@3.1.2...3.1.3)

---
updated-dependencies:
- dependency-name: jinja2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
@renatomello
Merge pull request #1121 from qiboteam/restrict_topology
3f53ddc 
Restrict connectivity qubits
@renatomello
Merge branch 'master' into unary_architecture
8e96b46
@renatomello
Merge branch 'master' into cdr
8e53dd0
@renatomello
Merge branch 'cdr' of https://github.com/qiboteam/qibo into cdr
b63fdad
@renatomello @MatteoRobbiati
Update src/qibo/models/error_mitigation.py
d851a8e 
Co-authored-by: Matteo Robbiati <[email protected]>
@renatomello @MatteoRobbiati
Update src/qibo/models/error_mitigation.py
7746326 
Co-authored-by: Matteo Robbiati <[email protected]>
@renatomello @MatteoRobbiati
Update src/qibo/models/error_mitigation.py
1002a69 
Co-authored-by: Matteo Robbiati <[email protected]>
@renatomello @MatteoRobbiati
Update src/qibo/models/error_mitigation.py
f05141e 
Co-authored-by: Matteo Robbiati <[email protected]>
@AlejandroSopena
Matteo's suggestions
159707b
@renatomello
Merge pull request #1141 from qiboteam/unary_architecture
f05a722 
Add `diagonal` architectute to deterministic Unary encoder
@renatomello
Merge branch 'master' into cdr
e9c51f5
@renatomello
Merge branch 'cdr' of https://github.com/qiboteam/qibo into cdr
2625ea8
@AlejandroSopena
fix coverage
bee350a
@AlejandroSopena
fix coverage
9cebb48
@AlejandroSopena
Merge pull request #1129 from qiboteam/cdr
3a3dfaa 
Quantum Error Mitigation: Readout, Importance Clifford Sampling
@scarrazza
Merge pull request #1155 from qiboteam/dependabot/pip/jinja2-3.1.3
81f0e01 
Bump jinja2 from 3.1.2 to 3.1.3
@scarrazza
increasing version
ac4e476
@renatomello
improved docstrings
627eab7
@renatomello
another fix
617fc7a
@renatomello
another minor fix
d92d4aa
@renatomello
Merge pull request #1160 from qiboteam/noise_doc
b10eb08 
Minor documentation fixes
@MatteoRobbiati
Copy link
Contributor

MatteoRobbiati commented Jan 24, 2024 •
edited
Loading

I think you can directly merge the master into your own branch, without opening a dedicated PR.
You can do this, e.g., my typing git merge master qcnn_upgrade once you pull the master branch.
Let me know if this was your idea. In that case I would suggest to close this PR.

@rahula06
Copy link
Contributor Author

I think you can directly merge the master into your own branch, without opening a dedicated PR. You can do this, e.g., my typing git merge master qcnn_upgrade once you pull the master branch. Let me know if this was your idea. In that case I would suggest to close this PR.

Yup, I was already at the GitHub webpage so I just merged using one of the options there, didn't know it would open a whole pull request 😅

yep this can be closed

@rahula06 rahula06 closed this Jan 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@rahula06 @MatteoRobbiati @AlejandroSopena @Simone-Bordoni @renatomello @scarrazza