arrow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject arrow git commit: ARROW-1312: [C++] Make ARROW_JEMALLOC OFF by default until ARROW-1282 is resolved
Date Wed, 02 Aug 2017 23:33:02 GMT
Repository: arrow
Updated Branches:
  refs/heads/master 21a019157 -> 84b7a0d17


ARROW-1312: [C++] Make ARROW_JEMALLOC OFF by default until ARROW-1282 is resolved

See ARROW-1282, ARROW-1311 for related discussions.

Author: Wes McKinney <wes.mckinney@twosigma.com>

Closes #935 from wesm/ARROW-1312 and squashes the following commits:

2a06763c [Wes McKinney] Make ARROW_JEMALLOC OFF by default until ARROW-1282 is resolved


Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/84b7a0d1
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/84b7a0d1
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/84b7a0d1

Branch: refs/heads/master
Commit: 84b7a0d176270911a9d911b3fd2522ead67ee9ee
Parents: 21a0191
Author: Wes McKinney <wes.mckinney@twosigma.com>
Authored: Wed Aug 2 19:32:57 2017 -0400
Committer: Wes McKinney <wes.mckinney@twosigma.com>
Committed: Wed Aug 2 19:32:57 2017 -0400

----------------------------------------------------------------------
 ci/travis_before_script_cpp.sh | 6 ------
 cpp/CMakeLists.txt             | 2 +-
 cpp/apidoc/Windows.md          | 8 ++++++--
 3 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/84b7a0d1/ci/travis_before_script_cpp.sh
----------------------------------------------------------------------
diff --git a/ci/travis_before_script_cpp.sh b/ci/travis_before_script_cpp.sh
index d456d30..7418b76 100755
--- a/ci/travis_before_script_cpp.sh
+++ b/ci/travis_before_script_cpp.sh
@@ -70,12 +70,6 @@ if [ $only_library_mode == "yes" ]; then
 $CMAKE_COMMON_FLAGS \
 -DARROW_BUILD_TESTS=OFF \
 -DARROW_BUILD_UTILITIES=OFF"
-else
-  # Deactivate jemalloc on Linux builds. We check the jemalloc+Linux build
-  # also in the manylinux1 image.
-  CMAKE_LINUX_FLAGS="\
-$CMAKE_LINUX_FLAGS \
--DARROW_JEMALLOC=ON"
 fi
 
 # Use Ninja for faster builds when using toolchain

http://git-wip-us.apache.org/repos/asf/arrow/blob/84b7a0d1/cpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index eeff912..7d73d1f 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -100,7 +100,7 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 
   option(ARROW_JEMALLOC
     "Build the Arrow jemalloc-based allocator"
-    ON)
+    OFF)
 
   option(ARROW_JEMALLOC_USE_SHARED
     "Rely on jemalloc shared libraries where relevant"

http://git-wip-us.apache.org/repos/asf/arrow/blob/84b7a0d1/cpp/apidoc/Windows.md
----------------------------------------------------------------------
diff --git a/cpp/apidoc/Windows.md b/cpp/apidoc/Windows.md
index 30b7b8f..774482e 100644
--- a/cpp/apidoc/Windows.md
+++ b/cpp/apidoc/Windows.md
@@ -187,14 +187,18 @@ Command line to build Arrow in Debug might look as following:
 cd cpp
 mkdir build
 cd build
-cmake -G "Visual Studio 14 2015 Win64" -DARROW_BOOST_USE_SHARED=OFF -DARROW_JEMALLOC=OFF
-DCMAKE_BUILD_TYPE=Debug -DBOOST_ROOT=C:/local/boost_1_63_0  -DBOOST_LIBRARYDIR=C:/local/boost_1_63_0/lib64-msvc-14.0
..
+cmake -G "Visual Studio 14 2015 Win64" ^
+      -DARROW_BOOST_USE_SHARED=OFF ^
+      -DCMAKE_BUILD_TYPE=Debug ^
+      -DBOOST_ROOT=C:/local/boost_1_63_0  ^
+      -DBOOST_LIBRARYDIR=C:/local/boost_1_63_0/lib64-msvc-14.0 ^
+      ..
 cmake --build . --config Debug
 ```
 
 To get the latest build instructions, you can reference [msvc-build.bat][5], which is used
by automated Appveyor builds.
 
 
-
 [1]: https://conda.io/miniconda.html
 [2]: https://conda-forge.github.io/
 [3]: http://cmder.net/


Mime
View raw message