You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by GitBox <gi...@apache.org> on 2020/11/19 08:02:18 UTC
[GitHub] [incubator-mxnet] samskalicky opened a new pull request #19564: Save/Load Gluon Blocks & HybridBlocks
samskalicky opened a new pull request #19564:
URL: https://github.com/apache/incubator-mxnet/pull/19564
## Description ##
master branch version of PoC for saving & loading Gluon Blocks & HybridBlocks from #19535
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-mxnet] mxnet-bot commented on pull request #19564: Save/Load Gluon Blocks & HybridBlocks
Posted by GitBox <gi...@apache.org>.
mxnet-bot commented on pull request #19564:
URL: https://github.com/apache/incubator-mxnet/pull/19564#issuecomment-730199516
Hey @samskalicky , Thanks for submitting the PR
All tests are already queued to run once. If tests fail, you can trigger one or more tests again with the following commands:
- To trigger all jobs: @mxnet-bot run ci [all]
- To trigger specific jobs: @mxnet-bot run ci [job1, job2]
***
**CI supported jobs**: [edge, clang, windows-cpu, centos-cpu, miscellaneous, sanity, unix-cpu, centos-gpu, website, unix-gpu, windows-gpu]
***
_Note_:
Only following 3 categories can trigger CI :PR Author, MXNet Committer, Jenkins Admin.
All CI tests must pass before the PR can be merged.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-mxnet] samskalicky commented on a change in pull request #19564: Save/Load Gluon Blocks & HybridBlocks
Posted by GitBox <gi...@apache.org>.
samskalicky commented on a change in pull request #19564:
URL: https://github.com/apache/incubator-mxnet/pull/19564#discussion_r541464747
##########
File path: python/mxnet/gluon/block.py
##########
@@ -571,6 +572,140 @@ def initialize(self, init=initializer.Uniform(), ctx=None, verbose=False,
for v in params.values():
v.initialize(None, ctx, init, force_reinit=force_reinit)
+ def save(self, prefix):
+ """Save the model architecture and parameters to load again later
+
+ Saves the model architecture as a nested dictionary where each Block
+ in the model is a dictionary and its children are sub-dictionaries.
+
+ Each Block is uniquely identified by Block class name and a unique ID.
+ We save each Block's parameter UUID to restore later in order to match
+ the saved parameters.
+
+ Recursively traverses a Block's children in order (since its an
+ OrderedDict) and uses the unique ID to denote that specific Block.
+
+ Assumes that the model is created in an identical order every time.
+ If the model is not able to be recreated deterministically do not
+ use this set of APIs to save/load your model.
+
+ For HybridBlocks, the cached_graph is saved (Symbol & inputs) if
+ it has already been hybridized.
+
+ Parameters
+ ----------
+ prefix : str
+ The prefix to use in filenames for saving this model:
+ <prefix>-model.json and <prefix>-model.params
+ """
+ # create empty model structure
+ model = {}
+ def _save_cached_graphs(blk, index, structure):
+ # create new entry for this block
+ mdl = {}
+ # encode unique name based on block type and ID
+ name = type(blk).__name__.lower()
+ structure[name+str(index[0])] = mdl
+ if isinstance(blk, HybridBlock):
+ if blk._cached_graph:
+ # save in/out formats
+ mdl['in_format'] = blk._in_format
+ mdl['out_format'] = blk._out_format
+ # save cached graph & input symbols
+ syms, out = blk._cached_graph
+ mdl_syms = []
+ for sym in syms:
+ mdl_syms.append(sym.tojson())
+ mdl['inputs'] = mdl_syms
+ mdl['symbol'] = out.tojson()
+ mdl['hybridized'] = True
+ else:
+ mdl['hybridized'] = False
+ # save param uuids
+ pmap = {}
+ mdl['params'] = pmap
+ pnames = list(blk.params.keys())
+ for p in pnames:
+ param = blk.params[p]
+ pmap[p] = param._uuid
+ # recursively save children
+ for child in blk._children.values():
+ index[0] += 1
+ _save_cached_graphs(child(), index, mdl)
+ # save top-level block
+ index = [0]
Review comment:
because we need to increment it and pass it around, and integers in python are immutable. so instead we pass around a list with an integer in it to get a "integer pointer" kinda thing...im up for suggestions on other ways to do this.
we're recursively passing it to `_save_cached_graphs` where it gets incremented and shared around so each block gets a unique ID
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-mxnet] samskalicky commented on a change in pull request #19564: Save/Load Gluon Blocks & HybridBlocks
Posted by GitBox <gi...@apache.org>.
samskalicky commented on a change in pull request #19564:
URL: https://github.com/apache/incubator-mxnet/pull/19564#discussion_r541464747
##########
File path: python/mxnet/gluon/block.py
##########
@@ -571,6 +572,140 @@ def initialize(self, init=initializer.Uniform(), ctx=None, verbose=False,
for v in params.values():
v.initialize(None, ctx, init, force_reinit=force_reinit)
+ def save(self, prefix):
+ """Save the model architecture and parameters to load again later
+
+ Saves the model architecture as a nested dictionary where each Block
+ in the model is a dictionary and its children are sub-dictionaries.
+
+ Each Block is uniquely identified by Block class name and a unique ID.
+ We save each Block's parameter UUID to restore later in order to match
+ the saved parameters.
+
+ Recursively traverses a Block's children in order (since its an
+ OrderedDict) and uses the unique ID to denote that specific Block.
+
+ Assumes that the model is created in an identical order every time.
+ If the model is not able to be recreated deterministically do not
+ use this set of APIs to save/load your model.
+
+ For HybridBlocks, the cached_graph is saved (Symbol & inputs) if
+ it has already been hybridized.
+
+ Parameters
+ ----------
+ prefix : str
+ The prefix to use in filenames for saving this model:
+ <prefix>-model.json and <prefix>-model.params
+ """
+ # create empty model structure
+ model = {}
+ def _save_cached_graphs(blk, index, structure):
+ # create new entry for this block
+ mdl = {}
+ # encode unique name based on block type and ID
+ name = type(blk).__name__.lower()
+ structure[name+str(index[0])] = mdl
+ if isinstance(blk, HybridBlock):
+ if blk._cached_graph:
+ # save in/out formats
+ mdl['in_format'] = blk._in_format
+ mdl['out_format'] = blk._out_format
+ # save cached graph & input symbols
+ syms, out = blk._cached_graph
+ mdl_syms = []
+ for sym in syms:
+ mdl_syms.append(sym.tojson())
+ mdl['inputs'] = mdl_syms
+ mdl['symbol'] = out.tojson()
+ mdl['hybridized'] = True
+ else:
+ mdl['hybridized'] = False
+ # save param uuids
+ pmap = {}
+ mdl['params'] = pmap
+ pnames = list(blk.params.keys())
+ for p in pnames:
+ param = blk.params[p]
+ pmap[p] = param._uuid
+ # recursively save children
+ for child in blk._children.values():
+ index[0] += 1
+ _save_cached_graphs(child(), index, mdl)
+ # save top-level block
+ index = [0]
Review comment:
because we need to increment it and pass it around, and integers in python are immutable. so instead we pass around a list with an integer in it to get a "integer pointer" kinda thing...im up for suggestions on other ways to do this.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-mxnet] leezu commented on a change in pull request #19564: Save/Load Gluon Blocks & HybridBlocks
Posted by GitBox <gi...@apache.org>.
leezu commented on a change in pull request #19564:
URL: https://github.com/apache/incubator-mxnet/pull/19564#discussion_r540550518
##########
File path: python/mxnet/gluon/block.py
##########
@@ -571,6 +572,140 @@ def initialize(self, init=initializer.Uniform(), ctx=None, verbose=False,
for v in params.values():
v.initialize(None, ctx, init, force_reinit=force_reinit)
+ def save(self, prefix):
+ """Save the model architecture and parameters to load again later
+
+ Saves the model architecture as a nested dictionary where each Block
+ in the model is a dictionary and its children are sub-dictionaries.
+
+ Each Block is uniquely identified by Block class name and a unique ID.
+ We save each Block's parameter UUID to restore later in order to match
+ the saved parameters.
+
+ Recursively traverses a Block's children in order (since its an
+ OrderedDict) and uses the unique ID to denote that specific Block.
+
+ Assumes that the model is created in an identical order every time.
+ If the model is not able to be recreated deterministically do not
+ use this set of APIs to save/load your model.
+
+ For HybridBlocks, the cached_graph is saved (Symbol & inputs) if
+ it has already been hybridized.
+
+ Parameters
+ ----------
+ prefix : str
+ The prefix to use in filenames for saving this model:
+ <prefix>-model.json and <prefix>-model.params
+ """
+ # create empty model structure
+ model = {}
+ def _save_cached_graphs(blk, index, structure):
+ # create new entry for this block
+ mdl = {}
+ # encode unique name based on block type and ID
+ name = type(blk).__name__.lower()
+ structure[name+str(index[0])] = mdl
+ if isinstance(blk, HybridBlock):
+ if blk._cached_graph:
+ # save in/out formats
+ mdl['in_format'] = blk._in_format
+ mdl['out_format'] = blk._out_format
+ # save cached graph & input symbols
+ syms, out = blk._cached_graph
+ mdl_syms = []
+ for sym in syms:
+ mdl_syms.append(sym.tojson())
+ mdl['inputs'] = mdl_syms
+ mdl['symbol'] = out.tojson()
+ mdl['hybridized'] = True
+ else:
+ mdl['hybridized'] = False
+ # save param uuids
+ pmap = {}
+ mdl['params'] = pmap
+ pnames = list(blk.params.keys())
+ for p in pnames:
+ param = blk.params[p]
+ pmap[p] = param._uuid
+ # recursively save children
+ for child in blk._children.values():
+ index[0] += 1
+ _save_cached_graphs(child(), index, mdl)
+ # save top-level block
+ index = [0]
Review comment:
Why is index a list?
##########
File path: python/mxnet/gluon/block.py
##########
@@ -571,6 +572,140 @@ def initialize(self, init=initializer.Uniform(), ctx=None, verbose=False,
for v in params.values():
v.initialize(None, ctx, init, force_reinit=force_reinit)
+ def save(self, prefix):
+ """Save the model architecture and parameters to load again later
+
+ Saves the model architecture as a nested dictionary where each Block
+ in the model is a dictionary and its children are sub-dictionaries.
+
+ Each Block is uniquely identified by Block class name and a unique ID.
+ We save each Block's parameter UUID to restore later in order to match
+ the saved parameters.
+
+ Recursively traverses a Block's children in order (since its an
+ OrderedDict) and uses the unique ID to denote that specific Block.
+
+ Assumes that the model is created in an identical order every time.
+ If the model is not able to be recreated deterministically do not
+ use this set of APIs to save/load your model.
+
+ For HybridBlocks, the cached_graph is saved (Symbol & inputs) if
+ it has already been hybridized.
+
+ Parameters
+ ----------
+ prefix : str
+ The prefix to use in filenames for saving this model:
+ <prefix>-model.json and <prefix>-model.params
+ """
+ # create empty model structure
+ model = {}
+ def _save_cached_graphs(blk, index, structure):
+ # create new entry for this block
+ mdl = {}
+ # encode unique name based on block type and ID
+ name = type(blk).__name__.lower()
+ structure[name+str(index[0])] = mdl
+ if isinstance(blk, HybridBlock):
+ if blk._cached_graph:
+ # save in/out formats
+ mdl['in_format'] = blk._in_format
+ mdl['out_format'] = blk._out_format
+ # save cached graph & input symbols
+ syms, out = blk._cached_graph
+ mdl_syms = []
+ for sym in syms:
+ mdl_syms.append(sym.tojson())
+ mdl['inputs'] = mdl_syms
+ mdl['symbol'] = out.tojson()
+ mdl['hybridized'] = True
+ else:
+ mdl['hybridized'] = False
+ # save param uuids
+ pmap = {}
+ mdl['params'] = pmap
+ pnames = list(blk.params.keys())
+ for p in pnames:
+ param = blk.params[p]
+ pmap[p] = param._uuid
+ # recursively save children
+ for child in blk._children.values():
+ index[0] += 1
+ _save_cached_graphs(child(), index, mdl)
+ # save top-level block
+ index = [0]
+ _save_cached_graphs(self, index, model)
+ # save model
+ fp = open(prefix+'-model.json', 'w')
+ json.dump(model, fp)
+ fp.close()
Review comment:
`with open()` is preferred in Python
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-mxnet] leezu merged pull request #19564: Save/Load Gluon Blocks & HybridBlocks
Posted by GitBox <gi...@apache.org>.
leezu merged pull request #19564:
URL: https://github.com/apache/incubator-mxnet/pull/19564
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-mxnet] samskalicky commented on a change in pull request #19564: Save/Load Gluon Blocks & HybridBlocks
Posted by GitBox <gi...@apache.org>.
samskalicky commented on a change in pull request #19564:
URL: https://github.com/apache/incubator-mxnet/pull/19564#discussion_r541882753
##########
File path: python/mxnet/gluon/block.py
##########
@@ -571,6 +572,140 @@ def initialize(self, init=initializer.Uniform(), ctx=None, verbose=False,
for v in params.values():
v.initialize(None, ctx, init, force_reinit=force_reinit)
+ def save(self, prefix):
+ """Save the model architecture and parameters to load again later
+
+ Saves the model architecture as a nested dictionary where each Block
+ in the model is a dictionary and its children are sub-dictionaries.
+
+ Each Block is uniquely identified by Block class name and a unique ID.
+ We save each Block's parameter UUID to restore later in order to match
+ the saved parameters.
+
+ Recursively traverses a Block's children in order (since its an
+ OrderedDict) and uses the unique ID to denote that specific Block.
+
+ Assumes that the model is created in an identical order every time.
+ If the model is not able to be recreated deterministically do not
+ use this set of APIs to save/load your model.
+
+ For HybridBlocks, the cached_graph is saved (Symbol & inputs) if
+ it has already been hybridized.
+
+ Parameters
+ ----------
+ prefix : str
+ The prefix to use in filenames for saving this model:
+ <prefix>-model.json and <prefix>-model.params
+ """
+ # create empty model structure
+ model = {}
+ def _save_cached_graphs(blk, index, structure):
+ # create new entry for this block
+ mdl = {}
+ # encode unique name based on block type and ID
+ name = type(blk).__name__.lower()
+ structure[name+str(index[0])] = mdl
+ if isinstance(blk, HybridBlock):
+ if blk._cached_graph:
+ # save in/out formats
+ mdl['in_format'] = blk._in_format
+ mdl['out_format'] = blk._out_format
+ # save cached graph & input symbols
+ syms, out = blk._cached_graph
+ mdl_syms = []
+ for sym in syms:
+ mdl_syms.append(sym.tojson())
+ mdl['inputs'] = mdl_syms
+ mdl['symbol'] = out.tojson()
+ mdl['hybridized'] = True
+ else:
+ mdl['hybridized'] = False
+ # save param uuids
+ pmap = {}
+ mdl['params'] = pmap
+ pnames = list(blk.params.keys())
+ for p in pnames:
+ param = blk.params[p]
+ pmap[p] = param._uuid
+ # recursively save children
+ for child in blk._children.values():
+ index[0] += 1
+ _save_cached_graphs(child(), index, mdl)
+ # save top-level block
+ index = [0]
Review comment:
I changed it so now we pass around the int value instead of a list (holding an int pointer). I think this is more Pythonic.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-mxnet] samskalicky commented on a change in pull request #19564: Save/Load Gluon Blocks & HybridBlocks
Posted by GitBox <gi...@apache.org>.
samskalicky commented on a change in pull request #19564:
URL: https://github.com/apache/incubator-mxnet/pull/19564#discussion_r541464454
##########
File path: python/mxnet/gluon/block.py
##########
@@ -571,6 +572,140 @@ def initialize(self, init=initializer.Uniform(), ctx=None, verbose=False,
for v in params.values():
v.initialize(None, ctx, init, force_reinit=force_reinit)
+ def save(self, prefix):
+ """Save the model architecture and parameters to load again later
+
+ Saves the model architecture as a nested dictionary where each Block
+ in the model is a dictionary and its children are sub-dictionaries.
+
+ Each Block is uniquely identified by Block class name and a unique ID.
+ We save each Block's parameter UUID to restore later in order to match
+ the saved parameters.
+
+ Recursively traverses a Block's children in order (since its an
+ OrderedDict) and uses the unique ID to denote that specific Block.
+
+ Assumes that the model is created in an identical order every time.
+ If the model is not able to be recreated deterministically do not
+ use this set of APIs to save/load your model.
+
+ For HybridBlocks, the cached_graph is saved (Symbol & inputs) if
+ it has already been hybridized.
+
+ Parameters
+ ----------
+ prefix : str
+ The prefix to use in filenames for saving this model:
+ <prefix>-model.json and <prefix>-model.params
+ """
+ # create empty model structure
+ model = {}
+ def _save_cached_graphs(blk, index, structure):
+ # create new entry for this block
+ mdl = {}
+ # encode unique name based on block type and ID
+ name = type(blk).__name__.lower()
+ structure[name+str(index[0])] = mdl
+ if isinstance(blk, HybridBlock):
+ if blk._cached_graph:
+ # save in/out formats
+ mdl['in_format'] = blk._in_format
+ mdl['out_format'] = blk._out_format
+ # save cached graph & input symbols
+ syms, out = blk._cached_graph
+ mdl_syms = []
+ for sym in syms:
+ mdl_syms.append(sym.tojson())
+ mdl['inputs'] = mdl_syms
+ mdl['symbol'] = out.tojson()
+ mdl['hybridized'] = True
+ else:
+ mdl['hybridized'] = False
+ # save param uuids
+ pmap = {}
+ mdl['params'] = pmap
+ pnames = list(blk.params.keys())
+ for p in pnames:
+ param = blk.params[p]
+ pmap[p] = param._uuid
+ # recursively save children
+ for child in blk._children.values():
+ index[0] += 1
+ _save_cached_graphs(child(), index, mdl)
+ # save top-level block
+ index = [0]
+ _save_cached_graphs(self, index, model)
+ # save model
+ fp = open(prefix+'-model.json', 'w')
+ json.dump(model, fp)
+ fp.close()
Review comment:
will make this change, thanks!
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-mxnet] leezu commented on a change in pull request #19564: Save/Load Gluon Blocks & HybridBlocks
Posted by GitBox <gi...@apache.org>.
leezu commented on a change in pull request #19564:
URL: https://github.com/apache/incubator-mxnet/pull/19564#discussion_r542656432
##########
File path: python/mxnet/gluon/block.py
##########
@@ -571,6 +572,140 @@ def initialize(self, init=initializer.Uniform(), ctx=None, verbose=False,
for v in params.values():
v.initialize(None, ctx, init, force_reinit=force_reinit)
+ def save(self, prefix):
+ """Save the model architecture and parameters to load again later
+
+ Saves the model architecture as a nested dictionary where each Block
+ in the model is a dictionary and its children are sub-dictionaries.
+
+ Each Block is uniquely identified by Block class name and a unique ID.
+ We save each Block's parameter UUID to restore later in order to match
+ the saved parameters.
+
+ Recursively traverses a Block's children in order (since its an
+ OrderedDict) and uses the unique ID to denote that specific Block.
+
+ Assumes that the model is created in an identical order every time.
+ If the model is not able to be recreated deterministically do not
+ use this set of APIs to save/load your model.
+
+ For HybridBlocks, the cached_graph is saved (Symbol & inputs) if
+ it has already been hybridized.
+
+ Parameters
+ ----------
+ prefix : str
+ The prefix to use in filenames for saving this model:
+ <prefix>-model.json and <prefix>-model.params
+ """
+ # create empty model structure
+ model = {}
+ def _save_cached_graphs(blk, index, structure):
+ # create new entry for this block
+ mdl = {}
+ # encode unique name based on block type and ID
+ name = type(blk).__name__.lower()
+ structure[name+str(index[0])] = mdl
+ if isinstance(blk, HybridBlock):
+ if blk._cached_graph:
+ # save in/out formats
+ mdl['in_format'] = blk._in_format
+ mdl['out_format'] = blk._out_format
+ # save cached graph & input symbols
+ syms, out = blk._cached_graph
+ mdl_syms = []
+ for sym in syms:
+ mdl_syms.append(sym.tojson())
+ mdl['inputs'] = mdl_syms
+ mdl['symbol'] = out.tojson()
+ mdl['hybridized'] = True
+ else:
+ mdl['hybridized'] = False
+ # save param uuids
+ pmap = {}
+ mdl['params'] = pmap
+ pnames = list(blk.params.keys())
+ for p in pnames:
+ param = blk.params[p]
+ pmap[p] = param._uuid
+ # recursively save children
+ for child in blk._children.values():
+ index[0] += 1
+ _save_cached_graphs(child(), index, mdl)
+ # save top-level block
+ index = [0]
Review comment:
Thanks for elaborating and finding a pythonic solution
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-mxnet] samskalicky commented on a change in pull request #19564: Save/Load Gluon Blocks & HybridBlocks
Posted by GitBox <gi...@apache.org>.
samskalicky commented on a change in pull request #19564:
URL: https://github.com/apache/incubator-mxnet/pull/19564#discussion_r528052115
##########
File path: tests/python/unittest/test_gluon_save.py
##########
@@ -0,0 +1,62 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import mxnet as mx
+
+def test_save():
+ class MyBlock(mx.gluon.Block):
+ def __init__(self, **kwargs):
+ super(MyBlock, self).__init__(**kwargs)
+ self.layers = []
+ def add(self, block):
+ self.layers.append(block)
+ self.register_child(block)
+ def forward(self, x, *args):
+ out = (x,) + args
+ for block in self._children.values():
+ out = block()(*out)
+ return out
+
+ def createNet():
+ inside = MyBlock()
+ dense = mx.gluon.nn.Dense(10)
+ inside.add(dense)
+ net = MyBlock()
+ net.add(inside)
+ net.add(mx.gluon.nn.Dense(10))
+ return net
+
+ # create and initialize model
+ net1 = createNet()
+ net1.initialize()
+ # hybridize (the hybridizeable blocks, ie. the Dense layers)
+ net1.hybridize()
+ x = mx.nd.zeros((1,10))
+ out1 = net1(x)
+
+ # save hybridized model
+ net1.save('MyModel')
+
+ # create a new model, uninitialized
+ net2 = createNet()
+ # reload hybridized model
+ net2.load('MyModel')
+ # run inference again
+ out2 = net2(x)
+ mx.test_utils.assert_almost_equal(out1.asnumpy(), out2.asnumpy())
+
+test_save()
Review comment:
need to remove this, leftover from testing
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-mxnet] samskalicky commented on a change in pull request #19564: Save/Load Gluon Blocks & HybridBlocks
Posted by GitBox <gi...@apache.org>.
samskalicky commented on a change in pull request #19564:
URL: https://github.com/apache/incubator-mxnet/pull/19564#discussion_r541477065
##########
File path: python/mxnet/gluon/block.py
##########
@@ -571,6 +572,140 @@ def initialize(self, init=initializer.Uniform(), ctx=None, verbose=False,
for v in params.values():
v.initialize(None, ctx, init, force_reinit=force_reinit)
+ def save(self, prefix):
+ """Save the model architecture and parameters to load again later
+
+ Saves the model architecture as a nested dictionary where each Block
+ in the model is a dictionary and its children are sub-dictionaries.
+
+ Each Block is uniquely identified by Block class name and a unique ID.
+ We save each Block's parameter UUID to restore later in order to match
+ the saved parameters.
+
+ Recursively traverses a Block's children in order (since its an
+ OrderedDict) and uses the unique ID to denote that specific Block.
+
+ Assumes that the model is created in an identical order every time.
+ If the model is not able to be recreated deterministically do not
+ use this set of APIs to save/load your model.
+
+ For HybridBlocks, the cached_graph is saved (Symbol & inputs) if
+ it has already been hybridized.
+
+ Parameters
+ ----------
+ prefix : str
+ The prefix to use in filenames for saving this model:
+ <prefix>-model.json and <prefix>-model.params
+ """
+ # create empty model structure
+ model = {}
+ def _save_cached_graphs(blk, index, structure):
+ # create new entry for this block
+ mdl = {}
+ # encode unique name based on block type and ID
+ name = type(blk).__name__.lower()
+ structure[name+str(index[0])] = mdl
+ if isinstance(blk, HybridBlock):
+ if blk._cached_graph:
+ # save in/out formats
+ mdl['in_format'] = blk._in_format
+ mdl['out_format'] = blk._out_format
+ # save cached graph & input symbols
+ syms, out = blk._cached_graph
+ mdl_syms = []
+ for sym in syms:
+ mdl_syms.append(sym.tojson())
+ mdl['inputs'] = mdl_syms
+ mdl['symbol'] = out.tojson()
+ mdl['hybridized'] = True
+ else:
+ mdl['hybridized'] = False
+ # save param uuids
+ pmap = {}
+ mdl['params'] = pmap
+ pnames = list(blk.params.keys())
+ for p in pnames:
+ param = blk.params[p]
+ pmap[p] = param._uuid
+ # recursively save children
+ for child in blk._children.values():
+ index[0] += 1
+ _save_cached_graphs(child(), index, mdl)
+ # save top-level block
+ index = [0]
+ _save_cached_graphs(self, index, model)
+ # save model
+ fp = open(prefix+'-model.json', 'w')
+ json.dump(model, fp)
+ fp.close()
Review comment:
done
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-mxnet] samskalicky commented on a change in pull request #19564: Save/Load Gluon Blocks & HybridBlocks
Posted by GitBox <gi...@apache.org>.
samskalicky commented on a change in pull request #19564:
URL: https://github.com/apache/incubator-mxnet/pull/19564#discussion_r541477090
##########
File path: tests/python/unittest/test_gluon_save.py
##########
@@ -0,0 +1,62 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import mxnet as mx
+
+def test_save():
+ class MyBlock(mx.gluon.Block):
+ def __init__(self, **kwargs):
+ super(MyBlock, self).__init__(**kwargs)
+ self.layers = []
+ def add(self, block):
+ self.layers.append(block)
+ self.register_child(block)
+ def forward(self, x, *args):
+ out = (x,) + args
+ for block in self._children.values():
+ out = block()(*out)
+ return out
+
+ def createNet():
+ inside = MyBlock()
+ dense = mx.gluon.nn.Dense(10)
+ inside.add(dense)
+ net = MyBlock()
+ net.add(inside)
+ net.add(mx.gluon.nn.Dense(10))
+ return net
+
+ # create and initialize model
+ net1 = createNet()
+ net1.initialize()
+ # hybridize (the hybridizeable blocks, ie. the Dense layers)
+ net1.hybridize()
+ x = mx.nd.zeros((1,10))
+ out1 = net1(x)
+
+ # save hybridized model
+ net1.save('MyModel')
+
+ # create a new model, uninitialized
+ net2 = createNet()
+ # reload hybridized model
+ net2.load('MyModel')
+ # run inference again
+ out2 = net2(x)
+ mx.test_utils.assert_almost_equal(out1.asnumpy(), out2.asnumpy())
+
+test_save()
Review comment:
done
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-mxnet] samskalicky commented on a change in pull request #19564: Save/Load Gluon Blocks & HybridBlocks
Posted by GitBox <gi...@apache.org>.
samskalicky commented on a change in pull request #19564:
URL: https://github.com/apache/incubator-mxnet/pull/19564#discussion_r541476527
##########
File path: python/mxnet/gluon/block.py
##########
@@ -571,6 +572,140 @@ def initialize(self, init=initializer.Uniform(), ctx=None, verbose=False,
for v in params.values():
v.initialize(None, ctx, init, force_reinit=force_reinit)
+ def save(self, prefix):
+ """Save the model architecture and parameters to load again later
+
+ Saves the model architecture as a nested dictionary where each Block
+ in the model is a dictionary and its children are sub-dictionaries.
+
+ Each Block is uniquely identified by Block class name and a unique ID.
+ We save each Block's parameter UUID to restore later in order to match
+ the saved parameters.
+
+ Recursively traverses a Block's children in order (since its an
+ OrderedDict) and uses the unique ID to denote that specific Block.
+
+ Assumes that the model is created in an identical order every time.
+ If the model is not able to be recreated deterministically do not
+ use this set of APIs to save/load your model.
+
+ For HybridBlocks, the cached_graph is saved (Symbol & inputs) if
+ it has already been hybridized.
+
+ Parameters
+ ----------
+ prefix : str
+ The prefix to use in filenames for saving this model:
+ <prefix>-model.json and <prefix>-model.params
+ """
+ # create empty model structure
+ model = {}
+ def _save_cached_graphs(blk, index, structure):
+ # create new entry for this block
+ mdl = {}
+ # encode unique name based on block type and ID
+ name = type(blk).__name__.lower()
+ structure[name+str(index[0])] = mdl
+ if isinstance(blk, HybridBlock):
+ if blk._cached_graph:
+ # save in/out formats
+ mdl['in_format'] = blk._in_format
+ mdl['out_format'] = blk._out_format
+ # save cached graph & input symbols
+ syms, out = blk._cached_graph
+ mdl_syms = []
+ for sym in syms:
+ mdl_syms.append(sym.tojson())
+ mdl['inputs'] = mdl_syms
+ mdl['symbol'] = out.tojson()
+ mdl['hybridized'] = True
+ else:
+ mdl['hybridized'] = False
+ # save param uuids
+ pmap = {}
+ mdl['params'] = pmap
+ pnames = list(blk.params.keys())
+ for p in pnames:
+ param = blk.params[p]
+ pmap[p] = param._uuid
+ # recursively save children
+ for child in blk._children.values():
+ index[0] += 1
+ _save_cached_graphs(child(), index, mdl)
+ # save top-level block
+ index = [0]
Review comment:
I guess we could change it so that `_save_cached_graphs` returns the latest/updated index and then it doesnt have to be a list, preference?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org