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

Jump to bottom

[dev] Reinstate libllvm-c{maj} as part of llvmdev #298

Open
wants to merge 12 commits into
base: dev
Choose a base branch
from
+21 −35
Open

[dev] Reinstate libllvm-c{maj} as part of llvmdev #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
faaa9ad
set up a swapfile on windows
h-vetinari Nov 18, 2024
272b91e
simplify extra handling; enable `.dev{X>1}` versions
h-vetinari Nov 19, 2024
c172e11
MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.44.6, and co…
h-vetinari Nov 19, 2024
2832648
llvmdev v19.1.4
h-vetinari Nov 19, 2024
e7209ef
Merge pull request #299 from h-vetinari/bump
h-vetinari Nov 19, 2024
0683357
Reinstate `libllvm-c{maj}` as part of `llvmdev`
h-vetinari Nov 26, 2024
41c372e
use new smithy config to install ATL components
h-vetinari Nov 26, 2024
6eeee96
MNT: Re-rendered with conda-build 24.11.1, conda-smithy 3.44.8, and c…
h-vetinari Nov 26, 2024
c59e6bc
Reinstate `libllvm-c{maj}` as part of `llvmdev` (#301)
conda-forge-admin Nov 27, 2024
42dede0
Merge remote-tracking branch 'upstream/main' into dev
h-vetinari Nov 27, 2024
bb7e8d1
MNT: Re-rendered with conda-build 24.11.1, conda-smithy 3.44.8, and c…
h-vetinari Nov 27, 2024
bcddef4
build llvm v20 off of https://github.com/llvm/llvm-project/commit/744…
h-vetinari Nov 27, 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
6 changes: 3 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.

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

2 changes: 1 addition & 1 deletion .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,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
libxml2:
- '2'
target_platform:
Expand Down
6 changes: 1 addition & 5 deletions .ci_support/linux_aarch64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
- conda
channel_sources:
Expand All @@ -17,7 +13,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
libxml2:
- '2'
target_platform:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/linux_ppc64le_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,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
libxml2:
- '2'
target_platform:
Expand Down
7 changes: 7 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.

1 change: 1 addition & 0 deletions conda-forge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
azure:
settings_win:
install_atl: true
variables:
CONDA_BLD_PATH: C:\\bld\\
MINIFORGE_HOME: C:\\Miniforge
Expand Down
14 changes: 7 additions & 7 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
{% set version = "20.0.0.dev0" %}
{% set version = "20.0.0.dev1" %}
{% set major_ver = version.split(".")[0] %}
{% set tail_ver = version.split(".")[-1] %}
{% set maj_min = major_ver ~ "." ~ version.split(".")[1] %}

# as of LLVM 19, we expect an "-rcX" suffix for the release candidates
{% set extra = "-" ~ version.split(".")[-1] if version.split(".")[-1] not in "0123456789" else "" %}
{% set extra = "git" if version.split(".")[-1] == "dev0" else extra %}
{% set extra = "-" ~ tail_ver if tail_ver not in "0123456789" else "" %}
{% set extra = "git" if tail_ver|trim("0123456789") == "dev" else extra %}

package:
name: llvm-package
version: {{ version }}

source:
# url: https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-{{ version.replace(".rc", "-rc") }}.tar.gz
url: https://github.com/llvm/llvm-project/archive/87bfa58a5a4b85416d2486797d0f21fc67da5cf3.tar.gz
sha256: 6453827c61593a987f51a5eaa265f4ccfc60901821c9bbb1c6fd1ac17681f0e3
url: https://github.com/llvm/llvm-project/archive/74449ab86b8bc8d7388ede0cc7fc3a679da0c567.tar.gz
sha256: 429b861248900cdd340963e10f9f134bb738b789f50e933d10724680312ec530
patches:
# - patches/intel-D47188-svml-VF.patch # Fixes vectorizer and extends SVML support
# - patches/expect-fastmath-entrypoints-in-add-TLI-mappings.ll.patch # adjusts test added in 10.0.0 for intel-D47188-svml-VF.patch effects
Expand Down Expand Up @@ -61,14 +62,13 @@ outputs:
host:
- libcxx {{ cxx_compiler_version }} # [osx]
- {{ pin_subpackage("libllvm" ~ major_ver, exact=True) }}
# to avoid picking up LLVM-C.{dll,lib} as part of llvmdev
- {{ pin_subpackage("libllvm-c" ~ major_ver, exact=True) }} # [win]
- {{ pin_subpackage("llvm-tools", exact=True) }}
- zlib
- zstd
run:
# we're deliberately excluding "libllvm-c<maj>" on windows
- {{ pin_subpackage("libllvm" ~ major_ver, exact=True) }}
- {{ pin_subpackage("libllvm-c" ~ major_ver, exact=True) }} # [win]
- {{ pin_subpackage("llvm-tools", exact=True) }}
# we need to do this manually because clang_bootstrap has no run-export
- libcxx >={{ cxx_compiler_version }} # [osx]
Expand Down
Loading