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

Fix run exports to restrict the minor version #1409

Merged
merged 3 commits into from
May 18, 2024
Merged

Fix run exports to restrict the minor version #1409

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d280638
Update recipe
vyasr May 15, 2024
8abae49
MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.35.1, and co…
May 15, 2024
06163bd
fix some remaining too-loose `max_pin`s; unbump proc_build_number
h-vetinari 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
8 changes: 4 additions & 4 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.

0 ...er_version11.8cxx_compiler_version11.yaml → ...er_version11.8cxx_compiler_version11.yaml
View file
Open in desktop
File renamed without changes.
0 ...er_versionNonecxx_compiler_version12.yaml → ...er_versionNonecxx_compiler_version12.yaml
View file
Open in desktop
File renamed without changes.
9 changes: 0 additions & 9 deletions .ci_support/migrations/aws_crt_cpp0268.yaml
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions .ci_support/migrations/libabseil20230802_libgrpc157_libprotobuf4234.yaml
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions .ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions .ci_support/migrations/libgoogle_cloud223.yaml
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions .ci_support/migrations/libgrpc162_libprotobuf4253.yaml
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions .ci_support/migrations/ucx116.yaml
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop

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

36 changes: 18 additions & 18 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% set cuda_enabled = cuda_compiler_version != "None" %}
{% set build_ext_version = "5.0.0" %}
{% set build_ext = "cuda" if cuda_enabled else "cpu" %}
{% set proc_build_number = "0" %}
{% set proc_build_number = "1" %}
{% set llvm_version = "16" %}

# see https://github.com/apache/arrow/blob/apache-arrow-10.0.1/cpp/CMakeLists.txt#L88-L90
Expand All @@ -25,7 +25,7 @@ source:
folder: testing

build:
number: 0
number: 1
# for cuda support, building with one version is enough to be compatible with
# all later versions, since arrow is only using libcuda, and not libcudart.
skip: true # [cuda_compiler_version not in ("None", cuda_compiler_version_min)]
Expand Down Expand Up @@ -110,14 +110,14 @@ outputs:
build:
string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }}
run_exports:
- {{ pin_subpackage("libarrow", max_pin="x") }}
- {{ pin_subpackage("libarrow-acero", max_pin="x") }}
- {{ pin_subpackage("libarrow-dataset", max_pin="x") }}
- {{ pin_subpackage("libarrow-flight", max_pin="x") }}
- {{ pin_subpackage("libarrow-flight-sql", max_pin="x") }}
- {{ pin_subpackage("libarrow-gandiva", max_pin="x") }}
- {{ pin_subpackage("libarrow-substrait", max_pin="x") }}
- {{ pin_subpackage("libparquet", max_pin="x") }}
- {{ pin_subpackage("libarrow", max_pin="x.x") }}
Copy link
Member

Choose a reason for hiding this comment

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

Am noticing in pyarrow, we are doing this

- libarrow {{ version }}.*=*{{ build_ext }}

Do we want a similarly tight pin here or should pyarrow relax its pin?

Recognize more is happening in the pyarrow case. Am only focusing on how tight we pin (and whether we include the package hash)

Copy link
Member

Choose a reason for hiding this comment

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

Am noticing in pyarrow, we are doing this

This is necessary because pyarrow is built on a different feedstock, and so cannot use pin_subpackage.

Do we want a similarly tight pin here or should pyarrow relax its pin?

Neither.

- {{ pin_subpackage("libarrow-acero", max_pin="x.x") }}
- {{ pin_subpackage("libarrow-dataset", max_pin="x.x") }}
- {{ pin_subpackage("libarrow-flight", max_pin="x.x") }}
- {{ pin_subpackage("libarrow-flight-sql", max_pin="x.x") }}
- {{ pin_subpackage("libarrow-gandiva", max_pin="x.x") }}
- {{ pin_subpackage("libarrow-substrait", max_pin="x.x") }}
- {{ pin_subpackage("libparquet", max_pin="x.x") }}
Comment on lines +114 to +120
Copy link
Member

Choose a reason for hiding this comment

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

For these is a sufficiently tight libarrow pin sufficient? If so, could we drop max_pin altogether?

Or do we want all of these equivalently tight? In which case maybe a Jinja for-loop would be more DRY and easier to maintain

Also this comes up below

Copy link
Member

@h-vetinari h-vetinari May 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

In which case maybe a Jinja for-loop would be more DRY and easier to maintain

Let's not do that. It creates more comprehension overhead than it reduces, especially if the list of elements if not next to the loop anymore. For artefacts testing that's less of an issue, but for run-exports we really need to be crystal-clear, because errors have far more wide-reaching consequences.

requirements:
build:
- cmake
Expand Down Expand Up @@ -158,7 +158,7 @@ outputs:
build:
string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }}
run_exports:
- {{ pin_subpackage("libarrow", max_pin="x") }}
- {{ pin_subpackage("libarrow", max_pin="x.x") }}
ignore_run_exports_from:
- {{ compiler("cuda") }} # [cuda_compiler_version != "None"]
# arrow only uses headers on osx/win, apparently
Expand Down Expand Up @@ -277,7 +277,7 @@ outputs:
build:
string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }}
run_exports:
- {{ pin_subpackage("libarrow-acero", max_pin="x") }}
- {{ pin_subpackage("libarrow-acero", max_pin="x.x") }}
requirements:
build:
- cmake
Expand Down Expand Up @@ -322,7 +322,7 @@ outputs:
build:
string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }}
run_exports:
- {{ pin_subpackage("libarrow-dataset", max_pin="x") }}
- {{ pin_subpackage("libarrow-dataset", max_pin="x.x") }}
requirements:
build:
- cmake
Expand Down Expand Up @@ -371,7 +371,7 @@ outputs:
build:
string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }}
run_exports:
- {{ pin_subpackage("libarrow-flight", max_pin="x") }}
- {{ pin_subpackage("libarrow-flight", max_pin="x.x") }}
requirements:
build:
- cmake
Expand Down Expand Up @@ -426,7 +426,7 @@ outputs:
build:
string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }}
run_exports:
- {{ pin_subpackage("libarrow-flight-sql", max_pin="x") }}
- {{ pin_subpackage("libarrow-flight-sql", max_pin="x.x") }}
requirements:
build:
- cmake
Expand Down Expand Up @@ -477,7 +477,7 @@ outputs:
build:
string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }}
run_exports:
- {{ pin_subpackage("libarrow-gandiva", max_pin="x") }}
- {{ pin_subpackage("libarrow-gandiva", max_pin="x.x") }}
requirements:
build:
- cmake
Expand Down Expand Up @@ -529,7 +529,7 @@ outputs:
build:
string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }}
run_exports:
- {{ pin_subpackage("libarrow-substrait", max_pin="x") }}
- {{ pin_subpackage("libarrow-substrait", max_pin="x.x") }}
requirements:
build:
- cmake
Expand Down Expand Up @@ -586,7 +586,7 @@ outputs:
build:
string: h{{ PKG_HASH }}_{{ PKG_BUILDNUM }}_{{ build_ext }}
run_exports:
- {{ pin_subpackage("libparquet", max_pin="x") }}
- {{ pin_subpackage("libparquet", max_pin="x.x") }}
requirements:
build:
- cmake
Expand Down