Skip to content

Commit 6d04442

Browse files
committed
update ci
1 parent 8e5ec83 commit 6d04442

4 files changed

Lines changed: 13 additions & 3 deletions

File tree

.github/workflows/build_cc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-keyring_1.0-1_all.deb \
3939
&& sudo dpkg -i cuda-keyring_1.0-1_all.deb \
4040
&& sudo apt-get update \
41-
&& sudo apt-get -y install cuda-cudart-dev-12-2 cuda-nvcc-12-2
41+
&& sudo apt-get -y install cuda-cudart-dev-12-2 cuda-nvcc-12-2 libcublas-dev-12-2 libcusparse-dev-12-2
4242
if: matrix.variant == 'cuda120'
4343
env:
4444
DEBIAN_FRONTEND: noninteractive

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-keyring_1.0-1_all.deb \
4343
&& sudo dpkg -i cuda-keyring_1.0-1_all.deb \
4444
&& sudo apt-get update \
45-
&& sudo apt-get -y install cuda-cudart-dev-12-2 cuda-nvcc-12-2
45+
&& sudo apt-get -y install cuda-cudart-dev-12-2 cuda-nvcc-12-2 libcublas-dev-12-2 libcusparse-dev-12-2
4646
python -m pip install uv
4747
uv pip install --system --group pin_tensorflow_cpu --group pin_pytorch_cpu --torch-backend cpu
4848
env:

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ environment-pass = [
305305
]
306306
before-all = [
307307
"""if [ ! -z "${DP_PKG_NAME}" ]; then sed -i "s/name = \\"deepmd-kit\\"/name = \\"${DP_PKG_NAME}\\"/g" pyproject.toml; fi""",
308-
"""{ if [ -n "${CUDA_VERSION}" ] && [ "$(uname -m)" = "x86_64" ] ; then yum config-manager --add-repo http://developer.download.nvidia.com/compute/cuda/repos/rhel8/x86_64/cuda-rhel8.repo && yum install -y cuda-nvcc-${CUDA_VERSION/./-} cuda-cudart-devel-${CUDA_VERSION/./-}; fi }""",
308+
"""{ if [ -n "${CUDA_VERSION}" ] && [ "$(uname -m)" = "x86_64" ] ; then yum config-manager --add-repo http://developer.download.nvidia.com/compute/cuda/repos/rhel8/x86_64/cuda-rhel8.repo && yum install -y cuda-nvcc-${CUDA_VERSION/./-} cuda-cudart-devel-${CUDA_VERSION/./-} libcublas-devel-${CUDA_VERSION/./-} libcusparse-devel-${CUDA_VERSION/./-}; fi }""",
309309
]
310310
before-build = [
311311
]

source/install/docker_package_c.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,17 @@ PYTHON_BIN=${PYTHON_BIN:-/opt/python/cp311-cp311/bin/python}
66
PYTORCH_DEPENDENCY_GROUP=${PYTORCH_DEPENDENCY_GROUP:-pin_pytorch_cpu}
77
PYTORCH_TORCH_BACKEND=${PYTORCH_TORCH_BACKEND:-cpu}
88
TENSORFLOW_DEPENDENCY_GROUP=${TENSORFLOW_DEPENDENCY_GROUP:-pin_tensorflow_cpu}
9+
# CUDA version tag (e.g. "12-9") parsed from the manylinux CUDA image name. It
10+
# selects the cuBLAS/cuSPARSE development packages installed inside the
11+
# container: the fused PyTorch CUDA operators pull in ATen CUDA headers that
12+
# require cublas and cusparse headers absent from the base image.
13+
CUDA_VERSION_DASH=$(printf '%s' "${MANYLINUX_CUDA_IMAGE}" | sed -n 's/.*cuda\([0-9][0-9]*\)_\([0-9][0-9]*\).*/\1-\2/p')
914

1015
docker run --rm -v "${SCRIPT_PATH}/../..":/root/deepmd-kit -w /root/deepmd-kit \
1116
-e CIBUILDWHEEL="${CIBUILDWHEEL:-1}" \
1217
-e ENABLE_PYTORCH="${ENABLE_PYTORCH:-FALSE}" \
1318
-e MANYLINUX_CUDA_IMAGE="${MANYLINUX_CUDA_IMAGE}" \
19+
-e CUDA_VERSION_DASH="${CUDA_VERSION_DASH}" \
1420
-e PACKAGE_C_RUNTIME_DEPENDENCY_PRE_EXCLUDE_REGEXES="${PACKAGE_C_RUNTIME_DEPENDENCY_PRE_EXCLUDE_REGEXES:-}" \
1521
-e PACKAGE_C_RUNTIME_DEPENDENCY_POST_EXCLUDE_REGEXES="${PACKAGE_C_RUNTIME_DEPENDENCY_POST_EXCLUDE_REGEXES:-}" \
1622
-e PYTORCH_DEPENDENCY_GROUP="${PYTORCH_DEPENDENCY_GROUP}" \
@@ -20,6 +26,10 @@ docker run --rm -v "${SCRIPT_PATH}/../..":/root/deepmd-kit -w /root/deepmd-kit \
2026
-e TENSORFLOW_DEPENDENCY_GROUP="${TENSORFLOW_DEPENDENCY_GROUP}" \
2127
"${MANYLINUX_CUDA_IMAGE}" \
2228
/bin/bash -lc 'set -euo pipefail
29+
if [ -n "${CUDA_VERSION_DASH:-}" ]; then
30+
yum config-manager --add-repo http://developer.download.nvidia.com/compute/cuda/repos/rhel8/x86_64/cuda-rhel8.repo
31+
yum install -y "libcublas-devel-${CUDA_VERSION_DASH}" "libcusparse-devel-${CUDA_VERSION_DASH}"
32+
fi
2333
export PATH="$(dirname "${PYTHON_BIN}"):${PATH}"
2434
"${PYTHON_BIN}" -m pip install uv
2535
UV_INSTALL_ARGS=(

0 commit comments

Comments
 (0)