llvm: Fix compatibility with hwloc@1 and hwloc@:2.3#35387
Merged
kwryankrattiger merged 1 commit intospack:developfrom May 22, 2023
Merged
llvm: Fix compatibility with hwloc@1 and hwloc@:2.3#35387kwryankrattiger merged 1 commit intospack:developfrom
kwryankrattiger merged 1 commit intospack:developfrom
Conversation
kwryankrattiger
previously approved these changes
Feb 8, 2023
Contributor
kwryankrattiger
left a comment
There was a problem hiding this comment.
LGTM and things being fixed in the upstream is even better.
Member
|
@spackbot run pipeline |
|
I've started that pipeline for you! |
auto-merge was automatically disabled
February 20, 2023 13:57
Head branch was pushed to by a user without write access
685017c to
6d23f76
Compare
Contributor
Author
|
I inadvertently disabled the auto merge by pushing a rebase, sorry about that. |
kwryankrattiger
approved these changes
Mar 6, 2023
Contributor
|
@Jordan474 Can you take a look at the CI failures? If it was random, we can get a Spack maintainer to restart the CI? |
Contributor
Author
|
@naromero77 I don't know why it failed last time. I updated the branch and now everything is green again. |
RikkiButler20
pushed a commit
to RikkiButler20/spack
that referenced
this pull request
May 23, 2023
luigi-calori
pushed a commit
to RemoteConnectionManager/spack
that referenced
this pull request
Jun 7, 2023
greenc-FNAL
pushed a commit
to FNALssi/spack
that referenced
this pull request
Jul 19, 2023
greenc-FNAL
pushed a commit
to FNALssi/spack
that referenced
this pull request
Aug 22, 2023
greenc-FNAL
pushed a commit
to greenc-FNAL/spack
that referenced
this pull request
Aug 22, 2023
greenc-FNAL
pushed a commit
to FNALssi/spack
that referenced
this pull request
Aug 23, 2023
greenc-FNAL
pushed a commit
to FNALssi/spack
that referenced
this pull request
Aug 23, 2023
marcmengel
pushed a commit
to FNALssi/spack
that referenced
this pull request
Aug 23, 2023
* llvm: add version 16.0.3 (spack#37472) * llvm: Fix hwloc@1 and hwloc@:2.3 compatibility (spack#35387) * llvm: optionally build compiler-rt, libcxx and libunwind as runtimes (spack#32476) * llvm: replace +omp_as_runtime with omp=runtime * llvm: fetch 'libomp-libflags-as-list.patch' from upstream repo * llvm: replace 'llvm14-hwloc-ompd.patch' with the official fix from upstream repo * llvm: fix-up for the black reformatting * llvm: fetch 'constexpr_longdouble.patch' from upstream repo * llvm: optionally build libcxx as a runtime * llvm: fetch 'llvm5-sanitizer-ustat.patch' from upstream repo * llvm: update 'sanitizer-ipc_perm_mode.patch' * llvm: refactor compiler conflicts when libcxx=project * llvm: fetch 'llvm_python_path.patch' from upstream repo * llvm: update comments and condition for 'xray_buffer_queue-cstddef.patch' * llvm: optionally build compiler-rt as a runtime * llvm: fetch 'lldb_external_ncurses-10.patch' from upstream repo * llvm: fetch 'llvm_py37.patch' from upstream repo * llvm: rename variant 'internal_unwind' to 'libunwind' * llvm: optionally build libunwind as a runtime * llvm: extend the list of maintainers * llvm: allow for explicit '~clang~flang~libomptarget~lldb~omp_debug~z3' * llvm: fetch 'llvm5-lld-ELF-Symbols.patch' from FreeBSD port repo * llvm: fetch most of 'missing-includes.patch' from upstream repo and reuse 'llvm-gcc11.patch' * llvm: regroup patches for missing include directives and drop compiler constraints for them * llvm: fetch 'llvm-gcc11.patch' from upstream repo * llvm: fetch 'no_cyclades.patch' from upstream repo * llvm: update comments and condition for 'no_cyclades9.patch' * llvm: rename variant 'omp' to 'openmp' * llvm: constrain and rename variant 'omp_tsan' to 'libomp_tsan' * llvm: rename variant 'omp_debug' to 'libomptarget_debug' * llvm: do not apply same patch twice * llvm: constrain and document the '*-thread.patch' patches * llvm: document the '~lld+libomptarget' conflict * llvm: update comments for the 'D133513.diff' patch * llvm: add new versions and set default for libomptarget according to os (spack#38092) * llvm: add new versions and set default for libomptarget according to os modified: var/spack/repos/builtin/packages/llvm/package.py * Incorporate reviewer suggestions Co-authored-by: Sergey Kosukhin <[email protected]> --------- Co-authored-by: Sergey Kosukhin <[email protected]> * Add 1606 (spack#38511) * llvm: fix build against libstdc++ 13 (spack#38329) llvm @13-15 is required for ispc, but fails to build with GCC 13. 14.0.6 and 15.0.7 built successfully with upstream patch, 13.0.1 still fails. Thus upstream patch is applied to 14 and 15 only. * ispc: on ARM, build with ARM targets enabled, and updates (spack#38080) * llvm: fix build with libcxx=none * ispc: checksum 1.20.0 * ispc: ensure that it does not crash immediately this would happen if linked to the wrong libc++ * ispc: fix build on macos find ncurses instead of curses and link against tinfo in order to avoid unresolved references to _del_curterm, _set_curterm, _setupterm, and _tigetnum * ispc: enable arm targets, if building on arm * ispc: remove double cmake argument I forgot to remove the constant -DARM_ENABLED=FALSE when adding -DARM_ENABLED with a value depending on target architecture * ispc: fix linux build since 1.20, linux build uses TBB as default tasking system and thus needs to depend on it * ispc: try to fix link error on linux link against both curses (as before) and tinfo (added because of macos) * ispc: update for recent llvm changes libcxx=none instead of ~libcxx --------- Co-authored-by: Satish Balay <[email protected]> Co-authored-by: Jordan Galby <[email protected]> Co-authored-by: Sergey Kosukhin <[email protected]> Co-authored-by: Sajid Ali <[email protected]> Co-authored-by: Sergey Kosukhin <[email protected]> Co-authored-by: Paul R. C. Kent <[email protected]> Co-authored-by: Martin Aumüller <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR applies a patch from
llvm@16tollvm@14:15to fixhwloc@:2.3compatibility. Also relax hwloc contraint forllvm@:12. So onlyllvm@13has issues withhwloc@1.Here is what I tested with spack 0.20, on ubuntu 22.04, gcc 11, no system hwloc (important to catch missing include):
llvm@9,12 ^hwloc@1OK for me (no constraint, no patch)llvm@13 ^hwloc@1FAIL: needs[email protected]:(1)llvm@13 patches=thisprFAIL: patch does not applyllvm@14,15 ^hwloc@1FAIL: needs[email protected]:, maybe even[email protected]:(2)llvm@14,15 patches=thispr ^hwloc@1OKllvm@16: ^hwloc@1:2OK for me (the patch comes from llvm@16)So I think #34780's constraint
llvm@9: ^[email protected]:is not actually exact, and we can be further relaxed with the patch.Do you think I miss something @kwryankrattiger ?
(1): With
llvm@13 ^hwloc@1I geterror: no member named 'kind' in 'hwloc_obj_attr_u::hwloc_group_attr_s(2): As seen in the patch there actually seem to be
[email protected]code.EDIT: tested
llvm@16I have another issue with
llvm/lib/libomp.somissing a NEEDED to libhwloc since at leastllvm@12(it's ok inllvm@9). I don't know if this is intentional yet, but anyway this will be for another PR if I find something.