Merge branch 'develop' into mklml

Author: luotao1

README.md

@@ -62,9 +62,9 @@ Please refer to our [release announcement](https://github.com/PaddlePaddle/Paddl
 ## Installation
 
 It is recommended to check out the
-[Docker installation guide](http://www.paddlepaddle.org/docs/develop/documentation/en/getstarted/build_and_install/docker_install_en.html)
+[Docker installation guide](http://www.paddlepaddle.org/docs/develop/documentation/fluid/en/build_and_install/docker_install_en.html)
 before looking into the
-[build from source guide](http://www.paddlepaddle.org/docs/develop/documentation/en/getstarted/build_and_install/build_from_source_en.html).
+[build from source guide](http://www.paddlepaddle.org/docs/develop/documentation/fluid/en/build_and_install/build_from_source_en.html).
 
 ## Documentation
 

paddle/fluid/framework/details/computation_op_handle.h

@@ -36,7 +36,7 @@ struct ComputationOpHandle : public OpHandleBase {
  protected:
   void RunImpl() override;
 
-  virtual bool NeedWait(VarHandleBase *in_var);
+  bool NeedWait(VarHandleBase *in_var) override;
 
  private:
   std::unique_ptr<OperatorBase> op_;

paddle/fluid/framework/details/fetch_op_handle.h

@@ -42,7 +42,7 @@ struct FetchOpHandle : public OpHandleBase {
  protected:
   void RunImpl() override;
 
-  virtual void WaitInputVarGenerated(const platform::Place &place);
+  void WaitInputVarGenerated(const platform::Place &place) override;
 
  private:
   FeedFetchList *data_;

python/paddle/fluid/tests/unittests/test_network_with_dtype.py

@@ -24,7 +24,7 @@
 
 
 class TestNetWithDtype(unittest.TestCase):
-    def setUp(self):
+    def set_network(self):
         self.dtype = "float64"
         self.init_dtype()
         self.x = fluid.layers.data(name='x', shape=[13], dtype=self.dtype)
@@ -55,12 +55,14 @@ def init_dtype(self):
         pass
 
     def test_cpu(self):
+        self.set_network()
         place = fluid.CPUPlace()
         self.run_net_on_place(place)
 
     def test_gpu(self):
         if not core.is_compiled_with_cuda():
             return
+        self.set_network()
         place = fluid.CUDAPlace(0)
         self.run_net_on_place(place)