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
21 changes: 2 additions & 19 deletions recipes/arrow/all/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,18 @@ sources:
"24.0.0":
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-24.0.0/apache-arrow-24.0.0.tar.gz?action=download"
sha256: "9a8094d24fa33b90c672ab77fdda253f29300c8b0dd3f0b8e55a29dbd98b82c9"
"23.0.1":
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-23.0.1/apache-arrow-23.0.1.tar.gz?action=download"
sha256: "bd09adb4feac11fe49d1604f296618866702be610c86e2d513b561d877de6b18"
"23.0.0":
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-23.0.0/apache-arrow-23.0.0.tar.gz?action=download"
sha256: "12f6844a0ba3b99645cd2bc6cc4f44f6a174ab90da37e474f08b7d073433cb60"
"22.0.0":
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-22.0.0/apache-arrow-22.0.0.tar.gz?action=download"
sha256: "131250cd24dec0cddde04e2ad8c9e2bc43edc5e84203a81cf71cf1a33a6e7e0f"
"21.0.0":
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-21.0.0/apache-arrow-21.0.0.tar.gz?action=download"
sha256: "5d3f8db7e72fb9f65f4785b7a1634522e8d8e9657a445af53d4a34a3849857b5"
"20.0.0":
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-20.0.0/apache-arrow-20.0.0.tar.gz?action=download"
sha256: "89efbbf852f5a1f79e9c99ab4c217e2eb7f991837c005cba2d4a2fbd35fad212"
"19.0.1":
url: "https://www.apache.org/dyn/closer.lua/arrow/arrow-19.0.1/apache-arrow-19.0.1.tar.gz?action=download"
sha256: "acb76266e8b0c2fbb7eb15d542fbb462a73b3fd1e32b80fad6c2fafd95a51160"
patches:
"23.0.0":
- patch_file: "patches/23.0.0-0001-fix-downloaded-mimalloc.patch"
"24.0.0":
- patch_file: "patches/24.0.0-0001-fix-downloaded-mimalloc.patch"
"22.0.0":
- patch_file: "patches/22.0.0-0001-fix-downloaded-mimalloc.patch"
- patch_file: "patches/22.0.0-0002-fix-msvc-arm64.patch"
"21.0.0":
- patch_file: "patches/21.0.0-0001-fix-downloaded-mimalloc.patch"
- patch_file: "patches/21.0.0-0002-fix-msvc-arm64.patch"
"20.0.0":
- patch_file: "patches/20.0.0-0001-fix-downloaded-mimalloc.patch"
"19.0.1":
- patch_file: "patches/19.0.1-0001-fix-cmake.patch"
- patch_file: "patches/19.0.1-0002-fix-downloaded-mimalloc.patch"
Expand Down
15 changes: 3 additions & 12 deletions recipes/arrow/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ class ArrowConan(ConanFile):
"filesystem_layer": True,
"hdfs_bridgs": False,
"plasma": "deprecated",
#"simd_level": "default", # see config_options
# "runtime_simd_level": "max", # see config_options
"simd_level": "default",
"runtime_simd_level": "max",
"with_backtrace": False,
"with_boost": True,
"with_brotli": False,
Expand Down Expand Up @@ -137,15 +137,6 @@ def config_options(self):
if is_msvc(self):
self.options.with_boost = True

if is_msvc(self) and self.settings.arch == "armv8":
# xsimd does not yet support msvc+arm64
# see: https://github.com/xtensor-stack/xsimd/issues/611
# see: https://github.com/xtensor-stack/xsimd/pull/612
self.options.simd_level = "disabled"
self.options.runtime_simd_level = "disabled"
else:
self.options.simd_level = "default"
self.options.runtime_simd_level = "max"

if Version(self.version) >= "22.0.0":
del self.options.skyhook
Expand Down Expand Up @@ -203,7 +194,7 @@ def requirements(self):
if self.options.with_snappy:
self.requires("snappy/1.1.9")
if self.options.simd_level != "disabled" or self.options.runtime_simd_level != "disabled":
self.requires("xsimd/14.0.0")
self.requires("xsimd/14.2.0")
if self.options.with_zlib:
self.requires("zlib/[>=1.2.11 <2]")
if self.options.with_zstd:
Expand Down

This file was deleted.

This file was deleted.

87 changes: 0 additions & 87 deletions recipes/arrow/all/patches/21.0.0-0002-fix-msvc-arm64.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index b95d649..4bed100 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -2319,6 +2319,9 @@ endif()
@@ -2345,6 +2345,9 @@ endif()
# mimalloc - Cross-platform high-performance allocator, from Microsoft

if(ARROW_MIMALLOC)
Expand Down
10 changes: 2 additions & 8 deletions recipes/arrow/config.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
versions:
# C++20
"24.0.0":
folder: all
"23.0.1":
folder: all
"23.0.0":
folder: all
# C++17
"22.0.0":
folder: all
"21.0.0":
folder: all
"20.0.0":
folder: all
"19.0.1":
folder: all