Automated merge with ssh://repo.gem5.org/gem5
This commit is contained in:
commit
cfa1d26b43
|
@ -31,7 +31,6 @@
|
||||||
import atexit
|
import atexit
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
import json
|
|
||||||
|
|
||||||
# import the SWIG-wrapped main C++ functions
|
# import the SWIG-wrapped main C++ functions
|
||||||
import internal
|
import internal
|
||||||
|
@ -74,10 +73,14 @@ def instantiate(ckpt_dir=None):
|
||||||
ini_file.close()
|
ini_file.close()
|
||||||
|
|
||||||
if options.json_config:
|
if options.json_config:
|
||||||
json_file = file(os.path.join(options.outdir, options.json_config), 'w')
|
try:
|
||||||
d = root.get_config_as_dict()
|
import json
|
||||||
json.dump(d, json_file, indent=4)
|
json_file = file(os.path.join(options.outdir, options.json_config), 'w')
|
||||||
json_file.close()
|
d = root.get_config_as_dict()
|
||||||
|
json.dump(d, json_file, indent=4)
|
||||||
|
json_file.close()
|
||||||
|
except ImportError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
# Initialize the global statistics
|
# Initialize the global statistics
|
||||||
|
|
Loading…
Reference in a new issue