Move nanopb-generated ONNX to unique file name (pytorch#8773)

* Move nanopb-generated ONNX to unique file name * fix other places
zmmwl · Jun 22, 2018 · 5a7b484 · 5a7b484
1 parent 9c42679
commit 5a7b484
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/setup.py b/setup.py
@@ -817,7 +817,7 @@ def run(self):
     "torch/csrc/autograd/functions/init.cpp",
     "torch/csrc/nn/THNN.cpp",
     "torch/csrc/tensor/python_tensor.cpp",
-    "torch/csrc/onnx/onnx.pb.cpp",
+    "torch/csrc/onnx/onnx.npb.cpp",
     "torch/csrc/onnx/onnx.cpp",
     "torch/csrc/onnx/init.cpp",
 ]

diff --git a/tools/gen_onnx.sh b/tools/gen_onnx.sh
@@ -17,7 +17,8 @@ protoc --plugin=protoc-gen-nanopb=$PWD/torch/lib/nanopb/generator/protoc-gen-nan
        --nanopb_out=-T:.
 # NB: -T suppresses timestamp. See https://github.com/nanopb/nanopb/issues/274
 # nanopb generated C files are valid CPP! Yay!
-cp $TEMP_DIR/onnx.pb.c torch/csrc/onnx/onnx.pb.cpp
-cp $TEMP_DIR/onnx.pb.h torch/csrc/onnx/onnx.pb.h
+cp $TEMP_DIR/onnx.pb.c torch/csrc/onnx/onnx.npb.cpp
+sed -i s'/\(#include.*onnx\).pb.h/\1.npb.h/' torch/csrc/onnx/onnx.npb.cpp
+cp $TEMP_DIR/onnx.pb.h torch/csrc/onnx/onnx.npb.h
 
 rm -r $TEMP_DIR
diff --git a/torch/CMakeLists.txt b/torch/CMakeLists.txt
@@ -239,7 +239,7 @@ set(TORCH_SRCS
   ${TORCH_SRC_DIR}/csrc/jit/export.cpp
   ${TORCH_SRC_DIR}/csrc/jit/import.cpp
   ${TORCH_SRC_DIR}/csrc/onnx/onnx.cpp
-  ${TORCH_SRC_DIR}/csrc/onnx/onnx.pb.cpp
+  ${TORCH_SRC_DIR}/csrc/onnx/onnx.npb.cpp
   ${TORCH_SRC_DIR}/csrc/torch.cpp)
 
 if (NOT NO_API)

diff --git a/torch/csrc/jit/import.cpp b/torch/csrc/jit/import.cpp
@@ -1,5 +1,5 @@
 #include "torch/csrc/jit/import.h"
-#include "torch/csrc/onnx/onnx.pb.h"
+#include "torch/csrc/onnx/onnx.npb.h"
 #include "torch/csrc/jit/ir.h"
 #include "torch/csrc/utils/functional.h"
 

diff --git a/torch/csrc/onnx/init.cpp b/torch/csrc/onnx/init.cpp
@@ -1,5 +1,5 @@
 #include "torch/csrc/onnx/init.h"
-#include "torch/csrc/onnx/onnx.pb.h"
+#include "torch/csrc/onnx/onnx.npb.h"
 #include "torch/csrc/onnx/onnx.h"
 
 namespace torch { namespace onnx {

diff --git a/torch/csrc/onnx/onnx.h b/torch/csrc/onnx/onnx.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "torch/csrc/onnx/onnx.pb.h"
+#include "torch/csrc/onnx/onnx.npb.h"
 #include "torch/csrc/assertions.h"
 
 #include <pb_encode.h>

diff --git a/torch/csrc/onnx/onnx.pb.cpp → torch/csrc/onnx/onnx.npb.cpp b/torch/csrc/onnx/onnx.pb.cpp → torch/csrc/onnx/onnx.npb.cpp
@@ -1,7 +1,7 @@
 /* Automatically generated nanopb constant definitions */
 /* Generated by nanopb-0.3.9-dev */
 
-#include "onnx.pb.h"
+#include "onnx.npb.h"
 
 /* @@protoc_insertion_point(includes) */
 #if PB_PROTO_HEADER_VERSION != 30

diff --git a/torch/csrc/onnx/onnx.pb.h → torch/csrc/onnx/onnx.npb.h b/torch/csrc/onnx/onnx.pb.h → torch/csrc/onnx/onnx.npb.h