Skip to content

Commit

Permalink
Merge pull request #30 from RaulPPelaez/v2.0
Browse files Browse the repository at this point in the history
V2.0
  • Loading branch information
RaulPPelaez authored Jan 19, 2024
2 parents 8d432d7 + 0e52911 commit be88b0c
Show file tree
Hide file tree
Showing 17 changed files with 262 additions and 170 deletions.
12 changes: 12 additions & 0 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
@@ -0,0 +1,35 @@
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.9.* *_73_pypy
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
@@ -0,0 +1,35 @@
c_compiler:
- gcc
c_compiler_version:
- '11'
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- nvcc
cuda_compiler_version:
- '11.8'
cxx_compiler:
- gxx
cxx_compiler_version:
- '11'
docker_image:
- quay.io/condaforge/linux-anvil-cuda:11.8
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.9.* *_73_pypy
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
@@ -0,0 +1,35 @@
c_compiler:
- gcc
c_compiler_version:
- '12'
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler:
- cuda-nvcc
cuda_compiler_version:
- '12.0'
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.9.* *_73_pypy
target_platform:
- linux-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- cuda_compiler
- cuda_compiler_version
- cdt_name
- docker_image
99 changes: 0 additions & 99 deletions .ci_support/migrations/cuda118.yaml

This file was deleted.

1 change: 1 addition & 0 deletions .ci_support/migrations/cuda120.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ __migrator:
- 11.0 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 11.1 # [(linux64 or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 11.2 # [(linux or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
- 11.8 # [(linux or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]-
- 12.0 # [(linux or win) and os.environ.get("CF_CUDA_ENABLED", "False") == "True"]
commit_message: |
Rebuild for CUDA 12 w/arch support
Expand Down
41 changes: 41 additions & 0 deletions .ci_support/migrations/pypy38.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
migrator_ts: 1647123563
__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
- 3.6.* *_73_pypy
- 3.7.* *_73_pypy
- 3.8.* *_73_pypy
- 3.9.* *_73_pypy
paused: False
longterm: True
use_local: False
check_solvable: True
exclude_pinned_pkgs: False
pr_limit: 10
bump_number: 1
commit_message: "Rebuild for PyPy3.9"
exclude:
# this shouldn't attempt to modify the python feedstocks
- python
- pypy3.6
- pypy-meta
ignored_deps_per_node:
matplotlib:
- pyqt

python:
- 3.9.* *_73_pypy # [not (osx and arm64)]
numpy:
# part of a zip_keys: python, python_impl, numpy
- 1.22 # [not (osx and arm64)]
python_impl:
- pypy # [not (osx and arm64)]
29 changes: 29 additions & 0 deletions .ci_support/osx_64_python3.9.____73_pypy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
c_compiler:
- clang
c_compiler_version:
- '16'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cuda_compiler_version:
- None
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
macos_machine:
- x86_64-apple-darwin13.4.0
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.9.* *_73_pypy
target_platform:
- osx-64
zip_keys:
- - c_compiler_version
- cxx_compiler_version
25 changes: 23 additions & 2 deletions .gitignore

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

12 changes: 3 additions & 9 deletions .scripts/build_steps.sh

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

Loading

0 comments on commit be88b0c

Please sign in to comment.