Skip to content
Draft
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
2 changes: 1 addition & 1 deletion .github/workflows/cpp_extra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ permissions:

jobs:
check-labels:
if: github.event_name == 'pull_request'
uses: ./.github/workflows/check_labels.yml
with:
parent-workflow: cpp_extra
Expand All @@ -80,6 +79,7 @@ jobs:
steps:
- id: set_enabled
if: >-
github.ref_type == 'tag' ||
(github.event_name == 'schedule' && github.repository == 'apache/arrow') ||
contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'), 'CI: Extra') ||
contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'), 'CI: Extra: C++')
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cuda_extra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ permissions:

jobs:
check-labels:
if: github.event_name == 'pull_request'
uses: ./.github/workflows/check_labels.yml
with:
parent-workflow: cuda_extra
Expand All @@ -63,6 +62,7 @@ jobs:
steps:
- id: set_enabled
if: >-
github.ref_type == 'tag' ||
(github.event_name == 'schedule' && github.repository == 'apache/arrow') ||
contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'), 'CI: Extra') ||
contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'), 'CI: Extra: CUDA')
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/package_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ permissions:

jobs:
check-labels:
if: github.event_name == 'pull_request'
uses: ./.github/workflows/check_labels.yml
with:
parent-workflow: package_linux
Expand All @@ -72,6 +71,7 @@ jobs:
steps:
- id: set_enabled
if: >-
github.ref_type == 'tag' ||
(github.event_name == 'schedule' && github.repository == 'apache/arrow') ||
contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'), 'CI: Extra') ||
contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'), 'CI: Extra: Package: Linux')
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/r_extra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ permissions:

jobs:
check-labels:
if: github.event_name == 'pull_request'
uses: ./.github/workflows/check_labels.yml
with:
parent-workflow: r_extra
Expand All @@ -75,6 +74,7 @@ jobs:
steps:
- id: set_enabled
if: >-
github.ref_type == 'tag' ||
(github.event_name == 'schedule' && github.repository == 'apache/arrow') ||
contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'), 'CI: Extra') ||
contains(fromJSON(needs.check-labels.outputs.ci-extra-labels || '[]'), 'CI: Extra: R')
Expand Down
231 changes: 231 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion c_glib/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ project(
# * 22.04: 0.61.2
# * 24.04: 1.3.2
meson_version: '>=0.61.2',
version: '25.0.0-SNAPSHOT',
version: '25.0.0',
)

version = meson.project_version()
Expand Down
2 changes: 1 addition & 1 deletion c_glib/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "arrow-glib",
"version-string": "25.0.0-SNAPSHOT",
"version-string": "25.0.0",
"$comment:dependencies": "We can enable gobject-introspection again once it's updated",
"dependencies": [
"glib",
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
_realname=arrow
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=24.0.0.9000
pkgver=25.0.0
pkgrel=8000
pkgdesc="Apache Arrow is a cross-language development platform for in-memory data (mingw-w64)"
arch=("any")
Expand Down
3 changes: 2 additions & 1 deletion ci/scripts/r_install_system_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@ fi
# Install curl, OpenSSL, and libuv
# - curl/OpenSSL: technically only needed for S3/GCS support, but
# installing the R curl package fails without it
# - libpng: required by the png R package
# - libuv: required by the fs R package (no longer bundles libuv by default)
case "$PACKAGE_MANAGER" in
apt-get)
apt-get install -y libcurl4-openssl-dev libssl-dev libuv1-dev
apt-get install -y libcurl4-openssl-dev libpng-dev libssl-dev libuv1-dev
;;
apk)
$PACKAGE_MANAGER add curl-dev openssl-dev libuv-dev
Expand Down
2 changes: 1 addition & 1 deletion cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ if(POLICY CMP0170)
cmake_policy(SET CMP0170 NEW)
endif()

set(ARROW_VERSION "25.0.0-SNAPSHOT")
set(ARROW_VERSION "25.0.0")

