Browse Source

fix: cache_admin start fail on cpu env

tags/v1.5.0-rc1
jonyguo 4 years ago
parent
commit
6b401d115f
2 changed files with 6 additions and 0 deletions
  1. +2
    -0
      mindspore/ccsrc/pipeline/jit/init.cc
  2. +4
    -0
      mindspore/dataset/engine/cache_admin.py

+ 2
- 0
mindspore/ccsrc/pipeline/jit/init.cc View File

@@ -303,8 +303,10 @@ PYBIND11_MODULE(_c_expression, m) {
mindspore::pipeline::ClearResAtexit();

#ifdef ENABLE_MINDDATA
MS_LOG(WARNING) << "Start releasing dataset handles...";
py::module iterators = py::module::import("mindspore.dataset.engine.iterators");
(void)iterators.attr("_cleanup")();
MS_LOG(WARNING) << "End release dataset handles.";
#endif
}
}});


+ 4
- 0
mindspore/dataset/engine/cache_admin.py View File

@@ -36,4 +36,8 @@ def main():
python_lib_dir = os.path.join(os.path.dirname(mindspore.__file__), "../../..")
os.environ['LD_LIBRARY_PATH'] = python_lib_dir + ":" + os.environ.get('LD_LIBRARY_PATH')

# LD_PRELOAD libnnacl.so
nnacl_lib = os.path.join(os.path.dirname(mindspore.__file__), "lib/libnnacl.so")
os.environ['LD_PRELOAD'] = nnacl_lib

sys.exit(subprocess.call([cache_admin] + sys.argv[1:], shell=False, env=os.environ))

Loading…
Cancel
Save