Skip to content

Commit

Permalink
Merge pull request #98 from minrk/split-rattler
Browse files Browse the repository at this point in the history
split outputs, build with rattler-build, flang 19
  • Loading branch information
minrk authored Dec 12, 2024
2 parents b93e974 + a7699fa commit a289ee4
Show file tree
Hide file tree
Showing 20 changed files with 1,102 additions and 181 deletions.
6 changes: 3 additions & 3 deletions .azure-pipelines/azure-pipelines-linux.yml

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

1 change: 1 addition & 0 deletions .azure-pipelines/azure-pipelines-win.yml

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

4 changes: 1 addition & 3 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler:
cxx_compiler_version:
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-x86_64:alma9
fortran_compiler:
- gfortran
fortran_compiler_version:
Expand All @@ -36,8 +36,6 @@ mpfr:
- '4'
target_platform:
- linux-64
tbb_devel:
- '2021'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
8 changes: 1 addition & 7 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
c_compiler:
- gcc
c_compiler_version:
Expand All @@ -8,8 +6,6 @@ c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
- conda
channel_sources:
Expand All @@ -21,7 +17,7 @@ cxx_compiler:
cxx_compiler_version:
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
- quay.io/condaforge/linux-anvil-x86_64:alma9
fortran_compiler:
- gfortran
fortran_compiler_version:
Expand All @@ -40,8 +36,6 @@ mpfr:
- '4'
target_platform:
- linux-aarch64
tbb_devel:
- '2021'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
4 changes: 1 addition & 3 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cxx_compiler:
cxx_compiler_version:
- '13'
docker_image:
- quay.io/condaforge/linux-anvil-ppc64le
- quay.io/condaforge/linux-anvil-x86_64:alma9
fortran_compiler:
- gfortran
fortran_compiler_version:
Expand All @@ -36,8 +36,6 @@ mpfr:
- '4'
target_platform:
- linux-ppc64le
tbb_devel:
- '2021'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
203 changes: 203 additions & 0 deletions .ci_support/migrations/flang19.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,203 @@
__migrator:
kind: version
migration_number: 2
build_number: 1
commit_message: |
Rebuild for flang 19
TL;DR: We are trying to switch our Fortran compilers on windows to flang.
This is not 100% guaranteed to work, but should be fine in the majority of cases.
The new LLVM-based flang has become mature enough that it should be possible to
broadly switch over our Fortran compilers on windows to it (until now we only had
an ancient pre-LLVM flang 5, or alternatively the GCC-based `m2w64_fortran`).
As such, this PR attempts to homogenize any use of `m2w64_fortran` and other `m2w64_*`
compilers to our default stack (which would then be MSVC + flang on windows), with
the exception of feedstocks for R-packages, which stay on the `m2w64_` compilers.
Recipes that have hard-coded expectations about the name of the fortran compiler
will need to adjust to use `%FC%` or `flang-new` for the compiler name. Similarly,
you may need to change the linker to `%LD%` or use `lld-link`.
It is also possible that you run into compilation errors due to differences in
compiler behaviour, bugs or as-yet unimplemented features. In case of compilation
errors due to stricter default language standards, you should be able to fix things
by passing `-std=legacy` to `FFLAGS`.
If you have problems with this PR, feel free to ping the @c-f/flang-activation team.
In case you have convinced yourself that flang really is not ready yet to be used to
compile a given feedstock, you may also close this migrator PR.
platform_allowlist:
- win-64
override_cbc_keys:
- fortran_compiler_stub
exclude:
# exclude r-packages, which generally use m2w64-stack consistently
- r-base
- r-acepack
- r-akima
- r-amap
- r-ash
- r-aws
- r-bain
- r-bigalgebra
- r-biglm
- r-blockmodeling
- r-bma
- r-bootstrap
- r-cairodevice
- r-chnosz
- r-circular
- r-classint
- r-clinfun
- r-clues
- r-cluster
- r-clustercrit
- r-cmprsk
- r-copula
- r-coxboost
- r-coxphf
- r-cubature
- r-ddalpha
- r-delaporte
- r-deldir
- r-desctools
- r-desolve
- r-distributionutils
- r-dixontest
- r-dotcall64
- r-dplr
- r-dppackage
- r-dpq
- r-dse
- r-earth
- r-expm
- r-fastmatrix
- r-fd
- r-fgarch
- r-fields
- r-flashclust
- r-float
- r-fme
- r-gam
- r-gap
- r-gee
- r-geigen
- r-gglasso
- r-glasso
- r-glassofast
- r-glmmml
- r-glmnet
- r-gmm
- r-gss
- r-hdrcde
- r-hdtweedie
- r-hexbin
- r-hiclimr
- r-hiddenmarkov
- r-hier.part
- r-hmisc
- r-igraph
- r-interp
- r-iso
- r-kendall
- r-kernsmooth
- r-kfas
- r-l1pack
- r-labdsv
- r-lars
- r-lbfgsb3c
- r-leaps
- r-limsolve
- r-lmom
- r-lmtest
- r-logicreg
- r-logspline
- r-lokern
- r-lsei
- r-mclust
- r-mcr
- r-mda
- r-mets
- r-minpack.lm
- r-minqa
- r-mnormt
- r-mpmi
- r-mrfdepth
- r-muhaz
- r-multimode
- r-multitaper
- r-mvord
- r-mvtnorm
- r-n1qn1
- r-nimble
- r-nleqslv
- r-nlme
- r-nloptr
- r-nnls
- r-norm
- r-npregfast
- r-oce
- r-oceanview
- r-openmx
- r-pamr
- r-pan
- r-pbivnorm
- r-pcit
- r-pmcmrplus
- r-polspline
- r-pspline
- r-qap
- r-qtlrel
- r-quadprog
- r-quantreg
- r-randomfieldsutils
- r-randomforest
- r-randtoolbox
- r-rmr2
- r-rms
- r-rmumps
- r-rmutil
- r-robust
- r-robustbase
- r-rootsolve
- r-rrcov
- r-rrf
- r-rstpm2
- r-rxode
- r-rxode2
- r-seriation
- r-sgeostat
- r-signal
- r-sm
- r-softimpute
- r-spam
- r-spam64
- r-sparsem
- r-splancs
- r-splus2r
- r-stanheaders
- r-statmod
- r-subplex
- r-subselect
- r-survc1
- r-survidinri
- r-svd
- r-timsac
- r-tmvnsim
- r-tmvtnorm
- r-trend
- r-tripack
- r-tseries
- r-twdtw
- r-tweedie
- r-ucminf
- r-urca
- r-vegan
- r-vgam
- r-waveslim
migrator_ts: 1722763680.3089325

fortran_compiler_version: # [win64]
- 19 # [win64]
2 changes: 0 additions & 2 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ mpfr:
- '4'
target_platform:
- osx-64
tbb_devel:
- '2021'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
2 changes: 0 additions & 2 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ mpfr:
- '4'
target_platform:
- osx-arm64
tbb_devel:
- '2021'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
Expand Down
8 changes: 5 additions & 3 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ cxx_compiler:
fortran_compiler:
- flang
fortran_compiler_version:
- '5'
- '19'
gmp:
- '6'
libblas:
- 3.9 *netlib
libcblas:
Expand All @@ -20,7 +22,7 @@ liblapack:
- 3.9 *netlib
metis:
- 5.1.0
mpfr:
- '4'
target_platform:
- win-64
tbb_devel:
- '2021'
24 changes: 10 additions & 14 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 a289ee4

Please sign in to comment.