You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2022/06/16 04:40:11 UTC

[arrow] branch master updated: ARROW-16839: [CI][C++] Fix xsimd missing related failures (#13388)

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 5792f57ba0 ARROW-16839: [CI][C++] Fix xsimd missing related failures (#13388)
5792f57ba0 is described below

commit 5792f57ba025b44c6e3da539d1a6e47ea0d15fad
Author: Sutou Kouhei <ko...@clear-code.com>
AuthorDate: Thu Jun 16 13:40:06 2022 +0900

    ARROW-16839: [CI][C++] Fix xsimd missing related failures (#13388)
    
    test-build-vcpkg-win
    
    https://github.com/ursacomputing/crossbow/runs/6892291430?check_suite_focus=true
    
          Could not find a configuration file for package "xsimd" that is compatible
          with requested version "8.1.0".
          The following configuration files were considered but not accepted:
            D:/a/crossbow/crossbow/arrow/cpp/vcpkg_installed/x64-windows/share/xsimd/xsimdConfig.cmake, version: 7.4.9
        Call Stack (most recent call first):
          cmake_modules/ThirdpartyToolchain.cmake:253 (find_package)
          cmake_modules/ThirdpartyToolchain.cmake:2209 (resolve_dependency)
          CMakeLists.txt:567 (include)
    
    example-cpp-minimal-build-static-system-dependency
    
    https://github.com/ursacomputing/crossbow/runs/6892331642?check_suite_focus=true
    
        CMake Error at cmake_modules/ThirdpartyToolchain.cmake:253 (find_package):
          By not providing "Findxsimd.cmake" in CMAKE_MODULE_PATH this project has
          asked CMake to find a package configuration file provided by "xsimd", but
          CMake did not find one.
          Could not find a package configuration file provided by "xsimd" (requested
          version 8.1.0) with any of the following names:
            xsimdConfig.cmake
            xsimd-config.cmake
          Add the installation prefix of "xsimd" to CMAKE_PREFIX_PATH or set
          "xsimd_DIR" to a directory containing one of the above files.  If "xsimd"
          provides a separate development package or SDK, be sure it has been
          installed.
        Call Stack (most recent call first):
          cmake_modules/ThirdpartyToolchain.cmake:2209 (resolve_dependency)
          CMakeLists.txt:567 (include)
    
    test-r-depsource-system
    
    https://github.com/ursacomputing/crossbow/runs/6892324900?check_suite_focus=true
    
        CMake Error at cmake_modules/ThirdpartyToolchain.cmake:253 (find_package):
          By not providing "Findxsimd.cmake" in CMAKE_MODULE_PATH this project has
          asked CMake to find a package configuration file provided by "xsimd", but
          CMake did not find one.
          Could not find a package configuration file provided by "xsimd" (requested
          version 8.1.0) with any of the following names:
            xsimdConfig.cmake
            xsimd-config.cmake
          Add the installation prefix of "xsimd" to CMAKE_PREFIX_PATH or set
          "xsimd_DIR" to a directory containing one of the above files.  If "xsimd"
          provides a separate development package or SDK, be sure it has been
          installed.
        Call Stack (most recent call first):
          cmake_modules/ThirdpartyToolchain.cmake:2209 (resolve_dependency)
          CMakeLists.txt:567 (include)
    
    Authored-by: Sutou Kouhei <ko...@clear-code.com>
    Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
 cpp/examples/minimal_build/run_static.sh |  1 +
 cpp/vcpkg.json                           |  2 +-
 dev/tasks/tasks.yml                      | 16 ++++++++--------
 r/inst/build_arrow_static.sh             |  1 +
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/cpp/examples/minimal_build/run_static.sh b/cpp/examples/minimal_build/run_static.sh
index 228ce8e266..cf2a9912f5 100755
--- a/cpp/examples/minimal_build/run_static.sh
+++ b/cpp/examples/minimal_build/run_static.sh
@@ -58,6 +58,7 @@ cmake $ARROW_DIR/cpp \
     -DARROW_WITH_ZLIB=ON \
     -DARROW_WITH_ZSTD=ON \
     -DORC_SOURCE=BUNDLED \
+    -Dxsimd_SOURCE=BUNDLED \
     $ARROW_CMAKE_OPTIONS
 
 make -j$NPROC
diff --git a/cpp/vcpkg.json b/cpp/vcpkg.json
index 8e527adec3..8019c7395e 100644
--- a/cpp/vcpkg.json
+++ b/cpp/vcpkg.json
@@ -54,5 +54,5 @@
   "overrides": [
     { "name": "gtest", "version": "1.10.0", "port-version": 4 }
   ],
-  "builtin-baseline": "b5865bfeba430cd44063fc54a45a8861195a715f"
+  "builtin-baseline": "3d8f78171a2a37d461077bf8d063256b63e25a4f"
 }
diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
index 1bdb4d2821..c8b8ae0c71 100644
--- a/dev/tasks/tasks.yml
+++ b/dev/tasks/tasks.yml
@@ -1292,19 +1292,19 @@ tasks:
     template: r/github.devdocs.yml
 
   test-r-depsource-bundled:
-      ci: azure
-      template: r/azure.linux.yml
-      params:
-        r_org: rocker
-        r_image: r-base
-        r_tag: latest
-        flags: '-e ARROW_DEPENDENCY_SOURCE=BUNDLED'
+    ci: azure
+    template: r/azure.linux.yml
+    params:
+      r_org: rocker
+      r_image: r-base
+      r_tag: latest
+      flags: '-e ARROW_DEPENDENCY_SOURCE=BUNDLED'
 
   test-r-depsource-system:
     ci: github
     template: docker-tests/github.linux.yml
     params:
-      flags: '-e ARROW_DEPENDENCY_SOURCE=SYSTEM'
+      flags: '-e ARROW_DEPENDENCY_SOURCE=SYSTEM -e xsimd_SOURCE=BUNDLED'
       image: ubuntu-r-only-r
 
   test-r-offline-minimal:
diff --git a/r/inst/build_arrow_static.sh b/r/inst/build_arrow_static.sh
index 83086dd9f2..27d42d4702 100755
--- a/r/inst/build_arrow_static.sh
+++ b/r/inst/build_arrow_static.sh
@@ -79,6 +79,7 @@ ${CMAKE} -DARROW_BOOST_USE_SHARED=OFF \
     -DCMAKE_EXPORT_NO_PACKAGE_REGISTRY=ON \
     -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON \
     -DCMAKE_UNITY_BUILD=${CMAKE_UNITY_BUILD:-OFF} \
+    -Dxsimd_SOURCE=${xsimd_SOURCE:-} \
     ${EXTRA_CMAKE_FLAGS} \
     -G ${CMAKE_GENERATOR:-"Unix Makefiles"} \
     ${SOURCE_DIR}