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

work around ld64 issue #96

Merged
merged 19 commits into from
May 18, 2024
Merged

work around ld64 issue #96

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
413cb39
wrok around ld64 issue
matthiasdiener Mar 18, 2024
95c2ba1
constrain ld64 version
matthiasdiener Mar 18, 2024
28bc9d0
add pyopencl test
matthiasdiener Mar 18, 2024
07ea3a2
Revert "constrain ld64 version"
matthiasdiener Mar 18, 2024
da0a2e9
Reapply "constrain ld64 version"
matthiasdiener Mar 18, 2024
334e520
change solver to classic
matthiasdiener Mar 18, 2024
ec4a2f1
Revert "change solver to classic"
matthiasdiener Mar 19, 2024
d17e770
try travis
matthiasdiener Mar 22, 2024
ae81889
Revert "try travis"
matthiasdiener Mar 22, 2024
83ed9a4
another workaround
matthiasdiener Mar 22, 2024
aba69ca
bump LLVM version, change pyopencl test
matthiasdiener Mar 30, 2024
92f3117
rm test file
matthiasdiener Mar 30, 2024
62c4a33
stdlib-c
matthiasdiener May 17, 2024
a1ac4d8
fix MACOSX_DEPLOYMENT_TARGET, de-bump LLVM version
matthiasdiener May 17, 2024
a194000
use emulation for aarch64
matthiasdiener May 17, 2024
f29aa27
Revert "use emulation for aarch64"
matthiasdiener May 17, 2024
edf3611
add comment regarding upper ld64 bound
matthiasdiener May 17, 2024
9bfb1df
add quotes
matthiasdiener May 17, 2024
bca6c16
Make ld64 bounds consistent
inducer May 18, 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
View file
Open in desktop

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
View file
Open in desktop

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

7 changes: 7 additions & 0 deletions .ci_support/linux_64_libhwloc2.9.3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
cdt_name:
- cos7
channel_sources:
Expand All @@ -18,3 +22,6 @@ libhwloc:
- 2.9.3
target_platform:
- linux-64
zip_keys:
- - c_stdlib_version
- cdt_name
7 changes: 7 additions & 0 deletions .ci_support/linux_64_libhwloc2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
cdt_name:
- cos7
channel_sources:
Expand All @@ -18,3 +22,6 @@ libhwloc:
- '2'
target_platform:
- linux-64
zip_keys:
- - c_stdlib_version
- cdt_name
7 changes: 7 additions & 0 deletions .ci_support/linux_aarch64_libhwloc2.9.3.yaml
View file
Open in desktop
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 @@ -22,3 +26,6 @@ libhwloc:
- 2.9.3
target_platform:
- linux-aarch64
zip_keys:
- - c_stdlib_version
- cdt_name
7 changes: 7 additions & 0 deletions .ci_support/linux_aarch64_libhwloc2.yaml
View file
Open in desktop
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 @@ -22,3 +26,6 @@ libhwloc:
- '2'
target_platform:
- linux-aarch64
zip_keys:
- - c_stdlib_version
- cdt_name
7 changes: 7 additions & 0 deletions .ci_support/linux_ppc64le_libhwloc2.9.3.yaml
View file
Open in desktop
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 @@ -18,3 +22,6 @@ libhwloc:
- 2.9.3
target_platform:
- linux-ppc64le
zip_keys:
- - c_stdlib_version
- cdt_name
7 changes: 7 additions & 0 deletions .ci_support/linux_ppc64le_libhwloc2.yaml
View file
Open in desktop
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 @@ -18,3 +22,6 @@ libhwloc:
- '2'
target_platform:
- linux-ppc64le
zip_keys:
- - c_stdlib_version
- cdt_name
4 changes: 4 additions & 0 deletions .ci_support/osx_64_libhwloc2.9.3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.13'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/osx_64_libhwloc2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.13'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.13'
channel_sources:
- conda-forge
channel_targets:
Expand Down
4 changes: 4 additions & 0 deletions .ci_support/osx_arm64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/automerge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ jobs:
runs-on: ubuntu-latest
name: automerge
steps:
- name: checkout
uses: actions/checkout@v3
- name: automerge-action
id: automerge-action
uses: conda-forge/automerge-action@main
Expand Down
16 changes: 13 additions & 3 deletions .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.

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

5 changes: 3 additions & 2 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.

4 changes: 2 additions & 2 deletions recipe/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ enable_cuda:
- False # [not (linux64 or ppc64le or aarch64)]
Copy link
Contributor Author

@matthiasdiener matthiasdiener May 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

side note: this package does not seem to be built at all anymore for hwloc v1, despite the entry in conda_build_config.yaml


# Needed for MAP_ANONYMOUS and clock_gettime:
MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64]
- "10.13" # [osx and x86_64]
c_stdlib_version: # [osx and x86_64]
- 10.13 # [osx and x86_64]
matthiasdiener marked this conversation as resolved.
Show resolved Hide resolved
10 changes: 6 additions & 4 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set version = "5.0" %}
{% set build_number = 2 %}
{% set build_number = 3 %}
{% set sha256 = "fd0bb6e50c2286278c11627b71177991519e1f7ab2576bd8d8742974db414549" %}

{% set llvm_version = "15.0.7" %}
Expand Down Expand Up @@ -30,6 +30,7 @@ requirements:
- clangxx_{{ target_platform }} {{ llvm_version }}.* # [osx]
- llvmdev {{ llvm_version }}.* # [build_platform != target_platform]
- clangdev {{ llvm_version }}.* # [build_platform != target_platform]
- {{ stdlib("c") }}
host:
- ocl-icd # [linux]
- khronos-opencl-icd-loader # [osx]
Expand All @@ -43,14 +44,13 @@ requirements:
- llvm-spirv-{{ llvm_version.split(".")[0] }}

- zlib # [osx]
- ld64 >=530 # [osx]
- ld64 >=530,<711 # [osx]
run:
- llvm-spirv-{{ llvm_version.split(".")[0] }}
- ocl-icd # [linux]
- khronos-opencl-icd-loader # [osx]
- ld64 >=530 # [osx]
- ld64 >=530,<711 # [osx]
matthiasdiener marked this conversation as resolved.
Show resolved Hide resolved
matthiasdiener marked this conversation as resolved.
Show resolved Hide resolved
- {{ pin_compatible('libhwloc') }}
- __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.13") }} # [osx]
run_constrained:
- pocl {{ version }}.*

Expand Down Expand Up @@ -151,6 +151,8 @@ outputs:
- test -f $PREFIX/lib/pocl/libpocl-devices-pthread.so # [unix]
- test -f $PREFIX/lib/pocl/libpocl-devices-basic.so # [unix]
- test -f $PREFIX/lib/pocl/libpocl-devices-cuda.so # [enable_cuda]
downstreams:
- pyopencl

about:
home: http://portablecl.org/
Expand Down
Loading