Skip to content

Commit 67ad273

Browse files
bmhowe23bmhowe23
authored
Update devdeps image to Ubuntu 24.04 (#302)
Related: NVIDIA/cuda-quantum#3421 --------- Signed-off-by: Ben Howe <[email protected]>
1 parent 26b7866 commit 67ad273

File tree

13 files changed

+35
-22
lines changed

13 files changed

+35
-22
lines changed

‎.cudaq_version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"cudaq": {
33
"repository": "NVIDIA/cuda-quantum",
4-
"ref": "f3e39da0be3109d3a0f4a1fc523a9721c3f5eb1c"
4+
"ref": "db273f02ea807599efbee77ff1d4f4e3f8ea88ae"
55
}
66
}

‎.github/actions/build-lib/action.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ runs:
3838
- name: Compilation cache key
3939
id: ccache-key
4040
run: |
41-
echo "main=ccache-${{ inputs.lib }}-cu12.0-gcc11-${{ inputs.platform }}" >> $GITHUB_OUTPUT
41+
echo "main=ccache-${{ inputs.lib }}-cu12.6-gcc11-${{ inputs.platform }}" >> $GITHUB_OUTPUT
4242
if [[ -n "${{ inputs.pr-number }}" ]]; then
4343
echo "pr=-pr${{ inputs.pr-number }}" >> $GITHUB_OUTPUT
4444
fi

‎.github/workflows/all_libs.yaml‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
matrix:
1313
platform: ['amd64', 'arm64']
1414
runs-on: ${{ startsWith(github.repository, 'NVIDIA/cudaqx') && format('linux-{0}-cpu8', matrix.platform) || 'ubuntu-latest' }}
15-
container: ghcr.io/nvidia/cuda-quantum-devdeps:ext-${{ matrix.platform }}-cu12.0-gcc11-main
15+
container: ghcr.io/nvidia/cuda-quantum-devdeps:ext-${{ matrix.platform }}-cu12.6-gcc11-main
1616
permissions:
1717
actions: write
1818
contents: read
@@ -57,7 +57,7 @@ jobs:
5757

5858
- name: Install build requirements
5959
run: |
60-
apt install -y --no-install-recommends gfortran libblas-dev libcusolver-dev-12-0
60+
apt install -y --no-install-recommends gfortran libblas-dev
6161
6262
- name: Build
6363
id: build
@@ -82,8 +82,15 @@ jobs:
8282
- name: Install python requirements
8383
env:
8484
LD_LIBRARY_PATH: ${{ env.MPI_PATH }}/lib:${{ env.LD_LIBRARY_PATH }}
85-
# Note: install tensor_network_decoder's dependencies quimb, opt_einsum, and torch when we advance to Python 3.11
86-
run: pip install numpy pytest cupy-cuda12x cuquantum-cu12 torch lightning ml_collections mpi4py transformers
85+
shell: bash
86+
run: |
87+
pip install numpy pytest cupy-cuda12x cuquantum-cu12 torch lightning ml_collections mpi4py transformers quimb opt_einsum torch nvidia-cublas-cu12 cuquantum-python-cu12==25.06
88+
# The following tests are needed for docs/sphinx/examples/qec/python/tensor_network_decoder.py.
89+
if [ "$(uname -m)" == "x86_64" ]; then
90+
# Stim is not currently available on manylinux ARM wheels, so only
91+
# install for x86_64.
92+
pip install stim beliefmatching
93+
fi
8794
8895
- name: Run Python tests
8996
env:

‎.github/workflows/all_libs_release.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ jobs:
113113
- name: Install python requirements
114114
env:
115115
LD_LIBRARY_PATH: ${{ env.MPI_PATH }}/lib:${{ env.LD_LIBRARY_PATH }}
116-
# Note: install tensor_network_decoder's dependencies quimb, opt_einsum, and torch when we advance to Python 3.11
117-
run: pip install numpy pytest cupy-cuda12x cuquantum-cu12 torch lightning ml_collections mpi4py transformers
116+
run: pip install numpy pytest cupy-cuda12x cuquantum-cu12 torch lightning ml_collections mpi4py transformers quimb opt_einsum torch
118117

119118
- name: Run Python tests
120119
env:

‎.github/workflows/build_dev.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
TAGS="-t ghcr.io/nvidia/cudaqx-dev:${{ steps.get-cudaq-version-short.outputs.commit_date }}-${{ steps.get-cudaq-version-short.outputs.shortref }}-${{ matrix.platform }}"
8181
TAGS+=" -t ghcr.io/nvidia/cudaqx-dev:${{ steps.get-cudaq-version-short.outputs.shortref }}-${{ matrix.platform }}"
8282
TAGS+=" -t ghcr.io/nvidia/cudaqx-dev:${other_tag}-${{ matrix.platform }}"
83-
docker build $TAGS -f docker/build_env/cudaqx.dev.Dockerfile . --build-arg base_image=ghcr.io/nvidia/cuda-quantum-devdeps:ext-${{ matrix.platform }}-cu12.0-gcc11-main
83+
docker build $TAGS -f docker/build_env/cudaqx.dev.Dockerfile . --build-arg base_image=ghcr.io/nvidia/cuda-quantum-devdeps:ext-${{ matrix.platform }}-cu12.6-gcc11-main
8484
docker push -a ghcr.io/nvidia/cudaqx-dev
8585
shell: bash --noprofile --norc -euo pipefail {0}
8686

