From ca43f27abc7fa68f561cb6ca4b9146fa692f8e23 Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 5 Feb 2025 17:27:12 -0800 Subject: [PATCH] Cleanup --- .github/actions/setup-binary-builds/action.yml | 4 +++- tools/pkg-helpers/pytorch_pkg_helpers/wheel.py | 2 -- tools/scripts/generate_binary_build_matrix.py | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/actions/setup-binary-builds/action.yml b/.github/actions/setup-binary-builds/action.yml index b3749a080a..6a8dc45041 100644 --- a/.github/actions/setup-binary-builds/action.yml +++ b/.github/actions/setup-binary-builds/action.yml @@ -144,8 +144,10 @@ runs: # For conda package host python version is irrelevant export PYTHON_VERSION=3.13 export CONDA_EXTRA_PARAM=" python-freethreading -c conda-forge" - # Pin conda and conda-libmamba-solver for 3.13t build if [[ "$(uname)" != Darwin ]]; then + # Pin conda and conda-libmamba-solver for 3.13t linux build + # this solver allows us to install anaconda dependencies on + # python-freethreading on conda-forge environment conda install conda==24.7.1 conda-libmamba-solver=24.1.0 fi fi diff --git a/tools/pkg-helpers/pytorch_pkg_helpers/wheel.py b/tools/pkg-helpers/pytorch_pkg_helpers/wheel.py index 6d29592eb5..a918822763 100644 --- a/tools/pkg-helpers/pytorch_pkg_helpers/wheel.py +++ b/tools/pkg-helpers/pytorch_pkg_helpers/wheel.py @@ -3,8 +3,6 @@ def get_python_path_variables(python_version: str) -> List[str]: t = "" - # For some reason python versions <= 3.7 require an m - # probably better not to ask why if python_version.endswith('t'): python_nodot = python_version[:-1].replace(".", "") t = "t" diff --git a/tools/scripts/generate_binary_build_matrix.py b/tools/scripts/generate_binary_build_matrix.py index 18217283ad..569cbd046f 100755 --- a/tools/scripts/generate_binary_build_matrix.py +++ b/tools/scripts/generate_binary_build_matrix.py @@ -464,8 +464,7 @@ def generate_wheels_matrix( arches += [XPU] if limit_pr_builds: - # todo: remove before merging - python_versions = [python_versions[-1]] + python_versions = [python_versions[0]] global WHEEL_CONTAINER_IMAGES @@ -477,8 +476,8 @@ def generate_wheels_matrix( "" if arch_version in [CPU, CPU_AARCH64, XPU] else arch_version ) - # TODO: Enable python 3.13t on xpu and cpu-s390x or MacOS or Windows - if (gpu_arch_type in ["xpu", "cpu-s390x"]) and python_version == "3.13t": + # TODO: Enable python 3.13t on xpu and cpu-s390x or Windows + if ((gpu_arch_type in ["xpu", "cpu-s390x"]) or os == WINDOWS ) and python_version == "3.13t": continue desired_cuda = translate_desired_cuda(gpu_arch_type, gpu_arch_version)