Skip to content

Commit 56d1e48

Browse files
Merge branch 'main' into insert-array-record
2 parents c329683 + 301e58c commit 56d1e48

File tree

7 files changed

+40
-14
lines changed

7 files changed

+40
-14
lines changed

.github/workflows/docker_images.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -841,6 +841,7 @@ jobs:
841841
# In containers without GPU support, UCX does not work properly since it is configured to work with GPU-support.
842842
# Hence, don't enforce UCX when running these tests.
843843
docker exec cuda-quantum bash -c "python3 -m pip install --break-system-packages pandas scipy seaborn h5py contfrac"
844+
docker exec cuda-quantum bash -c "sudo apt install -y python3-venv"
844845
(docker exec cuda-quantum bash -c "unset OMPI_MCA_pml && set -o pipefail && bash validate_container.sh | tee /tmp/validation.out") && passed=true || passed=false
845846
docker cp cuda-quantum:"/tmp/validation.out" /tmp/validation.out
846847
docker stop cuda-quantum

.github/workflows/integration_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ jobs:
317317
# Determine which providers to test based on inputs and event type
318318
# Disabling anyon, please see https://github.com/NVIDIA/cuda-quantum/issues/3598
319319
if [[ "${{ github.event_name }}" == "schedule" || "${{ inputs.target }}" == "nightly" ]]; then
320-
providers='["fermioniq", "infleqtion", "ionq", "iqm", "oqc", "orca", "pasqal", "qci", "quantinuum"]'
320+
providers='["anyon", "fermioniq", "infleqtion", "ionq", "iqm", "oqc", "orca", "pasqal", "qci", "quantinuum"]'
321321
else
322322
# Just run the specified target provider
323323
providers="[\"${{ inputs.target }}\"]"

docs/notebook_validation.py

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,33 @@ def read_available_backends():
2525
return [backend.strip() for backend in available_backends]
2626

2727

28+
# Following pattern matches
29+
# `set_target("abc")`
30+
# `set_target( "abc")`
31+
# `set_target("abc", option="xyz")`
32+
# `set_target("abc", option = "xyz")`
33+
# `set_target(\"abc\")`
34+
# `set_target( \"abc\")`
35+
# `set_target(\"abc\", option=\"xyz\")`
36+
# `set_target(\"abc\", option = \"xyz\")`
37+
# `set_target('abc')`
38+
# `set_target( 'abc')`
39+
# `set_target('abc', option='xyz')`
40+
# `set_target('abc', option = 'xyz')`
41+
pattern = r"set_target\(\s*(\\?['\"])([^'\"]+)\1(?:\s*,\s*option\s*=\s*(\\?['\"])([^'\"]+)\3)?\)"
42+
43+
2844
def validate(notebook_filename, available_backends):
2945
with open(notebook_filename) as f:
3046
lines = f.readlines()
3147
for notebook_content in lines:
32-
match = re.search('set_target[\\\s\(]+"(.+)\\\\"[)]', notebook_content)
33-
if match and (match.group(1) not in available_backends):
34-
return False
48+
if re.search(r'\s*\#', notebook_content):
49+
continue
50+
51+
match = re.search(pattern, notebook_content)
52+
if match:
53+
target = match.group(2)
54+
return target in available_backends
3555
for notebook_content in lines:
3656
match = re.search('--target ([^ ]+)', notebook_content)
3757
if match and (match.group(1) not in available_backends):
@@ -122,7 +142,9 @@ def print_results(success, failed, skipped=[]):
122142

123143
## `quantum_transformer`:
124144
## See: https://github.com/NVIDIA/cuda-quantum/issues/2689
125-
notebooks_skipped = ['quantum_transformer.ipynb']
145+
notebooks_skipped = [
146+
'quantum_transformer.ipynb', 'logical_aim_sqale.ipynb'
147+
]
126148

127149
for notebook_filename in notebook_filenames:
128150
base_name = os.path.basename(notebook_filename)

docs/sphinx/applications/python/digitized_counterdiabatic_qaoa.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
"#non_edges=[[u,v] for u in nodes for v in nodes if u<v and [u,v] not in edges]\n",
103103
"#print('Edges: ', edges)\n",
104104
"#print('Non-edges: ', non_edges)\n",
105-
"#weights=[0.6686,0.6686,0.6886,0.1091,0.0770,0.0770,0.0770,0.0770]\n",
105+
"#weights=[0.6686,0.6686,0.6686,0.1091,0.0770,0.0770,0.0770,0.0770]\n",
106106
"#penalty=8.0\n",
107107
"#num_layers=8"
108108
]

docs/sphinx/applications/python/hybrid_quantum_neural_networks.ipynb

Lines changed: 8 additions & 5 deletions
Large diffs are not rendered by default.

docs/sphinx/examples/python/dynamics/dynamics_intro_1.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"cell_type": "markdown",
55
"metadata": {},
66
"source": [
7-
"# Intorduction to CUDA-Q Dynamics (Jaynes-Cummings Model)"
7+
"# Introduction to CUDA-Q Dynamics (Jaynes-Cummings Model)"
88
]
99
},
1010
{
@@ -148,7 +148,7 @@
148148
"cell_type": "markdown",
149149
"metadata": {},
150150
"source": [
151-
"Initialize the states of the system in cupy arrays and define the time chedule"
151+
"Initialize the states of the system in cupy arrays and define the time schedule"
152152
]
153153
},
154154
{

unittests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ if (CUSTATEVEC_ROOT AND CUDA_FOUND)
143143
find_library(NVIDIA_ML NAMES nvidia-ml PATHS ${NVIDIA_ML_PATH})
144144
message(STATUS "NVIDIA ML lib: ${NVIDIA_ML}")
145145
# Inject the file during build and remove it after build (install)
146-
file(CREATE_LINK ${NVIDIA_ML} ${CMAKE_CURRENT_BINARY_DIR}/libnvidia-ml.so.1)
146+
file(CREATE_LINK ${NVIDIA_ML} ${CMAKE_CURRENT_BINARY_DIR}/libnvidia-ml.so.1 SYMBOLIC)
147147
link_directories(${CMAKE_CURRENT_BINARY_DIR})
148148
install(CODE "file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/libnvidia-ml.so.1)")
149149
endif()

0 commit comments

Comments
 (0)