Skip to content

Commit 537fda2

Browse files
authored
Merge branch 'main' into add-patch-pypi.sh
2 parents c239db4 + 43f539c commit 537fda2

File tree

235 files changed

+7537
-2236
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

235 files changed

+7537
-2236
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
strategy:
106106
matrix:
107107
platform: [amd64, arm64]
108-
cuda_version: ["11.8", "12.0"]
108+
cuda_version: ["12.6", "13.0"]
109109
fail-fast: false
110110
uses: ./.github/workflows/dev_environment.yml
111111
secrets:
@@ -132,7 +132,7 @@ jobs:
132132
strategy:
133133
matrix:
134134
platform: [amd64, arm64]
135-
cuda_version: ["11.8", "12.0"]
135+
cuda_version: ["12.6", "13.0"]
136136
fail-fast: false
137137
uses: ./.github/workflows/dev_environment.yml
138138
secrets:
@@ -177,7 +177,7 @@ jobs:
177177
matrix:
178178
platform: [amd64, arm64]
179179
toolchain: [clang16, gcc11, gcc12]
180-
mpi: [openmpi, mpich]
180+
mpi: [openmpi]
181181
exclude:
182182
- toolchain: llvm
183183
mpi: mpich
@@ -235,7 +235,7 @@ jobs:
235235
matrix:
236236
platform: [amd64, arm64]
237237
python_version: ['3.11', '3.13']
238-
cuda_version: ["11.8", "12.0"]
238+
cuda_version: ["12.6", "13.0"]
239239
fail-fast: false
240240
uses: ./.github/workflows/python_wheels.yml
241241
secrets:
@@ -256,7 +256,7 @@ jobs:
256256
with:
257257
cudaq_version: ${{ needs.python_wheels.outputs.cudaq_version }}
258258
python_versions: "['3.11', '3.13']"
259-
cuda_versions: "['', '11.8', '12.0']"
259+
cuda_versions: "['', '12.6', '13.0']"
260260
wheel_artifacts: 'pycudaq-*'
261261

262262
binaries:
@@ -265,7 +265,7 @@ jobs:
265265
strategy:
266266
matrix:
267267
platform: [amd64, arm64]
268-
cuda_version: ["11.8", "12.0"]
268+
cuda_version: ["12.6", "13.0"]
269269
fail-fast: false
270270
uses: ./.github/workflows/prebuilt_binaries.yml
271271
secrets:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
nvidia-mgpu-repo: cuda-quantum/cuquantum-mgpu.git
2-
nvidia-mgpu-commit: 5f1033f9efbe952633e567d676a64a237cb43ba7
2+
nvidia-mgpu-commit: bb46a64f7a17f4aafac019adbdde78edd792b16e

.github/workflows/config/validation_config.json

