From 219384f0d5e38d7a54e42419cbd0cafb10f1c012 Mon Sep 17 00:00:00 2001 From: Kouhei Sutou Date: Mon, 21 Jan 2019 21:07:47 +0900 Subject: [PATCH 01/16] [C++] Fix build error with MinGW-w64 32-bit --- cpp/src/arrow/util/sse-util.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cpp/src/arrow/util/sse-util.h b/cpp/src/arrow/util/sse-util.h index edaf6686be5..86e7dec411b 100644 --- a/cpp/src/arrow/util/sse-util.h +++ b/cpp/src/arrow/util/sse-util.h @@ -110,7 +110,12 @@ static inline uint32_t SSE4_crc32_u32(uint32_t crc, uint32_t v) { } static inline uint32_t SSE4_crc32_u64(uint32_t crc, uint64_t v) { +#if defined(__MINGW32__) && !defined(__MINGW64__) + DCHECK(false) << "MinGW-w64 32-bit doesn't support _mm_crc32_u64()"; + return 0; +#else return static_cast(_mm_crc32_u64(crc, v)); +#endif } #else // without SSE 4.2. From aad43b2f1c6311f75b7f159f209b2f9e14e29662 Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Mon, 18 Feb 2019 10:54:08 -0800 Subject: [PATCH 02/16] [C++] Apply patch discussed under pull/3443 --- cpp/src/arrow/util/hash-util.h | 65 +++++++--------------------------- cpp/src/arrow/util/macros.h | 13 +++++++ 2 files changed, 26 insertions(+), 52 deletions(-) diff --git a/cpp/src/arrow/util/hash-util.h b/cpp/src/arrow/util/hash-util.h index 637f4328085..7aed3c171dc 100644 --- a/cpp/src/arrow/util/hash-util.h +++ b/cpp/src/arrow/util/hash-util.h @@ -81,10 +81,13 @@ class HashUtil { const uint8_t* p = reinterpret_cast(data); const uint8_t* end = p + nbytes; +#if ARROW_BITNESS >= 64 while (p <= end - 8) { hash = HW_crc32_u64(hash, *reinterpret_cast(p)); p += 8; } +#endif + while (p <= end - 4) { hash = HW_crc32_u32(hash, *reinterpret_cast(p)); p += 4; @@ -113,6 +116,7 @@ class HashUtil { uint32_t h1 = static_cast(hash >> 32); uint32_t h2 = static_cast(hash); +#if ARROW_BITNESS >= 64 while (nbytes >= 16) { h1 = HW_crc32_u64(h1, *reinterpret_cast(p)); h2 = HW_crc32_u64(h2, *reinterpret_cast(p + 8)); @@ -125,6 +129,15 @@ class HashUtil { nbytes -= 8; p += 8; } +#else + while (nbytes >= 8) { + h1 = HW_crc32_u32(h1, *reinterpret_cast(p)); + h2 = HW_crc32_u32(h2, *reinterpret_cast(p + 4)); + nbytes -= 8; + p += 8; + } +#endif + if (nbytes >= 4) { h1 = HW_crc32_u16(h1, *reinterpret_cast(p)); h2 = HW_crc32_u16(h2, *reinterpret_cast(p + 2)); @@ -151,58 +164,6 @@ class HashUtil { return (static_cast(h1) << 32) + h2; } - /// CrcHash() specialized for 1-byte data - static inline uint32_t CrcHash1(const void* v, uint32_t hash) { - const uint8_t* s = reinterpret_cast(v); - hash = HW_crc32_u8(hash, *s); - hash = (hash << 16) | (hash >> 16); - return hash; - } - - /// CrcHash() specialized for 2-byte data - static inline uint32_t CrcHash2(const void* v, uint32_t hash) { - const uint16_t* s = reinterpret_cast(v); - hash = HW_crc32_u16(hash, *s); - hash = (hash << 16) | (hash >> 16); - return hash; - } - - /// CrcHash() specialized for 4-byte data - static inline uint32_t CrcHash4(const void* v, uint32_t hash) { - const uint32_t* p = reinterpret_cast(v); - hash = HW_crc32_u32(hash, *p); - hash = (hash << 16) | (hash >> 16); - return hash; - } - - /// CrcHash() specialized for 8-byte data - static inline uint32_t CrcHash8(const void* v, uint32_t hash) { - const uint64_t* p = reinterpret_cast(v); - hash = HW_crc32_u64(hash, *p); - hash = (hash << 16) | (hash >> 16); - return hash; - } - - /// CrcHash() specialized for 12-byte data - static inline uint32_t CrcHash12(const void* v, uint32_t hash) { - const uint64_t* p = reinterpret_cast(v); - hash = HW_crc32_u64(hash, *p); - ++p; - hash = HW_crc32_u32(hash, *reinterpret_cast(p)); - hash = (hash << 16) | (hash >> 16); - return hash; - } - - /// CrcHash() specialized for 16-byte data - static inline uint32_t CrcHash16(const void* v, uint32_t hash) { - const uint64_t* p = reinterpret_cast(v); - hash = HW_crc32_u64(hash, *p); - ++p; - hash = HW_crc32_u64(hash, *p); - hash = (hash << 16) | (hash >> 16); - return hash; - } - static const uint64_t MURMUR_PRIME = 0xc6a4a7935bd1e995; static const int MURMUR_R = 47; diff --git a/cpp/src/arrow/util/macros.h b/cpp/src/arrow/util/macros.h index 5f1934d732c..4516985e300 100644 --- a/cpp/src/arrow/util/macros.h +++ b/cpp/src/arrow/util/macros.h @@ -18,6 +18,8 @@ #ifndef ARROW_UTIL_MACROS_H #define ARROW_UTIL_MACROS_H +#include + #define ARROW_STRINGIFY(x) #x #define ARROW_CONCAT(x, y) x##y @@ -123,6 +125,17 @@ #define ARROW_DISABLE_UBSAN(feature) #endif +// ---------------------------------------------------------------------- +// Machine information + +#if INTPTR_MAX == INT64_MAX +#define ARROW_BITNESS 64 +#elif INTPTR_MAX == INT32_MAX +#define ARROW_BITNESS 32 +#else +#error Unexpected INTPTR_MAX +#endif + // ---------------------------------------------------------------------- // From googletest // (also in parquet-cpp) From 695bdc91aa9c4d00a1fa3291dcbd1088e84e4970 Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Tue, 19 Feb 2019 08:19:58 -0800 Subject: [PATCH 03/16] [C++] Add MinGW32 tests as suggested in pull/3693 --- ci/appveyor-cpp-build-mingw.bat | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/appveyor-cpp-build-mingw.bat b/ci/appveyor-cpp-build-mingw.bat index 4d399274549..d70fce1a865 100644 --- a/ci/appveyor-cpp-build-mingw.bat +++ b/ci/appveyor-cpp-build-mingw.bat @@ -44,8 +44,10 @@ cmake ^ -DARROW_PYTHON=ON ^ -DPythonInterp_FIND_VERSION=ON ^ -DPythonInterp_FIND_VERSION_MAJOR=3 ^ + -DARROW_BUILD_TESTS=ON ^ .. || exit /B make -j4 || exit /B +make test || exit /B make install || exit /B popd From a24285baa6d84f7eb3f73f3d0aa9fbe9d04c4a62 Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Tue, 19 Feb 2019 13:39:42 -0800 Subject: [PATCH 04/16] [C++] Remove allow_failures as suggested in pull/3693 --- appveyor.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 082063ae572..3c4c2c3dc76 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -36,14 +36,6 @@ cache: matrix: fast_finish: true - allow_failures: - # Can't build with 32-bit MinGW for now. - # See https://issues.apache.org/jira/browse/ARROW-4297 - - JOB: "MinGW32" - MINGW_PACKAGE_PREFIX: mingw-w64-i686 - MINGW_PREFIX: c:\msys64\mingw32 - MSYSTEM: MINGW32 - USE_CLCACHE: false environment: global: From 057347a08b6b5511f58b41488c066643a47ad9b3 Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Tue, 19 Feb 2019 16:56:55 -0800 Subject: [PATCH 05/16] [C++] Install gflags as suggested in pull/3693 --- ci/appveyor-cpp-setup-mingw.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/appveyor-cpp-setup-mingw.bat b/ci/appveyor-cpp-setup-mingw.bat index 471e7426f6e..0c3d633cf8a 100644 --- a/ci/appveyor-cpp-setup-mingw.bat +++ b/ci/appveyor-cpp-setup-mingw.bat @@ -25,6 +25,7 @@ pacman -S --noconfirm ^ "%MINGW_PACKAGE_PREFIX%-cmake" ^ "%MINGW_PACKAGE_PREFIX%-flatbuffers" ^ "%MINGW_PACKAGE_PREFIX%-gcc" ^ + "%MINGW_PACKAGE_PREFIX%-gflags" ^ "%MINGW_PACKAGE_PREFIX%-gobject-introspection" ^ "%MINGW_PACKAGE_PREFIX%-gtk-doc" ^ "%MINGW_PACKAGE_PREFIX%-lz4" ^ From 9c1d6e464cf0d59b0864b19b850bae62ad307f82 Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Tue, 26 Feb 2019 11:31:34 -0800 Subject: [PATCH 06/16] [C++] skip array-dict-test in win32 builds --- cpp/src/arrow/CMakeLists.txt | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt index 94eba0ce1a6..9ddadc5a555 100644 --- a/cpp/src/arrow/CMakeLists.txt +++ b/cpp/src/arrow/CMakeLists.txt @@ -301,13 +301,24 @@ arrow_add_pkg_config("arrow") # add_arrow_test(allocator-test) -add_arrow_test(array-test - SOURCES - array-test.cc - array-binary-test.cc - array-dict-test.cc - array-list-test.cc - array-struct-test.cc) + +if(WIN32) + add_arrow_test(array-test + SOURCES + array-test.cc + array-binary-test.cc + array-list-test.cc + array-struct-test.cc) +else() + add_arrow_test(array-test + SOURCES + array-test.cc + array-binary-test.cc + array-dict-test.cc + array-list-test.cc + array-struct-test.cc) +endif() + add_arrow_test(buffer-test) if(ARROW_IPC) From 3a0620f6c95d9fff83267126f727d738d0ba2f87 Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Tue, 26 Feb 2019 15:48:35 -0800 Subject: [PATCH 07/16] [C++] Use ARROW_BITNESS instead of MinGW checks --- cpp/src/arrow/util/sse-util.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cpp/src/arrow/util/sse-util.h b/cpp/src/arrow/util/sse-util.h index 86e7dec411b..15e7c99581a 100644 --- a/cpp/src/arrow/util/sse-util.h +++ b/cpp/src/arrow/util/sse-util.h @@ -110,8 +110,7 @@ static inline uint32_t SSE4_crc32_u32(uint32_t crc, uint32_t v) { } static inline uint32_t SSE4_crc32_u64(uint32_t crc, uint64_t v) { -#if defined(__MINGW32__) && !defined(__MINGW64__) - DCHECK(false) << "MinGW-w64 32-bit doesn't support _mm_crc32_u64()"; +#if ARROW_BITNESS == 32 return 0; #else return static_cast(_mm_crc32_u64(crc, v)); From e0058b2afabb031d419fbb7e792ef489ffc7023a Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Tue, 26 Feb 2019 18:00:17 -0800 Subject: [PATCH 08/16] [C++] Skip failing tests to investigate later --- cpp/src/arrow/compute/kernels/cast-test.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cpp/src/arrow/compute/kernels/cast-test.cc b/cpp/src/arrow/compute/kernels/cast-test.cc index e7f5a4aa296..0fd3065bd9b 100644 --- a/cpp/src/arrow/compute/kernels/cast-test.cc +++ b/cpp/src/arrow/compute/kernels/cast-test.cc @@ -424,6 +424,7 @@ TEST_F(TestCast, FloatingPointToInt) { options); } +#if ARROW_BITNESS >= 64 TEST_F(TestCast, IntToFloatingPoint) { auto options = CastOptions::Safe(); @@ -438,6 +439,7 @@ TEST_F(TestCast, IntToFloatingPoint) { UnsafeVectorCast(v1), options); } +#endif TEST_F(TestCast, TimestampToTimestamp) { CastOptions options; From 5b904fa4043594f90b2573fc5d57449bb20e0c83 Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Tue, 26 Feb 2019 20:25:42 -0800 Subject: [PATCH 09/16] [C++] Skip python since not installed in appveyor --- ci/appveyor-cpp-build-mingw.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/appveyor-cpp-build-mingw.bat b/ci/appveyor-cpp-build-mingw.bat index d70fce1a865..d32e80410c6 100644 --- a/ci/appveyor-cpp-build-mingw.bat +++ b/ci/appveyor-cpp-build-mingw.bat @@ -45,6 +45,7 @@ cmake ^ -DPythonInterp_FIND_VERSION=ON ^ -DPythonInterp_FIND_VERSION_MAJOR=3 ^ -DARROW_BUILD_TESTS=ON ^ + -DARROW_PYTHON=OFF ^ .. || exit /B make -j4 || exit /B make test || exit /B From 4cb63b17024e4bac0a8031c095254d6e02ab95ca Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Wed, 27 Feb 2019 16:52:44 -0800 Subject: [PATCH 10/16] [C++] Show error details in test as suggested in pull/3693 --- ci/appveyor-cpp-build-mingw.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/appveyor-cpp-build-mingw.bat b/ci/appveyor-cpp-build-mingw.bat index d32e80410c6..bdd3b14462e 100644 --- a/ci/appveyor-cpp-build-mingw.bat +++ b/ci/appveyor-cpp-build-mingw.bat @@ -48,7 +48,7 @@ cmake ^ -DARROW_PYTHON=OFF ^ .. || exit /B make -j4 || exit /B -make test || exit /B +ctest --output-on-failure -j2 || exit /B make install || exit /B popd From aa9f711555265411eb8ee57bfca217802a0ccd08 Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Wed, 27 Feb 2019 16:54:41 -0800 Subject: [PATCH 11/16] [C++] Install python as suggested in pull/3693 --- ci/appveyor-cpp-build-mingw.bat | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ci/appveyor-cpp-build-mingw.bat b/ci/appveyor-cpp-build-mingw.bat index bdd3b14462e..46b9e8a6c34 100644 --- a/ci/appveyor-cpp-build-mingw.bat +++ b/ci/appveyor-cpp-build-mingw.bat @@ -24,6 +24,15 @@ set INSTALL_DIR=%HOMEDRIVE%%HOMEPATH%\install set PATH=%INSTALL_DIR%\bin;%PATH% set PKG_CONFIG_PATH=%INSTALL_DIR%\lib\pkgconfig +for /f "usebackq" %%v in (`python3 -c "import sys; print('.'.join(map(str, sys.version_info[0:2])))"`) do ( + set PYTHON_VERSION=%%v +) + +set PYTHONHOME=%MINGW_PREFIX%\lib\python%PYTHON_VERSION% +set PYTHONPATH=%PYTHONHOME% +set PYTHONPATH=%PYTHONPATH%;%MINGW_PREFIX%\lib\python%PYTHON_VERSION%\lib-dynload +set PYTHONPATH=%PYTHONPATH%;%MINGW_PREFIX%\lib\python%PYTHON_VERSION%\site-packages + set CPP_BUILD_DIR=cpp\build mkdir %CPP_BUILD_DIR% pushd %CPP_BUILD_DIR% @@ -45,7 +54,6 @@ cmake ^ -DPythonInterp_FIND_VERSION=ON ^ -DPythonInterp_FIND_VERSION_MAJOR=3 ^ -DARROW_BUILD_TESTS=ON ^ - -DARROW_PYTHON=OFF ^ .. || exit /B make -j4 || exit /B ctest --output-on-failure -j2 || exit /B From f2e4dfa18f39100975c7aab046d4d9a49fd47a77 Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Wed, 27 Feb 2019 16:59:24 -0800 Subject: [PATCH 12/16] [C++] Revert disabled test to investigate appveyor failure --- cpp/src/arrow/CMakeLists.txt | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt index 9ddadc5a555..4d1d24f4ca7 100644 --- a/cpp/src/arrow/CMakeLists.txt +++ b/cpp/src/arrow/CMakeLists.txt @@ -302,22 +302,13 @@ arrow_add_pkg_config("arrow") add_arrow_test(allocator-test) -if(WIN32) - add_arrow_test(array-test - SOURCES - array-test.cc - array-binary-test.cc - array-list-test.cc - array-struct-test.cc) -else() - add_arrow_test(array-test - SOURCES - array-test.cc - array-binary-test.cc - array-dict-test.cc - array-list-test.cc - array-struct-test.cc) -endif() +add_arrow_test(array-test + SOURCES + array-test.cc + array-binary-test.cc + array-dict-test.cc + array-list-test.cc + array-struct-test.cc) add_arrow_test(buffer-test) From e69b1e95abec7fef4e30206f75da80fcc302f77d Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Thu, 28 Feb 2019 07:33:39 -0800 Subject: [PATCH 13/16] [C++] Revert install python as suggested in pull/3693 --- ci/appveyor-cpp-build-mingw.bat | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/ci/appveyor-cpp-build-mingw.bat b/ci/appveyor-cpp-build-mingw.bat index 46b9e8a6c34..bdd3b14462e 100644 --- a/ci/appveyor-cpp-build-mingw.bat +++ b/ci/appveyor-cpp-build-mingw.bat @@ -24,15 +24,6 @@ set INSTALL_DIR=%HOMEDRIVE%%HOMEPATH%\install set PATH=%INSTALL_DIR%\bin;%PATH% set PKG_CONFIG_PATH=%INSTALL_DIR%\lib\pkgconfig -for /f "usebackq" %%v in (`python3 -c "import sys; print('.'.join(map(str, sys.version_info[0:2])))"`) do ( - set PYTHON_VERSION=%%v -) - -set PYTHONHOME=%MINGW_PREFIX%\lib\python%PYTHON_VERSION% -set PYTHONPATH=%PYTHONHOME% -set PYTHONPATH=%PYTHONPATH%;%MINGW_PREFIX%\lib\python%PYTHON_VERSION%\lib-dynload -set PYTHONPATH=%PYTHONPATH%;%MINGW_PREFIX%\lib\python%PYTHON_VERSION%\site-packages - set CPP_BUILD_DIR=cpp\build mkdir %CPP_BUILD_DIR% pushd %CPP_BUILD_DIR% @@ -54,6 +45,7 @@ cmake ^ -DPythonInterp_FIND_VERSION=ON ^ -DPythonInterp_FIND_VERSION_MAJOR=3 ^ -DARROW_BUILD_TESTS=ON ^ + -DARROW_PYTHON=OFF ^ .. || exit /B make -j4 || exit /B ctest --output-on-failure -j2 || exit /B From 41ae266eccfe93a185bfc792de7b4e5e4f3bf539 Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Thu, 28 Feb 2019 12:04:32 -0800 Subject: [PATCH 14/16] Revert "[C++] Revert disabled test to investigate appveyor failure" This reverts commit f2e4dfa18f39100975c7aab046d4d9a49fd47a77. --- cpp/src/arrow/CMakeLists.txt | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/cpp/src/arrow/CMakeLists.txt b/cpp/src/arrow/CMakeLists.txt index 4d1d24f4ca7..9ddadc5a555 100644 --- a/cpp/src/arrow/CMakeLists.txt +++ b/cpp/src/arrow/CMakeLists.txt @@ -302,13 +302,22 @@ arrow_add_pkg_config("arrow") add_arrow_test(allocator-test) -add_arrow_test(array-test - SOURCES - array-test.cc - array-binary-test.cc - array-dict-test.cc - array-list-test.cc - array-struct-test.cc) +if(WIN32) + add_arrow_test(array-test + SOURCES + array-test.cc + array-binary-test.cc + array-list-test.cc + array-struct-test.cc) +else() + add_arrow_test(array-test + SOURCES + array-test.cc + array-binary-test.cc + array-dict-test.cc + array-list-test.cc + array-struct-test.cc) +endif() add_arrow_test(buffer-test) From 2ee894ffb4dd78e3dadc8f78719f5c8f4562c887 Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Thu, 28 Feb 2019 15:52:39 -0800 Subject: [PATCH 15/16] Revert "[C++] Revert install python as suggested in pull/3693" This reverts commit e69b1e95abec7fef4e30206f75da80fcc302f77d. --- ci/appveyor-cpp-build-mingw.bat | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ci/appveyor-cpp-build-mingw.bat b/ci/appveyor-cpp-build-mingw.bat index bdd3b14462e..46b9e8a6c34 100644 --- a/ci/appveyor-cpp-build-mingw.bat +++ b/ci/appveyor-cpp-build-mingw.bat @@ -24,6 +24,15 @@ set INSTALL_DIR=%HOMEDRIVE%%HOMEPATH%\install set PATH=%INSTALL_DIR%\bin;%PATH% set PKG_CONFIG_PATH=%INSTALL_DIR%\lib\pkgconfig +for /f "usebackq" %%v in (`python3 -c "import sys; print('.'.join(map(str, sys.version_info[0:2])))"`) do ( + set PYTHON_VERSION=%%v +) + +set PYTHONHOME=%MINGW_PREFIX%\lib\python%PYTHON_VERSION% +set PYTHONPATH=%PYTHONHOME% +set PYTHONPATH=%PYTHONPATH%;%MINGW_PREFIX%\lib\python%PYTHON_VERSION%\lib-dynload +set PYTHONPATH=%PYTHONPATH%;%MINGW_PREFIX%\lib\python%PYTHON_VERSION%\site-packages + set CPP_BUILD_DIR=cpp\build mkdir %CPP_BUILD_DIR% pushd %CPP_BUILD_DIR% @@ -45,7 +54,6 @@ cmake ^ -DPythonInterp_FIND_VERSION=ON ^ -DPythonInterp_FIND_VERSION_MAJOR=3 ^ -DARROW_BUILD_TESTS=ON ^ - -DARROW_PYTHON=OFF ^ .. || exit /B make -j4 || exit /B ctest --output-on-failure -j2 || exit /B From e56dd14219f8ad6891c4f9405b0c99d51d9165e1 Mon Sep 17 00:00:00 2001 From: Javier Luraschi Date: Thu, 28 Feb 2019 19:56:56 -0800 Subject: [PATCH 16/16] Revert "Revert "[C++] Revert install python as suggested in pull/3693"" This reverts commit 2ee894ffb4dd78e3dadc8f78719f5c8f4562c887. --- ci/appveyor-cpp-build-mingw.bat | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/ci/appveyor-cpp-build-mingw.bat b/ci/appveyor-cpp-build-mingw.bat index 46b9e8a6c34..bdd3b14462e 100644 --- a/ci/appveyor-cpp-build-mingw.bat +++ b/ci/appveyor-cpp-build-mingw.bat @@ -24,15 +24,6 @@ set INSTALL_DIR=%HOMEDRIVE%%HOMEPATH%\install set PATH=%INSTALL_DIR%\bin;%PATH% set PKG_CONFIG_PATH=%INSTALL_DIR%\lib\pkgconfig -for /f "usebackq" %%v in (`python3 -c "import sys; print('.'.join(map(str, sys.version_info[0:2])))"`) do ( - set PYTHON_VERSION=%%v -) - -set PYTHONHOME=%MINGW_PREFIX%\lib\python%PYTHON_VERSION% -set PYTHONPATH=%PYTHONHOME% -set PYTHONPATH=%PYTHONPATH%;%MINGW_PREFIX%\lib\python%PYTHON_VERSION%\lib-dynload -set PYTHONPATH=%PYTHONPATH%;%MINGW_PREFIX%\lib\python%PYTHON_VERSION%\site-packages - set CPP_BUILD_DIR=cpp\build mkdir %CPP_BUILD_DIR% pushd %CPP_BUILD_DIR% @@ -54,6 +45,7 @@ cmake ^ -DPythonInterp_FIND_VERSION=ON ^ -DPythonInterp_FIND_VERSION_MAJOR=3 ^ -DARROW_BUILD_TESTS=ON ^ + -DARROW_PYTHON=OFF ^ .. || exit /B make -j4 || exit /B ctest --output-on-failure -j2 || exit /B