Skip to content

Commit 364a048

Browse files
fix CI
1 parent 8b13396 commit 364a048

3 files changed

Lines changed: 8 additions & 9 deletions

File tree

.github/workflows/build.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,12 @@ jobs:
115115
if: (github.event_name == 'push' && (startsWith(github.ref, 'refs/tags')) && (env.CUDA_VERSION != '') ) || env.CUDA_VERSION == '126'
116116
run: |
117117
# clone nvidia cuda cccl to third_party/
118-
if [ $CUDA_VERSION -lt "12.0" ]; then
118+
if [ $CUDA_VERSION -lt "120" ]; then
119119
CCCL_BRANCH_NAME="2.7.0"
120-
elif [ $CUDA_VERSION -lt "12.2" ]; then
120+
elif [ $CUDA_VERSION -lt "122" ]; then
121121
CCCL_BRANCH_NAME="2.2.0"
122122
else
123-
CCCL_MINOR_VERSION=$(echo $CUDA_VERSION | cut -d'.' -f2)
123+
CCCL_MINOR_VERSION=${CUDA_VERSION:2:1}
124124
CCCL_BRANCH_NAME="2.$CCCL_MINOR_VERSION.0"
125125
fi
126126
git clone https://github.com/NVIDIA/cccl.git third_party/cccl -b v$CCCL_BRANCH_NAME

cumm/common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ def __init__(self):
426426
class CompileInfo(pccm.Class):
427427
def __init__(self):
428428
super().__init__()
429-
if not CUMM_CPU_ONLY_BUILD:
429+
if not CUMM_CPU_ONLY_BUILD and not compat.IsAppleSiliconMacOs:
430430
include, lib64 = _get_cuda_include_lib()
431431
_, self.cuda_archs, self.has_ptx = _get_cuda_arch_flags()
432432
self.ptx_arch = self.cuda_archs[-1]

tools/build-wheels-dev.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,20 @@ function repair_wheel {
1313

1414
export CUMM_DISABLE_JIT="1"
1515
export CUMM_CUDA_ARCH_LIST="7.5;8.6"
16-
export CUDA_VERSION="12.6"
16+
export CUDA_VERSION="126"
1717
if [ -d /io/third_party/cccl ]; then
1818
echo "CCCL already cloned."
1919
else
2020
# clone nvidia cuda cccl to cumm/third_party
21-
if [ $CUDA_VERSION -lt "12.0" ]; then
21+
if [ $CUDA_VERSION -lt "120" ]; then
2222
CCCL_BRANCH_NAME="2.7.0"
23-
elif [ $CUDA_VERSION -lt "12.2" ]; then
23+
elif [ $CUDA_VERSION -lt "122" ]; then
2424
CCCL_BRANCH_NAME="2.2.0"
2525
else
26-
CCCL_MINOR_VERSION=$(echo $CUDA_VERSION | cut -d'.' -f2)
26+
CCCL_MINOR_VERSION=${CUDA_VERSION:2:1}
2727
CCCL_BRANCH_NAME="2.$CCCL_MINOR_VERSION.0"
2828
fi
2929
git clone https://github.com/NVIDIA/cccl.git /io/third_party/cccl -b v$CCCL_BRANCH_NAME
30-
3130
fi
3231

3332
"/opt/python/cp311-cp311/bin/pip" wheel /io/ --no-deps -w /io/wheelhouse_tmp -v

0 commit comments

Comments
 (0)