Merge branch 'main' into list_backends

This commit is contained in:
BrunoLiegiBastonLiegi
2024-05-03 17:31:52 +02:00
8 changed files with 452 additions and 1422 deletions

4
.envrc
View File

@@ -2,8 +2,8 @@ if ! has nix_direnv_version || ! nix_direnv_version 2.2.1; then
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.1/direnvrc" "sha256-zelF0vLbEl5uaqrfIzbgNzJWGmLzCmYAkInj/LNxvKs=" source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.1/direnvrc" "sha256-zelF0vLbEl5uaqrfIzbgNzJWGmLzCmYAkInj/LNxvKs="
fi fi
nix_direnv_watch_file flake.nix watch_file flake.nix
nix_direnv_watch_file flake.lock watch_file flake.lock
if ! use flake . --impure; then if ! use flake . --impure; then
echo "devenv could not be built. The devenv environment was not loaded. Make the necessary changes to devenv.nix and hit enter to try again." >&2 echo "devenv could not be built. The devenv environment was not loaded. Make the necessary changes to devenv.nix and hit enter to try again." >&2
fi fi

View File

@@ -12,7 +12,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [ubuntu-latest] os: [ubuntu-latest]
python-version: [3.9, "3.10", "3.11"] python-version: [3.9, "3.10", "3.11", "3.12"]
uses: qiboteam/workflows/.github/workflows/deploy-pip-poetry.yml@main uses: qiboteam/workflows/.github/workflows/deploy-pip-poetry.yml@main
with: with:
os: ${{ matrix.os }} os: ${{ matrix.os }}

View File

@@ -29,7 +29,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [ubuntu-latest] os: [ubuntu-latest]
python-version: [3.8, 3.9, "3.10", "3.11"] python-version: [3.9, "3.10", "3.11", "3.12"]
uses: qiboteam/workflows/.github/workflows/rules-poetry.yml@main uses: qiboteam/workflows/.github/workflows/rules-poetry.yml@main
with: with:
os: ${{ matrix.os }} os: ${{ matrix.os }}

View File

@@ -10,7 +10,7 @@ repos:
- id: check-toml - id: check-toml
- id: debug-statements - id: debug-statements
- repo: https://github.com/psf/black - repo: https://github.com/psf/black
rev: 24.3.0 rev: 24.4.2
hooks: hooks:
- id: black - id: black
- repo: https://github.com/pycqa/isort - repo: https://github.com/pycqa/isort

View File

@@ -11,7 +11,6 @@
# #
from pathlib import Path from pathlib import Path
from recommonmark.transform import AutoStructify
from sphinx.ext import apidoc from sphinx.ext import apidoc
import qibotn import qibotn
@@ -45,7 +44,6 @@ extensions = [
"sphinx.ext.napoleon", "sphinx.ext.napoleon",
"sphinx.ext.intersphinx", "sphinx.ext.intersphinx",
"sphinx_copybutton", "sphinx_copybutton",
"recommonmark",
"sphinxcontrib.katex", "sphinxcontrib.katex",
] ]
@@ -91,10 +89,6 @@ html_theme_options = {
], ],
} }
# Adapted this from
# https://github.com/readthedocs/recommonmark/blob/ddd56e7717e9745f11300059e4268e204138a6b1/docs/conf.py
# app setup hook
autodoc_mock_imports = ["cupy", "cuquantum"] autodoc_mock_imports = ["cupy", "cuquantum"]
@@ -107,8 +101,6 @@ def run_apidoc(_):
def setup(app): def setup(app):
app.add_config_value("recommonmark_config", {"enable_eval_rst": True}, True)
app.add_transform(AutoStructify)
app.add_css_file("css/style.css") app.add_css_file("css/style.css")
app.connect("builder-inited", run_apidoc) app.connect("builder-inited", run_apidoc)

18
flake.lock generated
View File

@@ -8,11 +8,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1707004164, "lastModified": 1710144971,
"narHash": "sha256-9Hr8onWtvLk5A8vCEkaE9kxA0D7PR62povFokM1oL5Q=", "narHash": "sha256-CjTOdoBvT/4AQncTL20SDHyJNgsXZjtGbz62yDIUYnM=",
"owner": "cachix", "owner": "cachix",
"repo": "devenv", "repo": "devenv",
"rev": "0e68853bb27981a4ffd7a7225b59ed84f7180fc7", "rev": "6c0bad0045f1e1802f769f7890f6a59504825f4d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -175,11 +175,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1707114737, "lastModified": 1709875392,
"narHash": "sha256-ZXqv2epXAjDjfWbYn+yy4VOmW+C7SuUBoiZkkDoSqA4=", "narHash": "sha256-ZC/8TNR2q8Q+j4vzaW3B8jLS9ZDvss61brFW4VtWr0A=",
"owner": "cachix", "owner": "cachix",
"repo": "nixpkgs-python", "repo": "nixpkgs-python",
"rev": "f34ed02276bc08fe1c91c1bf0ef3589d68028878", "rev": "7296d316153575b8db614ff02dac5b7501a92071",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -222,11 +222,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1707092692, "lastModified": 1710272261,
"narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "faf912b086576fd1a15fca610166c98d47bc667e", "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
"type": "github" "type": "github"
}, },
"original": { "original": {

1826
poetry.lock generated

File diff suppressed because it is too large Load Diff

View File

@@ -20,8 +20,8 @@ classifiers = [
packages = [{ include = "qibotn", from = "src" }] packages = [{ include = "qibotn", from = "src" }]
[tool.poetry.dependencies] [tool.poetry.dependencies]
python = "^3.9,<3.12" python = "^3.9,<3.13"
qibo = "^0.2.4" qibo = { git = "https://github.com/qiboteam/qibo.git" }
quimb = { version = "^1.6.0", extras = ["tensor"] } quimb = { version = "^1.6.0", extras = ["tensor"] }
cupy-cuda11x = { version = "^11.6.0", optional = true } cupy-cuda11x = { version = "^11.6.0", optional = true }
cuquantum-python-cu11 = { version = "^23.3.0", optional = true } cuquantum-python-cu11 = { version = "^23.3.0", optional = true }
@@ -34,15 +34,11 @@ cuda = ["cupy-cuda11x", "cuquantum-python-cu11", "mpi4py"]
optional = true optional = true
[tool.poetry.group.docs.dependencies] [tool.poetry.group.docs.dependencies]
Sphinx = "^5.0.0" Sphinx = "^5.3.0"
furo = "^2023.3.27" furo = "^2023.3.27"
sphinxcontrib-bibtex = "^2.4.1" sphinxcontrib-bibtex = "^2.5.0"
recommonmark = "^0.7.1"
sphinx_markdown_tables = "^0.0.17"
sphinx-copybutton = "^0.5.2" sphinx-copybutton = "^0.5.2"
sphinxcontrib-katex = "^0.9.9" sphinxcontrib-katex = "^0.9.9"
# to prevent Quimb warning
kahypar = "^1.3.5"
[tool.poetry.group.dev.dependencies] [tool.poetry.group.dev.dependencies]
ipython = "^7.0.0" ipython = "^7.0.0"