string(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" ARROW_BASE_VERSION "${ARROW_VERSION}")

Expand Down
12 changes: 12 additions & 0 deletions cpp/cmake_modules/ThirdpartyToolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2565,14 +2565,26 @@ if(ARROW_MIMALLOC)
"-DCMAKE_C_FLAGS=${MIMALLOC_C_FLAGS}"
"-DCMAKE_INSTALL_PREFIX=${MIMALLOC_PREFIX}"
-DMI_INSTALL_TOPLEVEL=ON
# Don't override default malloc
-DMI_OVERRIDE=OFF
-DMI_OSX_INTERPOSE=OFF
-DMI_OSX_ZONE=OFF
# Allow usage through dlopen (i.e. when libarrow.so itself is dlopen'ed)
-DMI_LOCAL_DYNAMIC_TLS=ON
-DMI_BUILD_OBJECT=OFF
-DMI_BUILD_SHARED=OFF
-DMI_BUILD_TESTS=OFF
# GH-47229: Force mimalloc to generate armv8.0 binary
-DMI_NO_OPT_ARCH=ON)

if(APPLE)
list(APPEND
MIMALLOC_CMAKE_ARGS
# GH-50428: Make sure several mimalloc instances can cohabit in the same process
# (also https://github.com/microsoft/mimalloc/issues/1327#issuecomment-4964140817)
-DMI_TLS_MODEL_LOCAL=ON)
endif()

externalproject_add(mimalloc_ep
${EP_COMMON_OPTIONS}
URL ${MIMALLOC_SOURCE_URL}
Expand Down
2 changes: 1 addition & 1 deletion cpp/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ project(
'arrow',
'cpp',
'c',
version: '25.0.0-SNAPSHOT',
version: '25.0.0',
license: 'Apache-2.0',
meson_version: '>=1.3.0',
default_options: ['c_std=c11', 'warning_level=2', 'cpp_std=c++20'],
Expand Down
28 changes: 24 additions & 4 deletions cpp/src/arrow/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -346,21 +346,42 @@ endmacro()
macro(append_runtime_sve128_src SRCS SRC)
if(ARROW_HAVE_RUNTIME_SVE128)
list(APPEND ${SRCS} ${SRC})
set_source_files_properties(${SRC} PROPERTIES COMPILE_OPTIONS "${ARROW_SVE128_FLAGS}")
set(_flags ${ARROW_SVE128_FLAGS})
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
# Disable LTO to work around GCC bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121412
list(APPEND ${_flags} "-fno-lto")
endif()
set_property(SOURCE ${SRC}
APPEND
PROPERTY COMPILE_OPTIONS ${_flags})
endif()
endmacro()

macro(append_runtime_sve256_src SRCS SRC)
if(ARROW_HAVE_RUNTIME_SVE256)
list(APPEND ${SRCS} ${SRC})
set_source_files_properties(${SRC} PROPERTIES COMPILE_OPTIONS "${ARROW_SVE256_FLAGS}")
set(_flags ${ARROW_SVE256_FLAGS})
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
# Disable LTO to work around GCC bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121412
list(APPEND ${_flags} "-fno-lto")
endif()
set_property(SOURCE ${SRC}
APPEND
PROPERTY COMPILE_OPTIONS ${_flags})
endif()
endmacro()

macro(append_runtime_sve512_src SRCS SRC)
if(ARROW_HAVE_RUNTIME_SVE512)
list(APPEND ${SRCS} ${SRC})
set_source_files_properties(${SRC} PROPERTIES COMPILE_OPTIONS "${ARROW_SVE512_FLAGS}")
set(_flags ${ARROW_SVE512_FLAGS})
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
# Disable LTO to work around GCC bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=121412
list(APPEND ${_flags} "-fno-lto")
endif()
set_property(SOURCE ${SRC}
APPEND
PROPERTY COMPILE_OPTIONS ${_flags})
endif()
endmacro()

Expand Down Expand Up @@ -588,7 +609,6 @@ append_runtime_avx2_src(ARROW_UTIL_SRCS util/byte_stream_split_internal_avx2.cc)
append_runtime_avx2_src(ARROW_UTIL_SRCS util/bpacking_simd_256.cc)
append_runtime_avx512_src(ARROW_UTIL_SRCS util/bpacking_simd_avx512.cc)

append_runtime_sve128_src(ARROW_UTIL_SRCS util/bpacking_simd_128_alt.cc)
append_runtime_sve256_src(ARROW_UTIL_SRCS util/bpacking_simd_256.cc)

if(ARROW_WITH_BROTLI)
Expand Down
Loading
Loading