Skip to content

Commit

Permalink
revert attempt to resolve lz4/xsimd dependency issue
Browse files Browse the repository at this point in the history
  • Loading branch information
tomjakubowski committed Oct 9, 2024
1 parent 3a5ae0f commit 2469a75
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 19 deletions.
13 changes: 7 additions & 6 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ source:
- patches/fix_maturin.diff
- patches/disable_protobuf_src.diff
- patches/fix_windows.diff
- patches/fix_arrow.patch

build:
number: 0
Expand Down Expand Up @@ -46,11 +45,13 @@ requirements:
- pnpm
- pkg-config
- libprotobuf # for protoc
# Shouldn't need this b/c perspective disables ARROW_SIMD_LEVEL and
# ARROW_RUNTIME_SIMD_LEVEL in arrow build. Funny thing is: without this
# package, the build fails -- can't find Findxsimd.cmake. But if you
# immediately try rebuilding, it will then succeed, without xsimd on the
# system. Bewitching cmake cache behavior?
# The lz4 and xsimd dependencies are here to satisfy perspective 3.1.0's
# ExternalProject build of arrow, which appears to be buggy; perspective
# tries to disable SIMD support, so Arrow's cmake should be skipping xsimd
# lookup; and Arrow should link to perspective's provided LZ4 library but
# is not. Can repro outside of conda. Will investigate and hopefully fix
# in upstream
- lz4
- xsimd
host:
- python
Expand Down
13 changes: 0 additions & 13 deletions recipe/patches/fix_arrow.patch

This file was deleted.

0 comments on commit 2469a75

Please sign in to comment.