Skip to content
This repository has been archived by the owner on Jun 4, 2022. It is now read-only.

Rebuild for mkl2022 #50

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Rebuild for mkl2022 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9944f05
Rebuild for mkl2022
regro-cf-autotick-bot Jan 20, 2022
e5f2d05
MNT: Re-rendered with conda-build 3.21.7, conda-smithy 3.16.1, and co…
regro-cf-autotick-bot Jan 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

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

5 changes: 5 additions & 0 deletions .azure-pipelines/azure-pipelines-osx.yml
View file
Open in desktop

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

10 changes: 5 additions & 5 deletions .ci_support/linux_64_bla_vendorGeneric.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ c_compiler_version:
cdt_name:
- cos6
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '7'
docker_image:
- quay.io/condaforge/linux-anvil-comp7
- quay.io/condaforge/linux-anvil-cos7-x86_64
glpk:
- '4.65'
hdf5:
Expand All @@ -37,11 +37,13 @@ liblapack:
liblapacke:
- 3.8 *netlib
libprotobuf:
- '3.16'
- '3.18'
libxml2:
- '2.9'
lzo:
- '2'
mkl_devel:
- '2022'
pin_run_as_build:
arpack:
max_pin: x.x.x
Expand Down Expand Up @@ -70,7 +72,5 @@ xz:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - cdt_name
- docker_image
zlib:
- '1.2'
10 changes: 5 additions & 5 deletions .ci_support/linux_64_bla_vendorIntel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ c_compiler_version:
cdt_name:
- cos6
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- gxx
cxx_compiler_version:
- '7'
docker_image:
- quay.io/condaforge/linux-anvil-comp7
- quay.io/condaforge/linux-anvil-cos7-x86_64
glpk:
- '4.65'
hdf5:
Expand All @@ -37,11 +37,13 @@ liblapack:
liblapacke:
- 3.8 *netlib
libprotobuf:
- '3.16'
- '3.18'
libxml2:
- '2.9'
lzo:
- '2'
mkl_devel:
- '2022'
pin_run_as_build:
arpack:
max_pin: x.x.x
Expand Down Expand Up @@ -70,7 +72,5 @@ xz:
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - cdt_name
- docker_image
zlib:
- '1.2'
8 changes: 5 additions & 3 deletions .ci_support/migrations/libprotobuf316.yaml → .ci_support/migrations/mkl2022.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ __migrator:
build_number: 1
kind: version
migration_number: 1
libprotobuf:
- '3.16'
migrator_ts: 1620379043.9019938
migrator_ts: 1642615295
mkl:
- 2022
mkl_devel:
- 2022
6 changes: 4 additions & 2 deletions .ci_support/osx_64_bla_vendorGeneric.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ c_compiler:
c_compiler_version:
- '11'
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -35,13 +35,15 @@ liblapack:
liblapacke:
- 3.8 *netlib
libprotobuf:
- '3.16'
- '3.18'
libxml2:
- '2.9'
lzo:
- '2'
macos_machine:
- x86_64-apple-darwin13.4.0
mkl_devel:
- '2022'
pin_run_as_build:
arpack:
max_pin: x.x.x
Expand Down
6 changes: 4 additions & 2 deletions .ci_support/osx_64_bla_vendorIntel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ c_compiler:
c_compiler_version:
- '11'
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -35,13 +35,15 @@ liblapack:
liblapacke:
- 3.8 *netlib
libprotobuf:
- '3.16'
- '3.18'
libxml2:
- '2.9'
lzo:
- '2'
macos_machine:
- x86_64-apple-darwin13.4.0
mkl_devel:
- '2022'
pin_run_as_build:
arpack:
max_pin: x.x.x
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
View file
Open in desktop

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

12 changes: 8 additions & 4 deletions .scripts/build_steps.sh
View file
Open in desktop

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

7 changes: 5 additions & 2 deletions .scripts/run_docker_build.sh
View file
Open in desktop

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

14 changes: 8 additions & 6 deletions .scripts/run_osx_build.sh
View file
Open in desktop

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

3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop

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

5 changes: 5 additions & 0 deletions build-locally.py
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ source:

{% set lc, vs, ve, prefix, parbuild = "\\", "$", "", "$PREFIX", "-j $CPU_COUNT" %} # [unix]
build:
number: 11
number: 12
skip: true # [win32 or win]
merge_build_host: true # [linux and bla_vendor == "Generic"]
script: |
Expand Down