From a61b5660031b4a8ed20104884f5533cad54d4d46 Mon Sep 17 00:00:00 2001 From: Huy Do Date: Mon, 18 Dec 2023 11:44:52 -0800 Subject: [PATCH 1/2] Do not hardcode triton version in builder code --- conda/build_pytorch.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conda/build_pytorch.sh b/conda/build_pytorch.sh index 4c2e4836b..c545d30c9 100755 --- a/conda/build_pytorch.sh +++ b/conda/build_pytorch.sh @@ -275,8 +275,9 @@ else fi if [[ "$OSTYPE" != "msys" ]]; then # TODO: Remove me when Triton has a proper release channel + TRITON_VERSION=$(cat $PYTORCH_ROOT/.ci/docker/triton_version.txt) TRITON_SHORTHASH=$(cut -c1-10 $pytorch_rootdir/.github/ci_commit_pins/triton.txt) - export CONDA_TRITON_CONSTRAINT=" - torchtriton==2.1.0+${TRITON_SHORTHASH} # [py < 312]" + export CONDA_TRITON_CONSTRAINT=" - torchtriton==${TRITON_VERSION}+${TRITON_SHORTHASH} # [py < 312]" fi build_string_suffix="cuda${CUDA_VERSION}_cudnn${CUDNN_VERSION}_${build_string_suffix}" From 2d64e57f917e138c8196ade42665cb5ca348d504 Mon Sep 17 00:00:00 2001 From: Huy Do Date: Mon, 18 Dec 2023 11:49:06 -0800 Subject: [PATCH 2/2] Minor tweak to use pytorch_rootdir --- conda/build_pytorch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda/build_pytorch.sh b/conda/build_pytorch.sh index c545d30c9..cf8b2f463 100755 --- a/conda/build_pytorch.sh +++ b/conda/build_pytorch.sh @@ -275,7 +275,7 @@ else fi if [[ "$OSTYPE" != "msys" ]]; then # TODO: Remove me when Triton has a proper release channel - TRITON_VERSION=$(cat $PYTORCH_ROOT/.ci/docker/triton_version.txt) + TRITON_VERSION=$(cat $pytorch_rootdir/.ci/docker/triton_version.txt) TRITON_SHORTHASH=$(cut -c1-10 $pytorch_rootdir/.github/ci_commit_pins/triton.txt) export CONDA_TRITON_CONSTRAINT=" - torchtriton==${TRITON_VERSION}+${TRITON_SHORTHASH} # [py < 312]" fi