This is an automated email from the ASF dual-hosted git repository.

apitrou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/main by this push:
     new 9aff60a70b GH-38907: [C++] Stop installing internal bpacking_simd* 
headers (#38908)
9aff60a70b is described below

commit 9aff60a70b3d526a9c7d7769935140cf7830e5b6
Author: Sutou Kouhei <[email protected]>
AuthorDate: Wed Nov 29 19:36:53 2023 +0900

    GH-38907: [C++] Stop installing internal bpacking_simd* headers (#38908)
    
    ### Rationale for this change
    
    They are for internal use. We don't need to install them.
    
    ### What changes are included in this PR?
    
    Use `_internal.h` suffix to avoid installing them.
    
    ### Are these changes tested?
    
    Yes.
    
    ### Are there any user-facing changes?
    
    No.
    * Closes: #38907
    
    Authored-by: Sutou Kouhei <[email protected]>
    Signed-off-by: Antoine Pitrou <[email protected]>
---
 cpp/cmake_modules/ThirdpartyToolchain.cmake                         | 6 +++---
 cpp/src/arrow/util/bpacking_avx2.cc                                 | 2 +-
 cpp/src/arrow/util/bpacking_avx512.cc                               | 2 +-
 cpp/src/arrow/util/bpacking_neon.cc                                 | 2 +-
 ...ng_simd128_generated.h => bpacking_simd128_generated_internal.h} | 0
 ...ng_simd256_generated.h => bpacking_simd256_generated_internal.h} | 0
 ...ng_simd512_generated.h => bpacking_simd512_generated_internal.h} | 0
 cpp/src/arrow/util/bpacking_simd_codegen.py                         | 6 +++---
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake 
b/cpp/cmake_modules/ThirdpartyToolchain.cmake
index 17ad8f4542..978f031983 100644
--- a/cpp/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -2388,10 +2388,10 @@ if(ARROW_USE_XSIMD)
   resolve_dependency(xsimd
                      FORCE_ANY_NEWER_VERSION
                      TRUE
+                     IS_RUNTIME_DEPENDENCY
+                     FALSE
                      REQUIRED_VERSION
-                     "8.1.0"
-                     PC_PACKAGE_NAMES
-                     xsimd)
+                     "8.1.0")
 
   if(xsimd_SOURCE STREQUAL "BUNDLED")
     add_library(arrow::xsimd INTERFACE IMPORTED)
diff --git a/cpp/src/arrow/util/bpacking_avx2.cc 
b/cpp/src/arrow/util/bpacking_avx2.cc
index 5a3a7bad3d..9105aaa2af 100644
--- a/cpp/src/arrow/util/bpacking_avx2.cc
+++ b/cpp/src/arrow/util/bpacking_avx2.cc
@@ -16,7 +16,7 @@
 // under the License.
 
 #include "arrow/util/bpacking_avx2.h"
-#include "arrow/util/bpacking_simd256_generated.h"
+#include "arrow/util/bpacking_simd256_generated_internal.h"
 #include "arrow/util/bpacking_simd_internal.h"
 
 namespace arrow {
diff --git a/cpp/src/arrow/util/bpacking_avx512.cc 
b/cpp/src/arrow/util/bpacking_avx512.cc
index 08ccd3fcd4..3570bcc352 100644
--- a/cpp/src/arrow/util/bpacking_avx512.cc
+++ b/cpp/src/arrow/util/bpacking_avx512.cc
@@ -16,7 +16,7 @@
 // under the License.
 
 #include "arrow/util/bpacking_avx512.h"
-#include "arrow/util/bpacking_simd512_generated.h"
+#include "arrow/util/bpacking_simd512_generated_internal.h"
 #include "arrow/util/bpacking_simd_internal.h"
 
 namespace arrow {
diff --git a/cpp/src/arrow/util/bpacking_neon.cc 
b/cpp/src/arrow/util/bpacking_neon.cc
index a0bb5dc7a9..3ab6de75f4 100644
--- a/cpp/src/arrow/util/bpacking_neon.cc
+++ b/cpp/src/arrow/util/bpacking_neon.cc
@@ -16,7 +16,7 @@
 // under the License.
 
 #include "arrow/util/bpacking_neon.h"
-#include "arrow/util/bpacking_simd128_generated.h"
+#include "arrow/util/bpacking_simd128_generated_internal.h"
 #include "arrow/util/bpacking_simd_internal.h"
 
 namespace arrow {
diff --git a/cpp/src/arrow/util/bpacking_simd128_generated.h 
b/cpp/src/arrow/util/bpacking_simd128_generated_internal.h
similarity index 100%
rename from cpp/src/arrow/util/bpacking_simd128_generated.h
rename to cpp/src/arrow/util/bpacking_simd128_generated_internal.h
diff --git a/cpp/src/arrow/util/bpacking_simd256_generated.h 
b/cpp/src/arrow/util/bpacking_simd256_generated_internal.h
similarity index 100%
rename from cpp/src/arrow/util/bpacking_simd256_generated.h
rename to cpp/src/arrow/util/bpacking_simd256_generated_internal.h
diff --git a/cpp/src/arrow/util/bpacking_simd512_generated.h 
b/cpp/src/arrow/util/bpacking_simd512_generated_internal.h
similarity index 100%
rename from cpp/src/arrow/util/bpacking_simd512_generated.h
rename to cpp/src/arrow/util/bpacking_simd512_generated_internal.h
diff --git a/cpp/src/arrow/util/bpacking_simd_codegen.py 
b/cpp/src/arrow/util/bpacking_simd_codegen.py
old mode 100644
new mode 100755
index 3a5e2d58da..581a19a53e
--- a/cpp/src/arrow/util/bpacking_simd_codegen.py
+++ b/cpp/src/arrow/util/bpacking_simd_codegen.py
@@ -18,9 +18,9 @@
 # under the License.
 
 # Usage:
-#   python bpacking_simd_codegen.py 128 > bpacking_simd128_generated.h
-#   python bpacking_simd_codegen.py 256 > bpacking_simd256_generated.h
-#   python bpacking_simd_codegen.py 512 > bpacking_simd512_generated.h
+#   python bpacking_simd_codegen.py 128 > bpacking_simd128_generated_internal.h
+#   python bpacking_simd_codegen.py 256 > bpacking_simd256_generated_internal.h
+#   python bpacking_simd_codegen.py 512 > bpacking_simd512_generated_internal.h
 
 from functools import partial
 import sys

Reply via email to