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 2021/01/18 22:17:04 UTC
[arrow] branch master updated: ARROW-11303: [Release][C++] Enable
mimalloc in the windows verification script
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 69a9a1c ARROW-11303: [Release][C++] Enable mimalloc in the windows verification script
69a9a1c is described below
commit 69a9a1c3adc538d3bbf16811ff8c4d930f57b0fe
Author: Krisztián Szűcs <sz...@gmail.com>
AuthorDate: Tue Jan 19 07:16:09 2021 +0900
ARROW-11303: [Release][C++] Enable mimalloc in the windows verification script
Closes #9247 from kszucs/mimalloc-windows-verification
Authored-by: Krisztián Szűcs <sz...@gmail.com>
Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
dev/release/verify-release-candidate.bat | 47 +++++++++++++++-----------------
dev/tasks/verify-rc/github.win.yml | 2 +-
2 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/dev/release/verify-release-candidate.bat b/dev/release/verify-release-candidate.bat
index 2bc66c1..bef78fc 100644
--- a/dev/release/verify-release-candidate.bat
+++ b/dev/release/verify-release-candidate.bat
@@ -41,20 +41,15 @@ set PYTHON=3.6
@rem Using call with conda.bat seems necessary to avoid terminating the batch
@rem script execution
-call conda create -p %_VERIFICATION_CONDA_ENV% ^
- --no-shortcuts -f -q -y python=%PYTHON% ^
+call conda create --no-shortcuts -c conda-forge -f -q -y -p %_VERIFICATION_CONDA_ENV% ^
+ --file=ci\conda_env_cpp.yml ^
+ --file=ci\conda_env_python.yml ^
+ git ^
+ python=%PYTHON% ^
|| exit /B 1
call activate %_VERIFICATION_CONDA_ENV% || exit /B 1
-call conda install -y ^
- --no-shortcuts ^
- python=3.7 ^
- git ^
- --file=ci\conda_env_cpp.yml ^
- --file=ci\conda_env_python.yml ^
- -c conda-forge || exit /B 1
-
set GENERATOR=Visual Studio 15 2017 Win64
set CONFIGURATION=release
@@ -75,24 +70,25 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\Tool
@rem generator used
cmake -G "%GENERATOR%" ^
- -DCMAKE_INSTALL_PREFIX=%ARROW_HOME% ^
- -DARROW_BUILD_STATIC=OFF ^
-DARROW_BOOST_USE_SHARED=ON ^
+ -DARROW_BUILD_STATIC=OFF ^
-DARROW_BUILD_TESTS=ON ^
- -DGTest_SOURCE=BUNDLED ^
- -DCMAKE_BUILD_TYPE=%CONFIGURATION% ^
- -DCMAKE_UNITY_BUILD=ON ^
-DARROW_CXXFLAGS="/MP" ^
+ -DARROW_DATASET=ON ^
+ -DARROW_FLIGHT=ON ^
+ -DARROW_MIMALLOC=ON ^
+ -DARROW_PARQUET=ON ^
+ -DARROW_PYTHON=ON ^
+ -DARROW_WITH_BROTLI=ON ^
-DARROW_WITH_BZ2=ON ^
- -DARROW_WITH_ZLIB=ON ^
- -DARROW_WITH_ZSTD=ON ^
-DARROW_WITH_LZ4=ON ^
-DARROW_WITH_SNAPPY=ON ^
- -DARROW_WITH_BROTLI=ON ^
- -DARROW_FLIGHT=ON ^
- -DARROW_PYTHON=ON ^
- -DARROW_DATASET=ON ^
- -DARROW_PARQUET=ON ^
+ -DARROW_WITH_ZLIB=ON ^
+ -DARROW_WITH_ZSTD=ON ^
+ -DCMAKE_BUILD_TYPE=%CONFIGURATION% ^
+ -DCMAKE_INSTALL_PREFIX=%ARROW_HOME% ^
+ -DCMAKE_UNITY_BUILD=ON ^
+ -DGTest_SOURCE=BUNDLED ^
.. || exit /B
cmake --build . --target INSTALL --config Release || exit /B 1
@@ -111,9 +107,10 @@ git clone https://github.com/apache/arrow-testing.git %_VERIFICATION_DIR%\arrow-
set ARROW_TEST_DATA=%_VERIFICATION_DIR%\arrow-testing\data
@rem Needed so python-test.exe works
-set PYTHONPATH=%CONDA_PREFIX%\Lib;%CONDA_PREFIX%\Lib\site-packages;%CONDA_PREFIX%\python35.zip;%CONDA_PREFIX%\DLLs;%CONDA_PREFIX%;%PYTHONPATH%
-
+set PYTHONPATH_ORIGINAL=%PYTHONPATH%
+set PYTHONPATH=%CONDA_PREFIX%\Lib;%CONDA_PREFIX%\Lib\site-packages;%CONDA_PREFIX%\DLLs;%CONDA_PREFIX%;%PYTHONPATH%
ctest -VV || exit /B 1
+set PYTHONPATH=%PYTHONPATH_ORIGINAL%
popd
@rem Build and import pyarrow
@@ -126,7 +123,7 @@ set PYARROW_WITH_FLIGHT=1
set PYARROW_WITH_PARQUET=1
set PYARROW_WITH_DATASET=1
python setup.py build_ext --inplace --bundle-arrow-cpp bdist_wheel || exit /B 1
-py.test pyarrow -v -s --enable-parquet || exit /B 1
+pytest pyarrow -v -s --enable-parquet || exit /B 1
popd
diff --git a/dev/tasks/verify-rc/github.win.yml b/dev/tasks/verify-rc/github.win.yml
index fbe0ee2..7a96f89 100644
--- a/dev/tasks/verify-rc/github.win.yml
+++ b/dev/tasks/verify-rc/github.win.yml
@@ -44,7 +44,7 @@ jobs:
- name: Fetch Submodules and Tags
shell: bash
run: cd arrow && ci/scripts/util_checkout.sh
- - uses: s-weigand/setup-conda@v1
+ - uses: conda-incubator/setup-miniconda@v2
- name: Install System Dependencies
run: |
choco install boost-msvc-14.1