Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
4d9647e
updated v18.1.0
regro-cf-autotick-bot Mar 6, 2024
9cccb03
MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.31.1, and co…
regro-cf-autotick-bot Mar 6, 2024
70d5f8a
Merge remote-tracking branch 'upstream/rc' into 18.1.0_h098063
h-vetinari Mar 6, 2024
61a838f
remove rc-channels
h-vetinari Mar 6, 2024
d23e3dd
MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.31.1, and co…
h-vetinari Mar 6, 2024
79b17e1
updated v18.1.1
regro-cf-autotick-bot Mar 9, 2024
64d6e39
Merge pull request #115 from regro-cf-autotick-bot/18.1.0_h098063
h-vetinari Mar 15, 2024
95938bf
[ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration Conda…
conda-forge-curator[bot] Mar 15, 2024
d3afd34
updated v18.1.2
regro-cf-autotick-bot Mar 20, 2024
3592f52
MNT: Re-rendered with conda-build 24.1.2, conda-smithy 3.32.0, and co…
regro-cf-autotick-bot Mar 20, 2024
4d2a71f
openmp v18.1.2 (#119)
github-actions[bot] Mar 21, 2024
9a8e061
updated v18.1.3
regro-cf-autotick-bot Apr 4, 2024
0157ff4
MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.34.1, and co…
Apr 4, 2024
b68e192
openmp v18.1.3 (#120)
github-actions[bot] Apr 8, 2024
d09d480
updated v18.1.4
regro-cf-autotick-bot Apr 20, 2024
0e56491
Merge pull request #121 from regro-cf-autotick-bot/18.1.4_hdd4d3e
h-vetinari May 2, 2024
ecb5ace
updated v18.1.5
regro-cf-autotick-bot May 4, 2024
1a82b97
MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.35.0, and co…
regro-cf-autotick-bot May 4, 2024
9989958
Merge pull request #123 from regro-cf-autotick-bot/18.1.5_h424449
h-vetinari May 6, 2024
1c39aca
[ci skip] [skip ci] [cf admin skip] ***NO_CI*** admin migration Conda…
conda-forge-curator[bot] May 12, 2024
48053c9
updated v18.1.6
regro-cf-autotick-bot May 19, 2024
5b7e808
MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.36.0, and co…
regro-cf-autotick-bot May 19, 2024
1dc3ee6
openmp v18.1.6 (#124)
github-actions[bot] May 26, 2024
5ff141b
switch to github-generated sources
h-vetinari Jun 7, 2024
1d2c524
openmp v18.1.7
h-vetinari Jun 7, 2024
a150b92
Merge pull request #127 from h-vetinari/bump
h-vetinari Jun 8, 2024
2c03932
[ci skip] update abi_migration_branches
h-vetinari Jun 12, 2024
c908770
updated v18.1.8
regro-cf-autotick-bot Jun 19, 2024
967674c
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
regro-cf-autotick-bot Jun 19, 2024
c6c62ea
Merge pull request #129 from regro-cf-autotick-bot/18.1.8_hbcc717
h-vetinari Jun 20, 2024
6500093
harmonize & shorten build script names
h-vetinari Jun 27, 2024
591c3aa
clean up test section a bit
h-vetinari Jun 27, 2024
518920b
silence robocopy
h-vetinari Jun 27, 2024
4ec4661
Minor cleanups (#131)
github-actions[bot] Jun 28, 2024
b082a71
Merge remote-tracking branch 'upstream/main' into rc
h-vetinari Jul 25, 2024
0a56a9c
openmp v19.1.0.rc1
h-vetinari Jul 26, 2024
4b55815
rebase patches
h-vetinari Jul 26, 2024
56429a6
set -DLIBOMP_FORTRAN_MODULES=ON
h-vetinari Jun 28, 2024
807f5dc
use flang as fortran compiler on windows
h-vetinari Jun 28, 2024
777fe6a
set FC
h-vetinari Jun 29, 2024
f9ff398
avoid run-exports from fortran-compiler
h-vetinari Jul 12, 2024
0bfee06
Revert "remove rc-channels"
h-vetinari Jul 26, 2024
af6618a
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and co…
h-vetinari Jul 26, 2024
48229ba
drop obsolete host deps on linux
h-vetinari Jul 27, 2024
77ef88b
use default compilers on osx
h-vetinari Jul 27, 2024
4a8e07a
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and co…
h-vetinari Jul 27, 2024
a1285a5
alphabetize & unfold conda-forge.yml
h-vetinari Jul 27, 2024
8b23b90
disable fortran bits on windows to bootstrap
h-vetinari Jul 29, 2024
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
1 change: 1 addition & 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: 2 additions & 1 deletion .azure-pipelines/azure-pipelines-osx.yml

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

19 changes: 14 additions & 5 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge/label/llvm_rc,conda-forge
channel_targets:
Expand All @@ -10,11 +14,16 @@ cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
perl:
- 5.32.1
target_platform:
- linux-64
zlib:
- '1.2'
zstd:
- '1.5'
zip_keys:
- - c_stdlib_version
- cdt_name
- - cxx_compiler_version
- fortran_compiler_version
17 changes: 13 additions & 4 deletions .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
Expand All @@ -14,11 +18,16 @@ cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
perl:
- 5.32.1
target_platform:
- linux-aarch64
zlib:
- '1.2'
zstd:
- '1.5'
zip_keys:
- - c_stdlib_version
- cdt_name
- - cxx_compiler_version
- fortran_compiler_version
17 changes: 13 additions & 4 deletions .ci_support/linux_ppc64le_.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
Expand All @@ -10,11 +14,16 @@ cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
perl:
- 5.32.1
target_platform:
- linux-ppc64le
zlib:
- '1.2'
zstd:
- '1.5'
zip_keys:
- - c_stdlib_version
- cdt_name
- - cxx_compiler_version
- fortran_compiler_version
17 changes: 15 additions & 2 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,29 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
- '10.13'
MACOSX_SDK_VERSION:
- '10.13'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge/label/llvm_rc,conda-forge
channel_targets:
- conda-forge llvm_rc
cxx_compiler:
- clang_bootstrap
- clangxx
cxx_compiler_version:
- '16'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
macos_machine:
- x86_64-apple-darwin13.4.0
perl:
- 5.32.1
target_platform:
- osx-64
zip_keys:
- - cxx_compiler_version
- fortran_compiler_version
15 changes: 14 additions & 1 deletion .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,29 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
MACOSX_SDK_VERSION:
- '11.0'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge/label/llvm_rc,conda-forge
channel_targets:
- conda-forge llvm_rc
cxx_compiler:
- clang_bootstrap
- clangxx
cxx_compiler_version:
- '16'
fortran_compiler:
- gfortran
fortran_compiler_version:
- '12'
macos_machine:
- arm64-apple-darwin20.0.0
perl:
- 5.32.1
target_platform:
- osx-arm64
zip_keys:
- - cxx_compiler_version
- fortran_compiler_version
6 changes: 6 additions & 0 deletions .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
c_stdlib:
- vs
channel_sources:
- conda-forge/label/llvm_rc,conda-forge
channel_targets:
- conda-forge llvm_rc
cxx_compiler:
- vs2019
fortran_compiler:
- flang
fortran_compiler_version:
- '18'
perl:
- 5.32.1
target_platform:
Expand Down
4 changes: 2 additions & 2 deletions .gitattributes

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

8 changes: 7 additions & 1 deletion .scripts/build_steps.sh

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

9 changes: 8 additions & 1 deletion .scripts/run_osx_build.sh

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

7 changes: 6 additions & 1 deletion .scripts/run_win_build.bat

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

4 changes: 2 additions & 2 deletions azure-pipelines.yml

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

16 changes: 11 additions & 5 deletions conda-forge.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
bot:
abi_migration_branches:
- 17.x
- 16.x
build_platform: {osx_arm64: osx_64, linux_ppc64le: linux_64, linux_aarch64: linux_64}
build_platform:
linux_aarch64: linux_64
linux_ppc64le: linux_64
osx_arm64: osx_64
conda_build:
pkg_format: '2'
error_overlinking: true
conda_forge_output_validation: true
provider: {linux_aarch64: azure, linux_ppc64le: azure}
github:
branch_name: main
tooling_branch_name: main
conda_build:
pkg_format: '2'
error_overlinking: true
provider:
linux_aarch64: azure
linux_ppc64le: azure
test: native_and_emulated
5 changes: 3 additions & 2 deletions recipe/bld-llvm-openmp.bat → recipe/build-pkg.bat
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
:: using subproject sources has been effectively broken in LLVM 14,
:: so we use the entire project, but make sure we don't pick up
:: anything in-tree other than openmp & the shared cmake folder
robocopy llvm-project\openmp .\openmp /E
robocopy llvm-project\cmake .\cmake /E
robocopy llvm-project\openmp .\openmp /E >nul
robocopy llvm-project\cmake .\cmake /E >nul
:: do not check %ERRORLEVEL%! robocopy returns an exit code
:: of 1 if one or more files were successfully copied.
del /f /q llvm-project
Expand All @@ -15,6 +15,7 @@ cd build

set "CC=clang-cl.exe"
set "CXX=clang-cl.exe"
set "FC=flang-new.exe"

cmake -G "Ninja" ^
-DCMAKE_BUILD_TYPE="Release" ^
Expand Down
6 changes: 3 additions & 3 deletions recipe/build-llvm-openmp.sh → recipe/build-pkg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,11 @@ fi

if [[ "${target_platform}" == "linux"* ]]; then
export LDFLAGS="$LDFLAGS -static-libgcc -static-libstdc++"
fi

if [[ "${target_platform}" == "linux"* ]]; then
# This should have been defined by HandleLLVMOptions.cmake
# Not sure why it is not.
export CXXFLAGS="$CXXFLAGS -D__STDC_FORMAT_MACROS"
# not possible on osx due to build cycle, see meta.yaml
export EXTRA_CMAKE="-DLIBOMP_FORTRAN_MODULES=ON"
fi

if [[ "${PKG_VERSION}" == *rc* ]]; then
Expand All @@ -50,6 +49,7 @@ cmake -G Ninja \
-DCMAKE_INSTALL_PREFIX=$PREFIX \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_PREFIX_PATH=$PREFIX \
${EXTRA_CMAKE} \
..

cmake --build .
Expand Down
8 changes: 4 additions & 4 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
c_compiler: # [osx]
- clang_bootstrap # [osx]
cxx_compiler: # [osx]
- clang_bootstrap # [osx]
fortran_compiler: # [win]
- flang # [win]
fortran_compiler_version: # [win]
- 18 # [win]

channel_targets:
- conda-forge llvm_rc
Expand Down
Loading