Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
2 changes: 1 addition & 1 deletion .cudaq_version
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"cudaq": {
"repository": "NVIDIA/cuda-quantum",
"ref": "4f284af95b252e69ab08ba4f1ef7fa1ea69dd66a"
"ref": "94830b18a74a9fb50eb81777f76a495f04a51f6a"
}
}
6 changes: 4 additions & 2 deletions .github/workflows/build_wheels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,9 @@ jobs:
# easier to rely on their's devdeps images to do the building.
# FIXME: there is no guarantee that this CUDA-Q image aligns with the CUDA-Q
# commit that we are trying to align with.
container: ghcr.io/nvidia/cuda-quantum-devdeps:manylinux-${{ matrix.platform }}-cu${{ matrix.cuda_version }}-gcc11-main
container:
image: ghcr.io/nvidia/cuda-quantum-devdeps:manylinux-${{ matrix.platform }}-cu${{ matrix.cuda_version }}-gcc11-main
options: --ulimit nofile=1048576:1048576
permissions: write-all
strategy:
fail-fast: false
Expand Down Expand Up @@ -145,7 +147,7 @@ jobs:

- name: Build CUDAQ toolchain
run: |
.github/workflows/scripts/build_cudaq.sh --python-version ${{ matrix.python }}
.github/workflows/scripts/build_cudaq.sh --python-version ${{ matrix.python }} --cuda-version ${{ matrix.cuda_version }}

- name: Build CUDA-QX wheels
shell: bash
Expand Down
13 changes: 12 additions & 1 deletion .github/workflows/scripts/build_cudaq.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ show_help() {
echo "Usage: $0 [options]"
echo "Options:"
echo " --python-version Python version to build wheel for (e.g. 3.10)"
echo " --cuda-version CUDA version to build wheel for (e.g. 12.6 or 13.0)"
echo " -j Number of parallel jobs to build CUDA-Q with"
echo " (e.g. 8)"
}
Expand All @@ -32,6 +33,15 @@ parse_options() {
exit 1
fi
;;
--cuda-version)
if [[ -n "$2" && "$2" != -* ]]; then
cuda_version=("$2")
shift 2
else
echo "Error: Argument for $1 is missing" >&2
exit 1
fi
;;
-j)
if [[ -n "$2" && "$2" != -* ]]; then
num_par_jobs=("$2")
Expand Down Expand Up @@ -59,12 +69,13 @@ parse_options() {
# Defaults
python_version=3.10
cudaq_ninja_jobs_arg=""
cuda_version=12.6

# Parse options
parse_options "$@"


export CUDA_VERSION=12.6
export CUDA_VERSION=${cuda_version}
export CUDAQ_INSTALL_PREFIX=/usr/local/cudaq

# We need to use a newer toolchain because CUDA-QX libraries rely on c++20
Expand Down
2 changes: 1 addition & 1 deletion docker/build_env/cudaqx.wheel.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ RUN mkdir -p /workspaces/cudaqx/cudaq && cd /workspaces/cudaqx/cudaq \
&& git fetch -q --depth=1 origin ${CUDAQ_COMMIT} \
&& git reset --hard FETCH_HEAD \
&& cd .. \
&& bash build_cudaq.sh --python-version ${python_version} \
&& bash build_cudaq.sh --python-version ${python_version} --cuda-version ${cuda_version} \
&& rm -rf cudaq
Loading