Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Skip compiler activation (on Linux) #213

Merged
merged 5 commits into from
Aug 8, 2022
Merged

Skip compiler activation (on Linux) #213

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1e11de8
MNT: Re-rendered with conda-build 3.21.9, conda-smithy 3.21.0, and co…
jakirkham Jul 11, 2022
912af9c
Use non-activation variant of compilers on Linux
jakirkham Jul 11, 2022
7df8719
Bump build number to 2
jakirkham Jul 11, 2022
b4d9a0b
Stick with Netlib 3.8 on Windows
jakirkham Jul 19, 2022
1b8f627
Merge conda-forge/main into jakirkham/skip_comp_activation
jakirkham Aug 8, 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
69 changes: 21 additions & 48 deletions .azure-pipelines/azure-pipelines-win.yml
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ jpeg:
krb5:
- '1.19'
libblas:
- 3.8 *netlib
- 3.9 *netlib
libcurl:
- '7'
liblapack:
- 3.8 *netlib
- 3.9 *netlib
libpng:
- '1.6'
libssh2:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_aarch64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ jpeg:
krb5:
- '1.19'
libblas:
- 3.8 *netlib
- 3.9 *netlib
libcurl:
- '7'
liblapack:
- 3.8 *netlib
- 3.9 *netlib
libpng:
- '1.6'
libssh2:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_ppc64le_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ jpeg:
krb5:
- '1.19'
libblas:
- 3.8 *netlib
- 3.9 *netlib
libcurl:
- '7'
liblapack:
- 3.8 *netlib
- 3.9 *netlib
libpng:
- '1.6'
libssh2:
Expand Down
10 changes: 5 additions & 5 deletions .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '12'
- '13'
cairo:
- '1.16'
channel_sources:
Expand All @@ -15,7 +15,7 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '12'
- '13'
fortran_compiler:
- gfortran
fortran_compiler_version:
Expand All @@ -33,13 +33,13 @@ jpeg:
krb5:
- '1.19'
libblas:
- 3.8 *netlib
- 3.9 *netlib
libcurl:
- '7'
libiconv:
- '1.16'
liblapack:
- 3.8 *netlib
- 3.9 *netlib
libpng:
- '1.6'
libssh2:
Expand All @@ -49,7 +49,7 @@ libtiff:
libxml2:
- '2.9'
llvm_openmp:
- '12'
- '13'
macos_machine:
- x86_64-apple-darwin13.4.0
ncurses:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/osx_arm64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '12'
- '13'
cairo:
- '1.16'
channel_sources:
Expand All @@ -15,7 +15,7 @@ channel_targets:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '12'
- '13'
fortran_compiler:
- gfortran
fortran_compiler_version:
Expand Down Expand Up @@ -49,7 +49,7 @@ libtiff:
libxml2:
- '2.9'
llvm_openmp:
- '12'
- '13'
macos_machine:
- arm64-apple-darwin20.0.0
ncurses:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/win_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ channel_sources:
channel_targets:
- conda-forge main
libblas:
- 3.8 *netlib
- 3.9 *netlib
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jakirkham what do you think about reverting this file, and merging? This is really to help unix users move forward. We can deal with m2- stuff later?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If that will fix the Windows CI issue, happy to try. Didn't quite follow how this is connected though

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it wont. it will just keep this file consistent with the last windows build.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i guess it isnt really important. i would merge :/ wile waiting for a fix

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah ok. Yeah that makes sense.

liblapack:
- 3.8 *netlib
- 3.9 *netlib
m2w64_c_compiler:
- m2w64-toolchain
m2w64_cxx_compiler:
Expand Down
3 changes: 2 additions & 1 deletion .circleci/config.yml
View file
Open in desktop

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

9 changes: 8 additions & 1 deletion .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.

4 changes: 4 additions & 0 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.

30 changes: 22 additions & 8 deletions LICENSE.txt
View file
Open in desktop

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

19 changes: 13 additions & 6 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.

11 changes: 7 additions & 4 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ source:
- 0016-Use-LAPACK_LDFLAGS-in-Rlapack_la_LIBADD.patch

build:
number: 1
number: 2

outputs:
- name: r-base
Expand Down Expand Up @@ -161,9 +161,12 @@ outputs:
- _r-mutex 1.* anacondar_1
# Needed by R CMD javareconf
- make # [not win]
- {{ compiler('fortran') }} # [not win]
- {{ c_compiler|default("blah") }}_{{ target_platform }} >={{ c_compiler_version|default("0") }} # [not win]
- {{ cxx_compiler|default("blah") }}_{{ target_platform }} >={{ cxx_compiler_version|default("0") }} # [not win]
- gcc_impl_{{ target_platform }} >={{ c_compiler_version|default("0") }} # [linux]
- gxx_impl_{{ target_platform }} >={{ cxx_compiler_version|default("0") }} # [linux]
- gfortran_impl_{{ target_platform }} # [linux]
- {{ c_compiler|default("blah") }}_{{ target_platform }} >={{ c_compiler_version|default("0") }} # [osx]
- {{ cxx_compiler|default("blah") }}_{{ target_platform }} >={{ cxx_compiler_version|default("0") }} # [osx]
- {{ compiler('fortran') }} # [osx]
- {{ pin_compatible('llvm-openmp', max_pin=None) }} # [osx]
- curl # [not win]
- {{ native }}bzip2 # [win]
Expand Down