‎.github/workflows/cudaq_cache.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
matrix:
2626
platform: ['amd64', 'arm64']
2727
runs-on: ${{ startsWith(github.repository, 'NVIDIA/cudaqx') && format('linux-{0}-cpu32', matrix.platform) || 'ubuntu-latest' }}
28-
container: ghcr.io/nvidia/cuda-quantum-devdeps:ext-${{ matrix.platform }}-cu12.0-gcc11-main
28+
container: ghcr.io/nvidia/cuda-quantum-devdeps:ext-${{ matrix.platform }}-cu12.6-gcc11-main
2929
permissions:
3030
actions: write
3131
contents: read

‎.github/workflows/docs.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
build:
2626
name: Build
2727
runs-on: ${{ startsWith(github.repository, 'NVIDIA/cudaqx') && 'linux-amd64-cpu8' || 'ubuntu-latest' }}
28-
container: ghcr.io/nvidia/cuda-quantum-devdeps:ext-amd64-cu12.0-gcc11-main
28+
container: ghcr.io/nvidia/cuda-quantum-devdeps:ext-amd64-cu12.6-gcc11-main
2929
permissions:
3030
actions: write
3131
contents: read
@@ -58,7 +58,7 @@ jobs:
5858
- name: Install requirements
5959
run: |
6060
apt install -y --no-install-recommends \
61-
gfortran libblas-dev libcusolver-dev-12-0 doxygen
61+
gfortran libblas-dev doxygen
6262
6363
python3 -m pip install IPython breathe enum_tools myst_parser nbsphinx \
6464
sphinx_copybutton sphinx_inline_tabs sphinx_gallery sphinx_rtd_theme \

‎.github/workflows/lib_qec.yaml‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
matrix:
1313
platform: ['amd64', 'arm64']
1414
runs-on: ${{ startsWith(github.repository, 'NVIDIA/cudaqx') && format('linux-{0}-cpu8', matrix.platform) || 'ubuntu-latest' }}
15-
container: ghcr.io/nvidia/cuda-quantum-devdeps:ext-${{ matrix.platform }}-cu12.0-gcc11-main
15+
container: ghcr.io/nvidia/cuda-quantum-devdeps:ext-${{ matrix.platform }}-cu12.6-gcc11-main
1616
permissions:
1717
actions: write
1818
contents: read
@@ -76,8 +76,15 @@ jobs:
7676
# ========================================================================
7777

7878
- name: Install python requirements
79-
# Note: install tensor_network_decoder's dependencies quimb, opt_einsum, and torch when we advance to Python 3.11
80-
run: pip install numpy pytest cupy-cuda12x cuquantum-cu12
79+
shell: bash
80+
run: |
81+
pip install numpy pytest cupy-cuda12x cuquantum-cu12 quimb opt_einsum torch nvidia-cublas-cu12 cuquantum-python-cu12==25.06
82+
# The following tests are needed for docs/sphinx/examples/qec/python/tensor_network_decoder.py.
83+
if [ "$(uname -m)" == "x86_64" ]; then
84+
# Stim is not currently available on manylinux ARM wheels, so only
85+
# install for x86_64.
86+
pip install stim beliefmatching
87+
fi
8188
8289
- name: Run Python tests
8390
run: cmake --build ${{ steps.build.outputs.build-dir }} --target run_python_tests

‎.github/workflows/lib_solvers.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
matrix:
1313
platform: ['amd64', 'arm64']
1414
runs-on: ${{ startsWith(github.repository, 'NVIDIA/cudaqx') && format('linux-{0}-cpu8', matrix.platform) || 'ubuntu-latest' }}
15-
container: ghcr.io/nvidia/cuda-quantum-devdeps:ext-${{ matrix.platform }}-cu12.0-gcc11-main
15+
container: ghcr.io/nvidia/cuda-quantum-devdeps:ext-${{ matrix.platform }}-cu12.6-gcc11-main
1616
permissions:
1717
actions: write
1818
contents: read
@@ -57,7 +57,7 @@ jobs:
5757

5858
- name: Install build requirements
5959
run: |
60-
apt install -y --no-install-recommends gfortran libblas-dev libcusolver-dev-12-0
60+
apt install -y --no-install-recommends gfortran libblas-dev
6161
6262
- name: Build
6363
id: build

‎.github/workflows/pr_workflow.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
matrix:
9797
platform: ['amd64', 'arm64']
9898
runs-on: ${{ startsWith(github.repository, 'NVIDIA/cudaqx') && format('linux-{0}-cpu32', matrix.platform) || 'ubuntu-latest' }}
99-
container: ghcr.io/nvidia/cuda-quantum-devdeps:ext-${{ matrix.platform }}-cu12.0-gcc11-main
99+
container: ghcr.io/nvidia/cuda-quantum-devdeps:ext-${{ matrix.platform }}-cu12.6-gcc11-main
100100
permissions:
101101
actions: write
102102
contents: read

0 commit comments

Comments
 (0)