Skip to content

Commit

Permalink
Merge pull request #16 from regro-cf-autotick-bot/rebuild-python311-0…
Browse files Browse the repository at this point in the history
…-1_h7a56cf

Rebuild for python311
  • Loading branch information
xhochy authored Sep 19, 2023
2 parents 72c362f + 1fdf8d0 commit b790e59
Show file tree
Hide file tree
Showing 17 changed files with 191 additions and 17 deletions.
13 changes: 8 additions & 5 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
c_compiler:
- gcc
c_compiler_version:
- '10'
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
cuda_compiler_version:
- '11.2'
cxx_compiler:
- gxx
cxx_compiler_version:
- '10'
docker_image:
- quay.io/condaforge/linux-anvil-cuda:11.2
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.11.* *_cpython
pytorch:
- '2.0'
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ channel_sources:
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
- None
cuda_compiler_version:
- None
cxx_compiler:
Expand All @@ -31,6 +31,7 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
cdt_name:
- cos6
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- None
cuda_compiler_version:
- None
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.11.* *_cpython
pytorch:
- '2.0'
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ channel_sources:
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
- None
cuda_compiler_version:
- None
cxx_compiler:
Expand All @@ -31,6 +31,7 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ channel_sources:
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
- None
cuda_compiler_version:
- None
cxx_compiler:
Expand All @@ -31,6 +31,7 @@ target_platform:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
37 changes: 37 additions & 0 deletions .ci_support/migrations/python311.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
migrator_ts: 1666686085
__migrator:
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 # new entry
- 3.6.* *_73_pypy
- 3.7.* *_73_pypy
- 3.8.* *_73_pypy
- 3.9.* *_73_pypy
paused: false
longterm: True
pr_limit: 60
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
exclude_pinned_pkgs: false

python:
- 3.11.* *_cpython
# additional entries to add for zip_keys
numpy:
- 1.23
python_impl:
- cpython
7 changes: 0 additions & 7 deletions .ci_support/migrations/pytorch20.yaml

This file was deleted.

33 changes: 33 additions & 0 deletions .ci_support/osx_64_python3.11.____cpython.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
c_compiler:
- clang
c_compiler_version:
- '15'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler_version:
- None
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
llvm_openmp:
- '15'
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.11.* *_cpython
pytorch:
- '2.0'
target_platform:
- osx-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
2 changes: 1 addition & 1 deletion .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ else
export FORCE_CUDA=0
fi

if [[ "${target_platform}" == osx-* ]]; then
export CXXFLAGS="-D_LIBCPP_DISABLE_AVAILABILITY ${CXXFLAGS}"
fi

# export USE_MKL_BLAS=1 # only used for >0.1.0
export Torch_DIR=$(python -c 'import torch; print(torch.utils.cmake_prefix_path)')

Expand Down
2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ source:
sha256: 3c486a72a421b4769cd1ca114522eedf25d4115ca529091db06c10264a406ac4

build:
number: 2
number: 3
string: cuda{{ cuda_compiler_version | replace('.', '') }}py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version != "None"]
string: cpu_py{{ CONDA_PY }}h{{ PKG_HASH }}_{{ PKG_BUILDNUM }} # [cuda_compiler_version == "None"]
# Only build for CUDA >=11.2
Expand Down

0 comments on commit b790e59

Please sign in to comment.