diff --git a/.ci_support/migrations/python313.yaml b/.ci_support/migrations/python313.yaml deleted file mode 100644 index f9389e3b..00000000 --- a/.ci_support/migrations/python313.yaml +++ /dev/null @@ -1,46 +0,0 @@ -migrator_ts: 1724712607 -__migrator: - commit_message: Rebuild for python 3.13 - migration_number: 1 - operation: key_add - primary_key: python - ordering: - python: - - 3.6.* *_cpython - - 3.7.* *_cpython - - 3.8.* *_cpython - - 3.9.* *_cpython - - 3.10.* *_cpython - - 3.11.* *_cpython - - 3.12.* *_cpython - - 3.13.* *_cp313 # new entry - - 3.6.* *_73_pypy - - 3.7.* *_73_pypy - - 3.8.* *_73_pypy - - 3.9.* *_73_pypy - paused: false - longterm: true - pr_limit: 20 - max_solver_attempts: 3 # this will make the bot retry "not solvable" stuff 12 times - exclude: - # this shouldn't attempt to modify the python feedstocks - - python - - pypy3.6 - - pypy-meta - - cross-python - - python_abi - # see https://github.com/conda-forge/scipy-feedstock/pull/283 - - scipy - exclude_pinned_pkgs: false - additional_zip_keys: - - channel_sources - -python: -- 3.13.* *_cp313 -channel_sources: -- conda-forge/label/python_rc,conda-forge -# additional entries to add for zip_keys -numpy: -- 2 -python_impl: -- cpython diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index 6e7bede8..4b8a5e7a 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -76,7 +76,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 - name: Build on Linux id: build-linux @@ -133,31 +133,6 @@ jobs: fi ./.scripts/run_osx_build.sh - # https://github.com/aktech/cirun-azure-resize-disk - - name: Resize all partitions to maximum - if: matrix.os == 'windows' - shell: pwsh - run: | - Write-Output "=== RESIZING PARTITIONS ===" - $disks = Get-Disk | Where-Object PartitionStyle -ne 'RAW' - - foreach ($disk in $disks) { - $partitions = Get-Partition -DiskNumber $disk.Number - foreach ($partition in $partitions) { - try { - $size = Get-PartitionSupportedSize -DiskNumber $disk.Number -PartitionNumber $partition.PartitionNumber - if ($partition.Size -lt $size.SizeMax) { - Write-Output "Resizing Disk $($disk.Number) Partition $($partition.PartitionNumber) from $($partition.Size) to $($size.SizeMax)" - Resize-Partition -DiskNumber $disk.Number -PartitionNumber $partition.PartitionNumber -Size $size.SizeMax -Verbose - } else { - Write-Output "Disk $($disk.Number) Partition $($partition.PartitionNumber) already at max size ($($partition.Size))" - } - } catch { - Write-Warning "Failed resizing Disk $($disk.Number) Partition $($partition.PartitionNumber): $_" - } - } - } - - name: Build on windows id: build-windows if: matrix.os == 'windows' @@ -259,4 +234,4 @@ jobs: name: ${{ steps.prepare-artifacts.outputs.ENV_ARTIFACT_NAME }} path: ${{ steps.prepare-artifacts.outputs.ENV_ARTIFACT_PATH }} retention-days: 14 - continue-on-error: true + continue-on-error: true \ No newline at end of file diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 44a923bf..338e58fe 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,11 @@ +{% set jobs = "-n 2" %} +{% set jobs = "-n 1" %} # [linux64 and cuda_compiler_version != "None"] +{% set pytorch_cpu_gpu = "pytorch-gpu" %} # [cuda_compiler_version != "None"] +{% set pytorch_cpu_gpu = "pytorch-cpu" %} # [cuda_compiler_version == "None"] +{% set skips = "(TestTorch and test_print)" %} # if you wish to build release candidate number X, append the version string with ".rcX" -{% set version = "2.8.0" %} -{% set build = 1 %} +{% set version = "2.9.0" %} +{% set build = 0 %} # Use a higher build number for the CUDA variant, to ensure that it's # preferred by conda's solver, and it's preferentially @@ -34,11 +39,11 @@ source: # a usable ancestor from outside the submodule; the only option then is to # pull in the submodules separately. - url: https://github.com/pytorch/pytorch/archive/refs/tags/v{{ version }}.tar.gz - sha256: 04ae0a8babdc9cb9dfc4f8746b2b8aa0f8ed0f9e92835cc4af0bcb01e3969e51 + sha256: be2ccef78661f771220a86756e0eab52c4e6d1e0c01076b502afac2c37b0a6c2 {% else %} # The "pytorch-v" tarballs contain submodules; the "pytorch-" ones don't. - url: https://github.com/pytorch/pytorch/releases/download/v{{ version }}/pytorch-v{{ version }}.tar.gz - sha256: c70a2c9488f6f6e8af5982a10d1cc2c37b7df5e6506d839daa5d5e250953d7b5 + sha256: c6980af3c0ea311f49f90987982be715e4d702539fea41e52f55ad7f0b105dc3 {% endif %} patches: - patches/0001-Force-usage-of-python-3-and-error-without-numpy.patch @@ -79,7 +84,7 @@ build: skip: true # [is_rc] {% endif %} string: cuda{{ cuda_compiler_version | replace('.', '') }}_{{ blas_impl }}_h{{ PKG_HASH }}_{{ build }} # [cuda_compiler_version != "None"] - string: cpu_{{ blas_impl }}_h{{ PKG_HASH }}_{{ build }} # [cuda_compiler_version == "None"] + string: cpu_{{ blas_impl }}_h{{ PKG_HASH }}_{{ build }} # [cuda_compiler_version == "None"] detect_binary_files_with_prefix: false run_exports: - {{ pin_subpackage('libtorch', max_pin='x.x') }} @@ -241,11 +246,11 @@ test: outputs: - name: libtorch - name: pytorch - script: build.sh # [unix] - script: bld.bat # [win] + script: build.sh # [unix] + script: bld.bat # [win] build: string: cuda{{ cuda_compiler_version | replace('.', '') }}_{{ blas_impl }}_py{{ CONDA_PY }}_h{{ PKG_HASH }}_{{ build }} # [cuda_compiler_version != "None"] - string: cpu_{{ blas_impl }}_py{{ CONDA_PY }}_h{{ PKG_HASH }}_{{ build }} # [cuda_compiler_version == "None"] + string: cpu_{{ blas_impl }}_py{{ CONDA_PY }}_h{{ PKG_HASH }}_{{ build }} # [cuda_compiler_version == "None"] detect_binary_files_with_prefix: false run_exports: - {{ pin_subpackage('pytorch', max_pin='x.x') }} @@ -355,7 +360,7 @@ outputs: - name: pytorch-tests build: string: cuda{{ cuda_compiler_version | replace('.', '') }}_{{ blas_impl }}_py{{ CONDA_PY }}_h{{ PKG_HASH }}_{{ build }} # [cuda_compiler_version != "None"] - string: cpu_{{ blas_impl }}_py{{ CONDA_PY }}_h{{ PKG_HASH }}_{{ build }} # [cuda_compiler_version == "None"] + string: cpu_{{ blas_impl }}_py{{ CONDA_PY }}_h{{ PKG_HASH }}_{{ build }} # [cuda_compiler_version == "None"] detect_binary_files_with_prefix: false requirements: host: @@ -558,9 +563,9 @@ outputs: {% set pytorch_cpu_gpu = "pytorch-gpu" %} # [cuda_compiler_version != "None"] - name: {{ pytorch_cpu_gpu }} build: - string: cuda{{ cuda_compiler_version | replace('.', '') }}_{{ blas_impl }}_h{{ PKG_HASH }}_{{ build }} # [megabuild and cuda_compiler_version != "None"] - string: cpu_{{ blas_impl }}_h{{ PKG_HASH }}_{{ build }} # [megabuild and cuda_compiler_version == "None"] - string: cpu_{{ blas_impl }}_py{{ CONDA_PY }}_h{{ PKG_HASH }}_{{ build }} # [not megabuild] + string: cuda{{ cuda_compiler_version | replace('.', '') }}_{{ blas_impl }}_h{{ PKG_HASH }}_{{ build }} # [megabuild and cuda_compiler_version != "None"] + string: cpu_{{ blas_impl }}_h{{ PKG_HASH }}_{{ build }} # [megabuild and cuda_compiler_version == "None"] + string: cpu_{{ blas_impl }}_py{{ CONDA_PY }}_h{{ PKG_HASH }}_{{ build }} # [not megabuild] detect_binary_files_with_prefix: false requirements: run: