Fix ArrayXD YAML conversion #6168
Merged
Conversation
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
|
The docs for this PR live here. All of your documentation changes will be reflected on that endpoint. |
Show benchmarksPyArrow==8.0.0 Show updated benchmarks!Benchmark: benchmark_array_xd.json
Benchmark: benchmark_getitem_100B.json
Benchmark: benchmark_indices_mapping.json
Benchmark: benchmark_iterating.json
Benchmark: benchmark_map_filter.json
Show updated benchmarks!Benchmark: benchmark_array_xd.json
Benchmark: benchmark_getitem_100B.json
Benchmark: benchmark_indices_mapping.json
Benchmark: benchmark_iterating.json
Benchmark: benchmark_map_filter.json
|
Member
|
Maybe convert all the tuples by default instead of hardcoding a logic specific to ArrayXD ? |
|
@mariosasko Have you been able to fix this issue ? we're having quite a rough time updating our dataset lately |
Collaborator
Author
|
@lhoestq Does it look good now? |
lhoestq
reviewed
Dec 12, 2023
Comment on lines
+1784
to
+1794
| def to_yaml_types(obj: dict) -> dict: | ||
| if isinstance(obj, dict): | ||
| return {k: to_yaml_types(v) for k, v in obj.items()} | ||
| elif isinstance(obj, list): | ||
| return [to_yaml_types(v) for v in obj] | ||
| elif isinstance(obj, tuple): | ||
| return to_yaml_types(list(obj)) | ||
| else: | ||
| return obj | ||
|
|
||
| return to_yaml_types(to_yaml_inner(yaml_data)["struct"]) |
Member
There was a problem hiding this comment.
is this needed ?
Suggested change
| def to_yaml_types(obj: dict) -> dict: | |
| if isinstance(obj, dict): | |
| return {k: to_yaml_types(v) for k, v in obj.items()} | |
| elif isinstance(obj, list): | |
| return [to_yaml_types(v) for v in obj] | |
| elif isinstance(obj, tuple): | |
| return to_yaml_types(list(obj)) | |
| else: | |
| return obj | |
| return to_yaml_types(to_yaml_inner(yaml_data)["struct"]) | |
| return to_yaml_inner(yaml_data)["struct"] |
Collaborator
Author
There was a problem hiding this comment.
Yes, to_yaml_inner doesn't traverse the leaves (attributes) of the complex types (Image, ArrayXD, etc.)
Show benchmarksPyArrow==8.0.0 Show updated benchmarks!Benchmark: benchmark_array_xd.json
Benchmark: benchmark_getitem_100B.json
Benchmark: benchmark_indices_mapping.json
Benchmark: benchmark_iterating.json
Benchmark: benchmark_map_filter.json
Show updated benchmarks!Benchmark: benchmark_array_xd.json
Benchmark: benchmark_getitem_100B.json
Benchmark: benchmark_indices_mapping.json
Benchmark: benchmark_iterating.json
Benchmark: benchmark_map_filter.json
|
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.
Replace the
shapetuple with a list in theArrayXDYAML conversion.Fix #6112