diff options
| author | Orion Reblitz-Richardson <orionr@gmail.com> | 2018-08-24 10:39:14 -0700 |
|---|---|---|
| committer | Facebook Github Bot <facebook-github-bot@users.noreply.github.com> | 2018-08-24 10:54:38 -0700 |
| commit | 3c9775fff89b5362a4d53f9f668707ed5f6d84ed (patch) | |
| tree | 6af4328380f9e3abdf4b22119c67d24bbef33cea /tools | |
| parent | 8c13971f57f4266e96fd125bf5fad5f808eb74fd (diff) | |
| download | pytorch-3c9775fff89b5362a4d53f9f668707ed5f6d84ed.tar.gz pytorch-3c9775fff89b5362a4d53f9f668707ed5f6d84ed.tar.bz2 pytorch-3c9775fff89b5362a4d53f9f668707ed5f6d84ed.zip | |
Remove nanopb since we've switched to protobuf (#10772)
Summary:
We no longer use nanopb in PyTorch (or Caffe2) so removing. All protobuf manipulation should go through standard protobuf, which is statically linked inside libcaffe2.so by default.
cc zdevito pjh5 ezyang Yangqing
Pull Request resolved: https://github.com/pytorch/pytorch/pull/10772
Reviewed By: pjh5
Differential Revision: D9465894
Pulled By: orionr
fbshipit-source-id: 8cdf9f1d3953b7a48478d381814d7107df447201
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/build_pytorch_libs.bat | 1 | ||||
| -rwxr-xr-x | tools/build_pytorch_libs.sh | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/tools/build_pytorch_libs.bat b/tools/build_pytorch_libs.bat index 568d83be1b..39beb7a548 100755 --- a/tools/build_pytorch_libs.bat +++ b/tools/build_pytorch_libs.bat @@ -152,7 +152,6 @@ goto:eof -DTHCUNN_SO_VERSION=1 ^ -DUSE_CUDA=%USE_CUDA% ^ -DNO_NNPACK=%NO_NNPACK% ^ - -Dnanopb_BUILD_GENERATOR=0 ^ -DCMAKE_BUILD_TYPE=%BUILD_TYPE% %MAKE_COMMAND% diff --git a/tools/build_pytorch_libs.sh b/tools/build_pytorch_libs.sh index 5934d9344d..268ec12c55 100755 --- a/tools/build_pytorch_libs.sh +++ b/tools/build_pytorch_libs.sh @@ -148,7 +148,6 @@ function build() { BUILD_C_FLAGS='' case $1 in THCS | THCUNN ) BUILD_C_FLAGS=$C_FLAGS;; - nanopb ) BUILD_C_FLAGS=$C_FLAGS" -fPIC -fexceptions";; *) BUILD_C_FLAGS=$C_FLAGS" -fexceptions";; esac # TODO: The *_LIBRARIES cmake variables should eventually be @@ -184,7 +183,6 @@ function build() { -DUSE_CUDA=$USE_CUDA \ -DNO_NNPACK=$((1-$USE_NNPACK)) \ -DNCCL_EXTERNAL=1 \ - -Dnanopb_BUILD_GENERATOR=0 \ -DCMAKE_DEBUG_POSTFIX="" \ -DCMAKE_BUILD_TYPE=$BUILD_TYPE \ ${@:2} \ |