Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions conda/recipes/libcudf/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ outputs:
{% else %}
- {{ compiler('cuda') }}
{% endif %}
# TODO: start taking libarrow's run exports again wwhen they're correct for 16.0
# ref: https://github.com/conda-forge/arrow-cpp-feedstock/issues/1418
- libarrow
requirements:
build:
- cmake {{ cmake_version }}
Expand All @@ -105,6 +108,12 @@ outputs:
- librmm ={{ minor_version }}
- libkvikio ={{ minor_version }}
- dlpack {{ dlpack_version }}
# TODO: start taking libarrow's run exports again wwhen they're correct for 16.0
# ref: https://github.com/conda-forge/arrow-cpp-feedstock/issues/1418
- libarrow>=16.0.0,<16.1.0a0
- libarrow-acero>=16.0.0,<16.1.0a0
- libarrow-dataset>=16.0.0,<16.1.0a0
- libparquet>=16.0.0,<16.1.0a0
Comment on lines +111 to +116
Copy link
Member

Choose a reason for hiding this comment

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

Is the libarrow pin sufficient? The rest are pinned exactly to it (for example)

Suggested change
# TODO: start taking libarrow's run exports again wwhen they're correct for 16.0
# ref: https://github.com/conda-forge/arrow-cpp-feedstock/issues/1418
- libarrow>=16.0.0,<16.1.0a0
- libarrow-acero>=16.0.0,<16.1.0a0
- libarrow-dataset>=16.0.0,<16.1.0a0
- libparquet>=16.0.0,<16.1.0a0
# TODO: start taking libarrow's run exports again wwhen they're correct for 16.0
# ref: https://github.com/conda-forge/arrow-cpp-feedstock/issues/1418
- libarrow>=16.0.0,<16.1.0a0

Copy link
Member

@jameslamb jameslamb May 20, 2024

Choose a reason for hiding this comment

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

You're probably right that it would be enough. I went for all of them just mimicking what I already saw in dependencies.yaml here for building the test environment.

Alright if we still merge this, and then I push a follow-up PR trying to pare this back down to just libarrow? That way we wouldn't have to wait for another CI cycle to get the fix onto branch-24.06.

Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think it's worth changing at this point. Once the upstream arrow packages are updated we'll just be dropping this altogether anyway.

Copy link
Member

Choose a reason for hiding this comment

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

Ok works for me, I won't touch this unless @jakirkham disagrees and thinks we should pursue it.

test:
commands:
- test -f $PREFIX/lib/libcudf.so
Expand Down
8 changes: 4 additions & 4 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -341,10 +341,10 @@ dependencies:
- output_types: conda
packages:
# Allow runtime version to float up to minor version
- libarrow-acero>=16.0.0,<17.0.0a0
- libarrow-dataset>=16.0.0,<17.0.0a0
- libarrow>=16.0.0,<17.0.0a0
- libparquet>=16.0.0,<17.0.0a0
- libarrow-acero>=16.0.0,<16.1.0a0
- libarrow-dataset>=16.0.0,<16.1.0a0
- libarrow>=16.0.0,<16.1.0a0
- libparquet>=16.0.0,<16.1.0a0
pyarrow_run:
common:
- output_types: [conda, requirements, pyproject]
Expand Down