Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into feature/tensor_type

paddle/fluid/framework/executor_thread_worker.cc

@@ -26,6 +26,7 @@ limitations under the License. */
 #include "paddle/fluid/framework/reader.h"
 #include "paddle/fluid/framework/variable_helper.h"
 #include "paddle/fluid/inference/io.h"
+#include "paddle/fluid/platform/cpu_helper.h"
 #include "paddle/fluid/platform/place.h"
 #include "paddle/fluid/pybind/pybind.h"
 namespace paddle {
@@ -154,6 +155,8 @@ static void print_fetch_var(Scope* scope, const std::string& var_name) {
 }
 
 void ExecutorThreadWorker::TrainFiles() {
+  platform::SetNumThreads(1);
+
   // todo: configurable
   SetDevice();