From a7e4f682a7937b9affec7c8ecf5d20755b439a1f Mon Sep 17 00:00:00 2001 From: Nikita Shulga Date: Tue, 29 Nov 2022 16:27:36 -0800 Subject: [PATCH] Make PyTorch depend on TorchTrition Remove me when Trition is properly released elsewhere --- conda/build_pytorch.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/conda/build_pytorch.sh b/conda/build_pytorch.sh index ad9cc6e525..20937622c0 100755 --- a/conda/build_pytorch.sh +++ b/conda/build_pytorch.sh @@ -31,7 +31,7 @@ retry () { $* || (sleep 1 && $*) || (sleep 2 && $*) || (sleep 4 && $*) || (sleep 8 && $*) } -# Parse arguments and determmine version +# Parse arguments and determine version ########################################################### if [[ -n "$DESIRED_CUDA" && -n "$PYTORCH_BUILD_VERSION" && -n "$PYTORCH_BUILD_NUMBER" ]]; then desired_cuda="$DESIRED_CUDA" @@ -245,7 +245,7 @@ fi meta_yaml="$build_folder/meta.yaml" echo "Using conda-build folder $build_folder" -# Switch between CPU or CUDA configerations +# Switch between CPU or CUDA configurations ########################################################### build_string_suffix="$PYTORCH_BUILD_NUMBER" if [[ -n "$cpu_only" ]]; then @@ -279,6 +279,11 @@ else echo "unhandled desired_cuda: $desired_cuda" exit 1 fi + if [[ "$OSTYPE" == "msys" ]]; then + # TODO: Remove me when Triton has a proper release channel + TRITON_SHORTHASH=$(cut -c1-10 $pytorch_rootdir/.github/ci_commit_pins/triton.txt) + export CONDA_CUDATOOLKIT_CONSTRAINT = "${CONDA_CUDATOOLKIT_CONSTRAINT}\n - torchtrition==2.0.0+${TRITON_SHORTHASH}" + fi build_string_suffix="cuda${CUDA_VERSION}_cudnn${CUDNN_VERSION}_${build_string_suffix}" fi