Skip to content

Commit

Permalink
Merge branch 'main' into transpile-target
Browse files Browse the repository at this point in the history
  • Loading branch information
ElePT committed May 30, 2024
2 parents e384cdb + df37987 commit 6718b9c
Show file tree
Hide file tree
Showing 126 changed files with 3,124 additions and 1,374 deletions.
File renamed without changes.
5 changes: 3 additions & 2 deletions .github/workflows/miri.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,15 @@ jobs:
name: Miri
runs-on: ubuntu-latest
env:
RUSTUP_TOOLCHAIN: nightly
RUSTUP_TOOLCHAIN: nightly-2024-05-24

steps:
- uses: actions/checkout@v4

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@nightly
uses: dtolnay/rust-toolchain@master
with:
toolchain: nightly-2024-05-24
components: miri

- name: Prepare Miri
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches: [ main, 'stable/*' ]
pull_request:
branches: [ main, 'stable/*' ]
merge_group:

concurrency:
group: ${{ github.repository }}-${{ github.ref }}-${{ github.head_ref }}
Expand Down
13 changes: 8 additions & 5 deletions CITATION.bib
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
@misc{Qiskit,
author = {{Qiskit contributors}},
title = {Qiskit: An Open-source Framework for Quantum Computing},
year = {2023},
doi = {10.5281/zenodo.2573505}
@misc{qiskit2024,
title={Quantum computing with {Q}iskit},
author={Javadi-Abhari, Ali and Treinish, Matthew and Krsulich, Kevin and Wood, Christopher J. and Lishman, Jake and Gacon, Julien and Martiel, Simon and Nation, Paul D. and Bishop, Lev S. and Cross, Andrew W. and Johnson, Blake R. and Gambetta, Jay M.},
year={2024},
doi={10.48550/arXiv.2405.08810},
eprint={2405.08810},
archivePrefix={arXiv},
primaryClass={quant-ph}
}
143 changes: 107 additions & 36 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ We provide more detail on [the release and support schedule of Qiskit in our doc
## Reporting a Vulnerability

To report vulnerabilities, you can privately report a potential security issue
via the Github security vulnerabilities feature. This can be done here:
via the GitHub security vulnerabilities feature. This can be done here:

https://github.com/Qiskit/qiskit/security/advisories

Please do **not** open a public issue about a potential security vulnerability.

You can find more details on the security vulnerability feature in the Github
You can find more details on the security vulnerability feature in the GitHub
documentation here:

https://docs.github.com/en/code-security/security-advisories/guidance-on-reporting-and-writing/privately-reporting-a-security-vulnerability
8 changes: 4 additions & 4 deletions crates/accelerate/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ num-traits = "0.2"
num-complex = "0.4"
num-bigint = "0.4"
rustworkx-core = "0.14"
faer = "0.18.2"
itertools = "0.12.1"
faer = "0.19.0"
itertools = "0.13.0"
qiskit-circuit.workspace = true

[dependencies.smallvec]
Expand Down Expand Up @@ -49,9 +49,9 @@ workspace = true
features = ["rayon"]

[dependencies.faer-ext]
version = "0.1.0"
version = "0.2.0"
features = ["ndarray"]

[dependencies.pulp]
version = "0.18.10"
version = "0.18.21"
features = ["macro"]
Loading

0 comments on commit 6718b9c

Please sign in to comment.