commit 2a8d5a132c70cb0c75edcd719b0ae5ba6102cc5b
author Yinghai Lu <yinghai@fb.com> Fri Jul 19 16:46:17 2019 -0700
committer Facebook Github Bot <facebook-github-bot@users.noreply.github.com> Fri Jul 19 16:49:50 2019 -0700
tree 2e112b66c22e144c1caf6823b22fdc0a6e54838a
parent 79c4f83fbec5d4201525d3705b626bccd0e7f17e

Fix workspace destruction ordering (#23096)

Summary:
Pull Request resolved: https://github.com/pytorch/pytorch/pull/23096

nets can have states that depends on the rest of the state in the Workspace. Hence, they should be destructed first.

Reviewed By: ajyu

Differential Revision: D16382987

fbshipit-source-id: 3fd030ba206e2d0e897abb9e31c95bdaeb9482b7

caffe2/core/workspace.h

diff --git a/caffe2/core/workspace.h b/caffe2/core/workspace.h
index c54e947..c17c92a 100644
--- a/caffe2/core/workspace.h
+++ b/caffe2/core/workspace.h
@@ -319,7 +319,6 @@
   static std::shared_ptr<Bookkeeper> bookkeeper();
 
   BlobMap blob_map_;
-  NetMap net_map_;
   const string root_folder_;
   const Workspace* shared_;
   std::unordered_map<string, std::pair<const Workspace*, string>>
@@ -327,6 +326,7 @@
   std::unique_ptr<ThreadPool> thread_pool_;
   std::mutex thread_pool_creation_mutex_;
   std::shared_ptr<Bookkeeper> bookkeeper_;
+  NetMap net_map_;
 
   C10_DISABLE_COPY_AND_ASSIGN(Workspace);
 };