Make code more efficient

paddle/fluid/framework/operator.cc

@@ -57,14 +57,12 @@ static DDim GetDims(const Scope& scope, const std::string& name,
     return DDim({-1});
   }
 
-  if (var->IsInitialized()) {
   if (var->IsType<LoDTensor>()) {
     const LoDTensor& tensor = var->Get<LoDTensor>();
-      if (tensor.IsInitialized()) {
-        return tensor.dims();
-      } else {
+    if (UNLIKELY(tensor.IsInitialized())) {
       return DDim({-1});
     }
+    return tensor.dims();
   } else if (var->IsType<SelectedRows>()) {
     if (get_actual_dim) {
       return var->Get<SelectedRows>().value().dims();
@@ -74,9 +72,6 @@ static DDim GetDims(const Scope& scope, const std::string& name,
   } else {
     return DDim({-1});
   }
-  } else {
-    return DDim({-1});
-  }
 }
 
 static std::string GetDtype(const Scope& scope, const std::string& name) {
@@ -85,23 +80,18 @@ static std::string GetDtype(const Scope& scope, const std::string& name) {
     return "";
   }
 
-  if (var->IsInitialized()) {
   if (var->IsType<LoDTensor>()) {
     const LoDTensor& tensor = var->Get<LoDTensor>();
-      if (tensor.IsInitialized()) {
-        return DataTypeToString(ToDataType(tensor.type()));
-      } else {
+    if (UNLIKELY(!tensor.IsInitialized())) {
       return "";
     }
+    return DataTypeToString(ToDataType(tensor.type()));
   } else if (var->IsType<SelectedRows>()) {
     return DataTypeToString(
         ToDataType(var->Get<SelectedRows>().value().type()));
   } else {
     return "";
   }
-  } else {
-    return "";
-  }
 }
 
 static int GetRowSize(const Scope& scope, const std::string& name) {
@@ -110,11 +100,9 @@ static int GetRowSize(const Scope& scope, const std::string& name) {
     return -1;
   }
 
-  if (var->IsInitialized()) {
   if (var->IsType<SelectedRows>()) {
     return var->Get<SelectedRows>().rows().size();
   }
-  }
 
   return -1;
 }
@@ -127,17 +115,12 @@ static LoD GetLoD(const Scope& scope, const std::string& name) {
     return default_lod;
   }
 
-  if (var->IsInitialized()) {
   if (var->IsType<LoDTensor>()) {
     const LoDTensor& tensor = var->Get<LoDTensor>();
-      if (tensor.IsInitialized()) {
-        return tensor.lod();
-      } else {
-        return default_lod;
-      }
-    } else {
+    if (UNLIKELY(!tensor.IsInitialized())) {
       return default_lod;
     }
+    return tensor.lod();
   } else {
     return default_lod;
   }

paddle/fluid/framework/tensor.h

@@ -82,7 +82,7 @@ class Tensor {
   template <typename T>
   const T* data() const;
 
-  bool IsInitialized() const;
+  inline bool IsInitialized() const;
 
   /**
    * @brief   Return a pointer to mutable memory block.