Rework #2

- Remove auto
- Remove templates / keep parameters const
- Fix comments

Author: AnthonyBarbier

tensorflow/compiler/tf2xla/frontend_attributes_util.cc

@@ -25,7 +25,7 @@ const char kFrontendAttributesAttribute[] = "_XlaFrontendAttributes";
 
 xla::StatusOr<absl::optional<xla::FrontendAttributes>>
 GetFrontendAttributesFromAttrSlice(const AttrSlice& attrs) {
-  auto attr = attrs.Find(kFrontendAttributesAttribute);
+  const AttrValue *attr = attrs.Find(kFrontendAttributesAttribute);
   if (attr == nullptr) {
     return xla::StatusOr<absl::optional<xla::FrontendAttributes>>(
         absl::nullopt);

tensorflow/compiler/xla/client/xla_builder.cc

@@ -2731,24 +2731,23 @@ void XlaBuilder::AddCalledComputation(const XlaComputation& computation,
 
 namespace {
 
-template <typename InstructionType, typename HandleToIndexType,
-          typename InstructionProtoVectorType>
+template <typename InstructionType>
 StatusOr<InstructionType> LookUpInstructionByHandleInternal(
-    HandleToIndexType& handle_to_index,
-    InstructionProtoVectorType& instructions, int64 handle) {
+    const absl::flat_hash_map<int64, int64>& handle_to_index,
+    const std::vector<HloInstructionProto>& instructions, int64 handle) {
   auto it = handle_to_index.find(handle);
   if (it == handle_to_index.end()) {
     return InvalidArgument("No XlaOp with handle %d", handle);
   }
-  return &instructions[it->second];
+  return const_cast<InstructionType>(&instructions.at(it->second));
 }
 
-template <typename InstructionType, typename HandleToIndexType,
-          typename InstructionProtoVectorType, typename OpBuilderType,
+template <typename InstructionType,
+          typename OpBuilderType,
           typename BuilderType, typename OpType>
 StatusOr<InstructionType> LookUpInstructionInternal(
-    HandleToIndexType& handle_to_index,
-    InstructionProtoVectorType& instructions, OpBuilderType op_builder,
+    const absl::flat_hash_map<int64, int64>& handle_to_index,
+    const std::vector<HloInstructionProto>& instructions, OpBuilderType op_builder,
     BuilderType builder, OpType op_handle) {
   if (op_builder == nullptr) {
     return InvalidArgument(

tensorflow/compiler/xla/client/xla_builder.h

@@ -161,10 +161,10 @@ class XlaBuilder {
   // Sets the FrontendAttributes that will be added to all instructions until
   // cleared.
   //
-  // FrontendAttributes are often applied to a serie of XLA HLO instructions.
+  // FrontendAttributes are often applied to a series of XLA HLO instructions.
   // As a result they are set on the Computation Builder and all the
-  // instructions generated via the builder will have the same frontend
-  // attributes attached to them.
+  // instructions generated via the Computation Builder will have the same
+  // frontend attributes attached to them.
   void SetFrontendAttributes(const FrontendAttributes& frontend_attributes) {
     frontend_attributes_ = frontend_attributes;
   }