Skip to content

Commit

Permalink
Update third-party patches (ray-project#203)
Browse files Browse the repository at this point in the history
  • Loading branch information
mehrdadn authored and robertnishihara committed Jul 5, 2016
1 parent db1f10f commit eff6924
Show file tree
Hide file tree
Showing 9 changed files with 195 additions and 402 deletions.
11 changes: 6 additions & 5 deletions thirdparty/download_thirdparty.bat
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@
git -C "grpc" submodule update --init "third_party/protobuf"
git -C "grpc" submodule update --init "third_party/nanopb"
git -C "grpc" submodule update --init "third_party/zlib"
git -C "grpc" apply "%~dp0windows-patches/grpc-projects.patch"
git -C "grpc/third_party/protobuf" apply "%~dp0windows-patches/protobuf-projects.patch"
git -C "arrow/cpp/thirdparty/flatbuffers" apply "%~dp0windows-patches/flatbuffers-projects.patch"
git -C "arrow/cpp/thirdparty/parquet" apply "%~dp0windows-patches/parquet-endian.patch"
git -C "python" apply "%~dp0windows-patches/python-pyconfig.patch"
git -C "grpc" apply "%~dp0patches/grpc-source.patch"
git -C "grpc" apply "%~dp0patches/windows/grpc-projects.patch"
git -C "grpc/third_party/protobuf" apply "%~dp0patches/windows/protobuf-projects.patch"
git -C "arrow/cpp/thirdparty/flatbuffers" apply "%~dp0patches/windows/flatbuffers-projects.patch"
git -C "arrow/cpp/thirdparty/parquet" apply "%~dp0patches/windows/parquet-endian.patch"
git -C "python" apply "%~dp0patches/windows/python-pyconfig.patch"
@PopD
@EndLocal
1 change: 1 addition & 0 deletions thirdparty/patches/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.patch text eol=lf
17 changes: 17 additions & 0 deletions thirdparty/patches/grpc-source.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
diff --git a/src/cpp/server/create_default_thread_pool.cc b/src/cpp/server/create_default_thread_pool.cc
index f3b07ec..ede18cb
--- a/src/cpp/server/create_default_thread_pool.cc
+++ b/src/cpp/server/create_default_thread_pool.cc
@@ -40,8 +40,12 @@
namespace grpc {

ThreadPoolInterface* CreateDefaultThreadPool() {
+#ifdef NDEBUG
int cores = gpr_cpu_num_cores();
if (!cores) cores = 4;
+#else
+ int cores = 0;
+#endif
return new DynamicThreadPool(cores);
}

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion thirdparty/windows-patches/.gitattributes

This file was deleted.

0 comments on commit eff6924

Please sign in to comment.