Skip to content

Commit 6a21a10

Browse files
authored
Merge pull request #18 from dhaase-de/master
Do not overwrite existing 'deploy.prototxt' when converting from Caffe model
2 parents 40b1017 + 9506959 commit 6a21a10

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

mmdnn/conversion/caffe/graph.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from copy import deepcopy
55
import numbers
66
import os
7+
import tempfile
78

89
from mmdnn.conversion.caffe.mapper import get_handler_name
910
from mmdnn.conversion.caffe.resolver import get_caffe_resolver, has_pycaffe
@@ -239,7 +240,7 @@ def topo_sort_dfs(node, visited, sorted_nodes):
239240

240241
def compute_output_shapes(self, model):
241242
sorted_nodes = self.topologically_sorted()
242-
tmp_prototxt = 'deploy.prototxt'
243+
(tmp_handle, tmp_prototxt) = tempfile.mkstemp(suffix=".prototxt")
243244
with open(tmp_prototxt, 'w') as f:
244245
f.write(text_format.MessageToString(model))
245246
self.prototxt = tmp_prototxt
@@ -257,6 +258,7 @@ def compute_output_shapes(self, model):
257258
for node in sorted_nodes:
258259
if node.output_shape is None:
259260
node.output_shape = TensorShape(*NodeKind.compute_output_shape(node))
261+
os.close(tmp_handle)
260262
os.remove(tmp_prototxt)
261263
else:
262264
for node in sorted_nodes:
@@ -435,4 +437,4 @@ def build(self):
435437
continue
436438
node_outputs[output_name] = node
437439
graph.compute_output_shapes(self.model)
438-
return graph
440+
return graph

0 commit comments

Comments
 (0)