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

Migrate to {{ stdlib("c") }} #13

Merged
merged 3 commits into from
May 14, 2024
Merged

Migrate to {{ stdlib("c") }} #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
527d726
Migrate to `{{ stdlib("c") }}`
hcho3 May 14, 2024
f4bbbee
MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.35.1, and co…
May 14, 2024
98acdb6
Add `linux` selector to `{{ stdlib("c") }}`
jakirkham May 14, 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
4 changes: 2 additions & 2 deletions .ci_support/linux_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ c_compiler_version:
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand Down
4 changes: 0 additions & 4 deletions .ci_support/win_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
c_stdlib:
- vs
Comment on lines -1 to -2
Copy link
Member

Choose a reason for hiding this comment

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

Weird. Re-rendering shouldn't have removed this

Note that this is what leads to the CI error for Windows:

conda_libmamba_solver.conda_build_exceptions.ExplainedDependencyNeedsBuildingError: Unsatisfiable dependencies for platform win-64: {MatchSpec("c_win-64")}
Encountered problems while solving:
  - nothing provides requested c_win-64

Will try re-rendering again

Copy link
Member

Choose a reason for hiding this comment

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

On closer inspection, it looks like re-rendering with conda-smithy is doing the right thing

The cuda-nvtx package has a skip for win-64. As a result is ignored when generating the variants. Hence c_stdlib is dropped

However for some reason it is still being considered by conda-build when building cuda-nvtx-dev

c_stdlib_version:
- '2019'
channel_sources:
- conda-forge
channel_targets:
Expand Down
4 changes: 4 additions & 0 deletions conda-forge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ conda_forge_output_validation: true
github:
branch_name: main
tooling_branch_name: main
os_version:
linux_64: cos7
linux_aarch64: cos7
linux_ppc64le: cos7
provider:
linux_aarch64: default
linux_ppc64le: default
Expand Down
3 changes: 2 additions & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ source:
sha256: 95b7f96bdb2701d764d969cdadfbc439b4ab995d0a3695682da5284e14f66d21 # [win]

build:
number: 1
number: 2
skip: true # [osx]
binary_relocation: false

Expand All @@ -51,6 +51,7 @@ outputs:
build:
- {{ compiler("c") }}
- {{ compiler("cxx") }}
- {{ stdlib("c") }} # [linux]
- arm-variant * {{ arm_variant_type }} # [aarch64]
- patchelf <0.18.0 # [linux]
host:
Expand Down