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

Mock hardware when testing notebooks #1184

Merged
merged 23 commits into from
May 2, 2024
Merged
Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
076bfb5
Patch least_busy to return FakeManilaV2
frankharkins Apr 16, 2024
77234ce
Change notebook organization
frankharkins Apr 16, 2024
ddb05c9
Use context manager to modify notebooks
frankharkins Apr 16, 2024
fc6829e
FakeManilaV2 -> FakeWashingtonV2
frankharkins Apr 16, 2024
6e28257
Update scripts/nb-tester/test-notebook.py
frankharkins Apr 16, 2024
5e391ac
Use `@contextmanager` decorator
frankharkins Apr 17, 2024
90a348b
Make `submit_jobs` true if `only-unmockable`
frankharkins Apr 17, 2024
c28c165
Merge branch 'main' of https://github.com/Qiskit/documentation into F…
frankharkins Apr 24, 2024
64820eb
(Untested) Add new notebook groups
frankharkins Apr 25, 2024
e4ab1d9
Update help message
frankharkins Apr 26, 2024
dc0eb19
typo
frankharkins Apr 26, 2024
c89e972
Fix problems with fake vs real backend
frankharkins Apr 26, 2024
d969a8e
FakeWashingtonV2 -> FakeKyoto
frankharkins Apr 26, 2024
68d1cba
Merge branch 'main' of https://github.com/Qiskit/documentation into F…
frankharkins Apr 26, 2024
a193345
use variable rather than new function
frankharkins Apr 26, 2024
c72be90
Update README
frankharkins Apr 26, 2024
02e8783
Apply suggestions from code review
frankharkins May 1, 2024
5fce1aa
Merge branch 'main' of https://github.com/Qiskit/documentation into F…
frankharkins May 2, 2024
2106b24
Run all notebooks in cron job
frankharkins May 2, 2024
6096725
`--only-unmockable` -> `--only-submit-jobs`
frankharkins May 2, 2024
a057268
Use `--only-submit-jobs` in cron job
frankharkins May 2, 2024
cbf4fff
Concat lists in separate variable
frankharkins May 2, 2024
ab905db
Improve code
frankharkins May 2, 2024
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
22 changes: 12 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,20 +116,22 @@ You also need to install a few system dependencies: TeX, Poppler, and graphviz.
```

> [!NOTE]
> If your notebook submits hardware jobs to IBM Quantum, you must add it to the
> list `notebooks-that-submit-jobs` in
> [`scripts/nb-tester/notebooks.toml`](scripts/nb-tester/notebooks.toml). This
> is not needed if the notebook only retrieves information.
>
> If your notebook submits hardware jobs to Qiskit Runtime, you must add it to
> [`scripts/nb-tester/notebooks.toml`](scripts/nb-tester/notebooks.toml). If it
> can be run with simulators, i.e., the circuit is not too large, add it to `notebooks_that_submit_jobs`.
> Otherwise, add it to `notebooks_no_mock`.

> If your notebook uses the latex circuit drawer (`qc.draw("latex")`), you must
> add it to the "Check for notebooks that require LaTeX" step in
> `.github/workflows/notebook-test.yml`.

When you make a pull request with a changed notebook, you can get a version of
that notebook that was executed in a uniform environment from CI. To do this,
click "Show all checks" in the info box at the bottom of the pull request page
on GitHub, then choose "Details" for the "Test notebooks" job. From the job
page, click "Summary", then download "Executed notebooks".
When you make a pull request changing a notebook that doesn't submit jobs, you
can get a version of that notebook that was executed in a uniform environment
from CI. To do this, click "Show all checks" in the info box at the bottom of
the pull request page on GitHub, then choose "Details" for the "Test notebooks"
job. From the job page, click "Summary", then download "Executed notebooks".
frankharkins marked this conversation as resolved.
Show resolved Hide resolved
Otherwise, if your notebook does submit jobs, you need to run it locally with
`tox -- --write --submit-jobs <path/to/notebook.ipynb>`.

### Ignoring warnings

Expand Down
8 changes: 6 additions & 2 deletions scripts/nb-tester/notebooks.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ notebooks_exclude = [
"**/.ipynb_checkpoints/**",
]

# The following notebooks submit jobs to IBM Quantum
# The following notebooks submit jobs that can be mocked with a simulator
notebooks_that_submit_jobs = [
"docs/start/hello-world.ipynb",
"tutorials/build-repetition-codes/build-repetition-codes.ipynb",
"tutorials/chsh-inequality/chsh-inequality.ipynb",
"tutorials/grovers-algorithm/grovers.ipynb",
Expand All @@ -18,3 +17,8 @@ notebooks_that_submit_jobs = [
"tutorials/submitting-transpiled-circuits/submitting-transpiled-circuits.ipynb",
"tutorials/variational-quantum-eigensolver/vqe.ipynb",
]

# The following notebooks submit jobs that are too big to mock with a simulator
notebooks_no_mock = [
"docs/start/hello-world.ipynb",
]
84 changes: 65 additions & 19 deletions scripts/nb-tester/qiskit_docs_notebook_tester/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import asyncio
import sys
import textwrap
from contextlib import contextmanager
from dataclasses import dataclass
from datetime import datetime
from pathlib import Path
Expand All @@ -29,11 +30,23 @@
from qiskit_ibm_runtime import QiskitRuntimeService
from squeaky import clean_notebook

# If not submitting jobs, we mock the real backend by prepending this to each notebook
MOCKING_CODE = """\
from qiskit_ibm_runtime import QiskitRuntimeService
from qiskit_ibm_runtime.fake_provider import FakeKyoto

def patched_least_busy(self, *args, **kwarg):
return FakeKyoto()

QiskitRuntimeService.least_busy = patched_least_busy
"""

@dataclass
class Config:
all_notebooks: str
notebooks_exclude: list[str]
notebooks_that_submit_jobs: list[str]
notebooks_no_mock: list[str]

@classmethod
def read(cls, path: str) -> Config:
Expand All @@ -55,7 +68,6 @@ def filter_paths(paths: list[Path], args: argparse.Namespace, config: Config) ->
"""
Filter out any paths we don't want to run, printing messages.
"""
submit_jobs = args.submit_jobs or args.only_submit_jobs
for path in paths:
if path.suffix != ".ipynb":
print(f"ℹ️ Skipping {path}; file is not `.ipynb` format.")
Expand All @@ -67,15 +79,15 @@ def filter_paths(paths: list[Path], args: argparse.Namespace, config: Config) ->
)
continue

if not submit_jobs and matches(path, config.notebooks_that_submit_jobs):
if not args.submit_jobs and matches(path, config.notebooks_no_mock):
print(
f"ℹ️ Skipping {path} as it submits jobs; use the --submit-jobs flag to run it."
f"ℹ️ Skipping {path} as it doesn't work with mock hardware; use the --submit-jobs flag to run it."
)
continue

if args.only_submit_jobs and not matches(path, config.notebooks_that_submit_jobs):
if args.only_submit_jobs and not matches(path, config.notebooks_that_submit_jobs+config.notebooks_no_mock):
Eric-Arellano marked this conversation as resolved.
Show resolved Hide resolved
print(
f"ℹ️ Skipping {path} as it does not submit jobs and the --only-submit-jobs flag is set."
f"ℹ️ Skipping {path} as it doesn't submit jobs and the --only-submit-jobs flag is set."
)
continue

Expand Down Expand Up @@ -119,12 +131,33 @@ def extract_warnings(notebook: nbformat.NotebookNode) -> list[NotebookWarning]:
)
return notebook_warnings

@contextmanager
def patch_runtime(nb: nbformat.NotebookNode, *, should_patch: bool):
if should_patch:
nb.cells.insert(0, nbformat.v4.new_code_cell(source=MOCKING_CODE))
yield
if not should_patch:
return
nb.cells.pop(0)
# Reset execution counts (offset by the MOCKING_CODE cell)
for cell in nb.cells:
if hasattr(cell, "execution_count"):
cell.execution_count -= 1
if not hasattr(cell, "outputs"):
continue
for output in cell.outputs:
if hasattr(output, "execution_count"):
output.execution_count -= 1

async def execute_notebook(path: Path, args: argparse.Namespace) -> bool:
async def execute_notebook(path: Path, args: argparse.Namespace, config: Config) -> bool:
"""
Wrapper function for `_execute_notebook` to print status
Wrapper function for `_execute_notebook` to print status and write result
"""
print(f"▶️ Executing {path}")
is_patched = not args.submit_jobs and matches(path, config.notebooks_that_submit_jobs)
if is_patched:
print(f"▶️ Executing {path} (with least_busy patched to return FakeKyoto)")
else:
print(f"▶️ Executing {path}")
possible_exceptions = (
nbconvert.preprocessors.CellExecutionError,
nbclient.exceptions.CellTimeoutError,
Expand All @@ -143,27 +176,35 @@ async def execute_notebook(path: Path, args: argparse.Namespace) -> bool:
)
return False

print(f"✅ No problems in {path}")
return True
if not args.write:
print(f"✅ No problems in {path}")
return True

if is_patched:
print(f"✅ No problems in {path} (not written as tested with mock backend)")
return True

nbformat.write(nb, path)
print(f"✅ No problems in {path} (written)")
return True

async def _execute_notebook(filepath: Path, args: argparse.Namespace) -> nbformat.NotebookNode:
"""
Use nbconvert to execute notebook.
"""
submit_jobs = args.submit_jobs or args.only_submit_jobs
nb = nbformat.read(filepath, as_version=4)

processor = nbconvert.preprocessors.ExecutePreprocessor(
# If submitting jobs, we want to wait forever (-1 means no timeout)
timeout=-1 if submit_jobs else 300,
timeout=-1 if args.submit_jobs else 300,
kernel_name="python3",
extra_arguments=["--InlineBackend.figure_format='svg'"]
)

# This runs the notebook, including possibly submitting jobs. We run it in a
# new thread to avoid blocking other notebooks from submitting jobs.
await asyncio.to_thread(processor.preprocess, nb)
with patch_runtime(nb, should_patch=not args.submit_jobs):
await asyncio.to_thread(processor.preprocess, nb)

if not args.write:
return nb
Expand All @@ -172,7 +213,6 @@ async def _execute_notebook(filepath: Path, args: argparse.Namespace) -> nbforma
# Remove execution metadata to avoid noisy diffs.
cell.metadata.pop("execution", None)
nb, _ = clean_notebook(nb)
nbformat.write(nb, filepath)
return nb


Expand Down Expand Up @@ -220,7 +260,7 @@ def cancel_trailing_jobs(start_time: datetime, config_path: str) -> bool:
return False


def create_argument_parser() -> argparse.ArgumentParser:
def get_args() -> argparse.Namespace:
parser = argparse.ArgumentParser(
prog="Notebook executor",
description="For testing notebooks and updating their outputs",
Expand Down Expand Up @@ -252,25 +292,31 @@ def create_argument_parser() -> argparse.ArgumentParser:
parser.add_argument(
"--only-submit-jobs",
action="store_true",
help="Same as --submit-jobs, but also skips notebooks that do not submit jobs to IBM Quantum",
help=(
"Same as --submit-jobs, but only runs notebooks that submit jobs. "
"Setting this option implicitly sets --submit-jobs."
)
)
parser.add_argument(
"--config-path",
help="Path to a TOML file containing the globs for detecting and sorting notebooks",
)
return parser
args = parser.parse_args()
if args.only_submit_jobs:
args.submit_jobs = True
return args


async def _main() -> None:
args = create_argument_parser().parse_args()
args = get_args()
config = Config.read(args.config_path)
paths = map(Path, args.filenames or find_notebooks(config))
filtered_paths = filter_paths(paths, args, config)

# Execute notebooks
start_time = datetime.now()
print("Executing notebooks:")
results = await asyncio.gather(*(execute_notebook(path, args) for path in filtered_paths))
results = await asyncio.gather(*(execute_notebook(path, args, config) for path in filtered_paths))
print("Checking for trailing jobs...")
results.append(cancel_trailing_jobs(start_time, args.config_path))
if not all(results):
Expand Down
Loading