Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def default(caffe_parameters, inputs_info, cntk_layer_def, tensor_check=True):

Args:
caffe_parameters (:class:`caffe.Parameters`): the parameters of Caffe
inputs_info ('class':`cntk.contrib.crosstalkcaffe.unimodel.cntkmodel.CntkTensorDefinition`):
inputs_info (class:`cntk.contrib.crosstalkcaffe.unimodel.cntkmodel.CntkTensorDefinition`):
The input information of current layer
cntk_layer_def ('class':`cntk.contrib.crosstalkcaffe.unimodel.cntkmodel.CntkLayersDefinition`):
The converted definition of CNTK layers
Expand Down Expand Up @@ -359,7 +359,7 @@ def load_model(self, global_conf):
Args:
global_conf (:class:`~cntk.contrib.crosstalkcaffe.utils.globalconf.GlobalConf`):
The global configurations

Return:
None
'''
Expand All @@ -376,7 +376,7 @@ def load_model(self, global_conf):
self._raw_net = caffe_impl.net()
self._caffe_pb2 = caffe_impl.caffepb
with open(self._source_solver.model_path, 'r') as net_file:
text_format.Merge(net_file.read(), self._raw_net)
text_format.Merge(net_file.read(), self._raw_net)
self._uni_model.model_name = os.path.splitext(self._source_solver.model_path)[0]

self._adapt_data_provider()
Expand All @@ -396,10 +396,10 @@ def load_model(self, global_conf):
def adapt_solver(self):
'''
Adapt Caffe solver into CNTK format

Args:
None

Return:
None
'''
Expand Down