Lines changed: 20 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
{
22
"python":
33
[
4-
{
5-
"version": "3.10",
6-
"operating_systems":
7-
[
8-
"ubuntu:22.04",
9-
"fedora:42"
10-
]
11-
},
124
{
135
"version": "3.11",
146
"operating_systems":
@@ -55,7 +47,7 @@
5547
"ubuntu:22.04":
5648
{
5749
"libcdev_package": "libc6-dev",
58-
"cudart_version": "12.0",
50+
"cudart_version": "12.6",
5951
"cuda_distribution": "ubuntu2204"
6052
},
6153
"debian:12":
@@ -67,13 +59,13 @@
6759
"redhat/ubi9:9.6":
6860
{
6961
"libcdev_package": "glibc-devel",
70-
"cudart_version": "12.0",
62+
"cudart_version": "12.6",
7163
"cuda_distribution": "rhel9"
7264
},
7365
"opensuse/leap:15.5":
7466
{
7567
"libcdev_package": "glibc-devel",
76-
"cudart_version": "12.0",
68+
"cudart_version": "12.6",
7769
"cuda_distribution": "opensuse15"
7870
},
7971
"fedora:42":
@@ -85,37 +77,37 @@
8577
},
8678
{
8779
"platform": "linux/amd64",
88-
"cuda_major": 11,
80+
"cuda_major": 13,
8981
"operating_systems":
9082
[
9183
"ubuntu:22.04",
92-
"redhat/ubi8:8.10",
84+
"debian:12",
9385
"opensuse/leap:15.5",
9486
"fedora:42"
9587
],
9688
"ubuntu:22.04":
9789
{
9890
"libcdev_package": "libc6-dev",
99-
"cudart_version": "11.8",
91+
"cudart_version": "13.0",
10092
"cuda_distribution": "ubuntu2204"
10193
},
102-
"redhat/ubi8:8.10":
94+
"debian:12":
10395
{
104-
"libcdev_package": "glibc-devel",
105-
"cudart_version": "11.8",
106-
"cuda_distribution": "rhel9"
96+
"libcdev_package": "libc6-dev",
97+
"cudart_version": "13.0",
98+
"cuda_distribution": "debian12"
10799
},
108100
"opensuse/leap:15.5":
109101
{
110102
"libcdev_package": "glibc-devel",
111-
"cudart_version": "11.8",
103+
"cudart_version": "13.0",
112104
"cuda_distribution": "opensuse15"
113105
},
114-
"fedora:42":
106+
"fedora:42":
115107
{
116108
"libcdev_package": "glibc-devel",
117-
"cudart_version": "11.8",
118-
"cuda_distribution": "rhel9"
109+
"cudart_version": "13.0",
110+
"cuda_distribution": "fedora42"
119111
}
120112
},
121113
{
@@ -129,42 +121,28 @@
129121
"ubuntu:22.04":
130122
{
131123
"libcdev_package": "libc6-dev",
132-
"cudart_version": "12.0",
124+
"cudart_version": "12.6",
133125
"cuda_distribution": "ubuntu2204"
134126
},
135127
"redhat/ubi9:9.6":
136128
{
137129
"libcdev_package": "glibc-devel",
138-
"cudart_version": "12.0",
130+
"cudart_version": "12.6",
139131
"cuda_distribution": "rhel9"
140132
}
141133
},
142134
{
143135
"platform": "linux/arm64",
144-
"cuda_major": 11,
136+
"cuda_major": 13,
145137
"operating_systems":
146138
[
147-
"ubuntu:22.04",
148-
"redhat/ubi8:8.10",
149-
"fedora:42"
139+
"ubuntu:22.04"
150140
],
151141
"ubuntu:22.04":
152-
{
142+
{
153143
"libcdev_package": "libc6-dev",
154-
"cudart_version": "11.8",
144+
"cudart_version": "13.0",
155145
"cuda_distribution": "ubuntu2204"
156-
},
157-
"redhat/ubi8:8.10":
158-
{
159-
"libcdev_package": "glibc-devel",
160-
"cudart_version": "11.8",
161-
"cuda_distribution": "rhel9"
162-
},
163-
"fedora:42":
164-
{
165-
"libcdev_package": "glibc-devel",
166-
"cudart_version": "11.8",
167-
"cuda_distribution": "rhel9"
168146
}
169147
}
170148
]

.github/workflows/create_cache_command.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
strategy:
113113
matrix:
114114
platform: [amd64, arm64]
115-
cuda_version: ["11.8", "12.0"]
115+
cuda_version: ["12.6", "13.0"]
116116
fail-fast: false
117117
uses: ./.github/workflows/dev_environment.yml
118118
secrets:
@@ -141,7 +141,7 @@ jobs:
141141
strategy:
142142
matrix:
143143
platform: [amd64, arm64]
144-
cuda_version: ["11.8", "12.0"]
144+
cuda_version: ["12.6", "13.0"]
145145
fail-fast: false
146146
uses: ./.github/workflows/dev_environment.yml
147147
secrets:

.github/workflows/deployments.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ jobs:
205205
# There are currently no multi-platform manylinux images available.
206206
# See https://github.com/pypa/manylinux/issues/1306.
207207
platform: ${{ fromJson(needs.metadata.outputs.platforms).ids }}
208-
cuda_version: ["11.8", "12.0"]
208+
cuda_version: ["12.6", "13.0"]
209209
fail-fast: false
210210
uses: ./.github/workflows/dev_environment.yml
211211
secrets:
@@ -237,7 +237,7 @@ jobs:
237237
strategy:
238238
matrix:
239239
platform: ${{ fromJson(needs.metadata.outputs.platforms).ids }}
240-
cuda_version: ["11.8", "12.0"]
240+
cuda_version: ["12.6", "13.0"]
241241
fail-fast: false
242242
uses: ./.github/workflows/dev_environment.yml
243243
secrets:
@@ -268,7 +268,7 @@ jobs:
268268
strategy:
269269
matrix:
270270
platform: ${{ fromJson(needs.metadata.outputs.platforms).ids }}
271-
cuda_version: ["11.8", "12.0"]
271+
cuda_version: ["12.6", "13.0"]
272272
fail-fast: false
273273
uses: ./.github/workflows/dev_environment.yml
274274
secrets:
@@ -354,7 +354,7 @@ jobs:
354354
strategy:
355355
matrix:
356356
platform: ${{ fromJson(needs.metadata.outputs.platforms).ids }}
357-
cuda_version: ["11.8", "12.0"]
357+
cuda_version: ["12.6", "13.0"]
358358
fail-fast: false
359359
uses: ./.github/workflows/dev_environment.yml
360360
secrets:
@@ -402,7 +402,7 @@ jobs:
402402
strategy:
403403
matrix:
404404
platform: ${{ fromJson(needs.metadata.outputs.platforms).ids }}
405-
cuda_version: ["11.8", "12.0"]
405+
cuda_version: ["12.6", "13.0"]
406406
fail-fast: false
407407
uses: ./.github/workflows/docker_images.yml
408408
secrets:
@@ -414,7 +414,7 @@ jobs:
414414
cuda_version: ${{ matrix.cuda_version }}
415415
ompidev_image: ${{ fromJson(needs.config.outputs.json).image_hash[format('{0}-cu{1}-ompi', matrix.platform, matrix.cuda_version)] }}
416416
devdeps_image: ${{ fromJson(needs.ext_config.outputs.json).image_hash[format('{0}-cu{1}-ext', matrix.platform, matrix.cuda_version)] }}
417-
build_docs: ${{ matrix.cuda_version == '11.8' && matrix.platform == fromJson(needs.metadata.outputs.platforms).ids[0] }}
417+
build_docs: ${{ matrix.cuda_version == '12.6' && matrix.platform == fromJson(needs.metadata.outputs.platforms).ids[0] }}
418418
environment: ghcr-deployment
419419

420420
digest_config:
@@ -443,7 +443,7 @@ jobs:
443443
runs-on: ubuntu-latest
444444
strategy:
445445
matrix:
446-
cuda: ["11.8", "12.0"]
446+
cuda: ["12.6", "13.0"]
447447

448448
environment: ghcr-deployment
449449

@@ -666,7 +666,7 @@ jobs:
666666
STITCHED_JSON='${{ needs.aggregate_stitched_images.outputs.json }}'
667667
echo "$STITCHED_JSON" | jq .
668668
669-
for cuda in 11.8 12.0; do
669+
for cuda in 12.6 13.0; do
670670
cuda_major="${cuda%%.*}"
671671
artifact_name="image_cu${cuda_major}_publishing"
672672
info_file="$artifact_name.txt"
@@ -696,19 +696,19 @@ jobs:
696696
echo "Created $info_file"
697697
done
698698
699-
- name: Upload image_cu11_publishing
699+
- name: Upload image_cu12_publishing
700700
uses: actions/upload-artifact@v4
701701
with:
702-
name: image_cu11_publishing
703-
path: image_cu11_publishing.txt
702+
name: image_cu12_publishing
703+
path: image_cu12_publishing.txt
704704
retention-days: 30
705705
if-no-files-found: error
706706

707-
- name: Upload image_cu12_publishing
707+
- name: Upload image_cu13_publishing
708708
uses: actions/upload-artifact@v4
709709
with:
710-
name: image_cu12_publishing
711-
path: image_cu12_publishing.txt
710+
name: image_cu13_publishing
711+
path: image_cu13_publishing.txt
712712
retention-days: 30
713713
if-no-files-found: error
714714

@@ -718,8 +718,8 @@ jobs:
718718
strategy:
719719
matrix:
720720
platform: ${{ fromJson(needs.metadata.outputs.platforms).ids }}
721-
python_version: ['3.10', '3.11', '3.12', '3.13']
722-
cuda_version: ["11.8", "12.0"]
721+
python_version: ['3.11', '3.12', '3.13']
722+
cuda_version: ["12.6", "13.0"]
723723
fail-fast: false
724724
uses: ./.github/workflows/python_wheels.yml
725725
secrets:
@@ -738,7 +738,7 @@ jobs:
738738
strategy:
739739
matrix:
740740
platform: ${{ fromJson(needs.metadata.outputs.platforms).ids }}
741-
cuda_version: ["11.8", "12.0"]
741+
cuda_version: ["12.6", "13.0"]
742742
fail-fast: false
743743
uses: ./.github/workflows/prebuilt_binaries.yml
744744
secrets:

.github/workflows/docker_images.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ jobs:
175175
file: ./docker/build/devdeps.ext.Dockerfile
176176
build-args: |
177177
ompidev_image=${{ inputs.ompidev_image }}
178-
base_image=nvcr.io/nvidia/cuda:${{ inputs.cuda_version }}.0-runtime-ubuntu22.04
178+
base_image=nvcr.io/nvidia/cuda:${{ inputs.cuda_version }}.0-runtime-ubuntu24.04
179179
cuda_version=${{ inputs.cuda_version }}
180180
cuda_packages=
181181
tags: ${{ steps.metadata.outputs.tags }}
@@ -451,7 +451,7 @@ jobs:
451451
id: prereqs
452452
run: |
453453
if ${{ needs.ompi_image.result == 'skipped' }}; then
454-
base_image=ghcr.io/nvidia/ubuntu:22.04
454+
base_image=ghcr.io/nvidia/ubuntu:24.04
455455
elif ${{ steps.restore_openmpi.outcome != 'skipped' }}; then
456456
load_output=`docker load --input "${{ needs.ompi_image.outputs.tar_archive }}"`
457457
base_image=`echo "$load_output" | grep -o 'Loaded image: \S*:\S*' | head -1 | cut -d ' ' -f 3`
@@ -842,7 +842,7 @@ jobs:
842842
docker cp docs/notebook_validation.py cuda-quantum:"/home/cudaq/notebook_validation.py"
843843
# In containers without GPU support, UCX does not work properly since it is configured to work with GPU-support.
844844
# Hence, don't enforce UCX when running these tests.
845-
docker exec cuda-quantum bash -c "python3 -m pip install pandas scipy pandas seaborn 'h5py<3.11' contfrac"
845+
docker exec cuda-quantum bash -c "python3 -m pip install --break-system-packages pandas scipy seaborn h5py contfrac"
846846
(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
847847
docker cp cuda-quantum:"/tmp/validation.out" /tmp/validation.out
848848
docker stop cuda-quantum

0 commit comments

Comments
 (0)