This is an automated email from the ASF dual-hosted git repository.
paleolimbot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-nanoarrow.git
The following commit(s) were added to refs/heads/main by this push:
new ea131855 chore: Update benchmarks workflow for new nanoarrow/pyarrow
(#680)
ea131855 is described below
commit ea1318555b9d87b13642528a484a7dfa647bc8ae
Author: Dewey Dunnington <[email protected]>
AuthorDate: Tue Nov 12 17:24:18 2024 +0000
chore: Update benchmarks workflow for new nanoarrow/pyarrow (#680)
PyArrow no longer lists numpy as a dependency, but we used it to
generate random data for the benchmarks. We also needed to add a preset
for 0.6.0.
---
.github/workflows/benchmarks.yaml | 2 +-
dev/benchmarks/CMakeLists.txt | 25 ++++++++++++++-----------
dev/benchmarks/CMakePresets.json | 11 +++++++++++
3 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/benchmarks.yaml
b/.github/workflows/benchmarks.yaml
index 7b49e884..9b0a8122 100644
--- a/.github/workflows/benchmarks.yaml
+++ b/.github/workflows/benchmarks.yaml
@@ -44,7 +44,7 @@ jobs:
- name: Install Python dependencies
run: |
- pip install pyarrow asv
+ pip install pyarrow numpy asv
- name: Genereate fixtures
run: |
diff --git a/dev/benchmarks/CMakeLists.txt b/dev/benchmarks/CMakeLists.txt
index edacad32..25955b0a 100644
--- a/dev/benchmarks/CMakeLists.txt
+++ b/dev/benchmarks/CMakeLists.txt
@@ -31,9 +31,6 @@ if(NOT DEFINED CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
endif()
-set(NANOARROW_BENCHMARK_VERSION
- ""
- CACHE STRING "nanoarrow version to benchmark")
set(NANOARROW_BENCHMARK_SOURCE_DIR
""
CACHE STRING "path to a nanoarrow source checkout to benchmark" OFF)
@@ -52,20 +49,26 @@ fetchcontent_declare(benchmark
)
fetchcontent_makeavailable(benchmark)
+# In nanoarrow >= 0.6.0, optional features use NANOARROW_XXX=ON instead
+# of being packaged as separate projects. This is ignored by nanoarrow
+# 0.4.0 and 0.5.0.
+set(NANOARROW_IPC
+ ON
+ CACHE INTERNAL "")
+
if(IS_DIRECTORY "${NANOARROW_BENCHMARK_SOURCE_URL}")
- # In nanoarrow >= 0.6.0, optional features use NANOARROW_XXX=ON instead
- # of being packaged as separate projects.
- set(NANOARROW_IPC
- ON
- CACHE INTERNAL "")
fetchcontent_declare(nanoarrow SOURCE_DIR
"${NANOARROW_BENCHMARK_SOURCE_URL}")
fetchcontent_makeavailable(nanoarrow)
elseif(NOT "${NANOARROW_BENCHMARK_SOURCE_URL}" STREQUAL "")
fetchcontent_declare(nanoarrow URL "${NANOARROW_BENCHMARK_SOURCE_URL}")
- fetchcontent_declare(nanoarrow_ipc URL "${NANOARROW_BENCHMARK_SOURCE_URL}"
- SOURCE_SUBDIR
extensions/nanoarrow_ipc)
fetchcontent_makeavailable(nanoarrow)
- fetchcontent_makeavailable(nanoarrow_ipc)
+
+ # nanoarrow 0.4.0 and 0.5.0 packaged IPC in a subdirectory
+ if(NANOARROW_VERSION VERSION_LESS "0.6.0")
+ fetchcontent_declare(nanoarrow_ipc URL "${NANOARROW_BENCHMARK_SOURCE_URL}"
+ SOURCE_SUBDIR
extensions/nanoarrow_ipc)
+ fetchcontent_makeavailable(nanoarrow_ipc)
+ endif()
endif()
# Check that either the parent scope or this CMakeLists.txt defines a
nanoarrow target
diff --git a/dev/benchmarks/CMakePresets.json b/dev/benchmarks/CMakePresets.json
index 60ca1cc5..ed7a3998 100644
--- a/dev/benchmarks/CMakePresets.json
+++ b/dev/benchmarks/CMakePresets.json
@@ -25,6 +25,17 @@
"NANOARROW_BENCHMARK_SOURCE_URL": "${sourceDir}/../.."
}
},
+ {
+ "name": "v0.6.0",
+ "displayName": "v0.6.0",
+ "description": "Uses the nanoarrow C sources the 0.6.0 release.",
+ "inherits": [
+ "base"
+ ],
+ "cacheVariables": {
+ "NANOARROW_BENCHMARK_SOURCE_URL":
"https://github.com/apache/arrow-nanoarrow/archive/refs/tags/apache-arrow-nanoarrow-0.6.0.zip";
+ }
+ },
{
"name": "v0.5.0",
"displayName": "v0.5.0",
