Bug fixes.

Author: eaplatanios

lib/Sema/DerivedConformanceTensorArrayProtocol.cpp

@@ -411,9 +411,8 @@ deriveBodyTensorArrayProtocol_init(AbstractFunctionDecl *funcDecl) {
   auto *tensorArrayProto = C.getProtocol(
       KnownProtocolKind::TensorArrayProtocol);
   auto initName = DeclName(
-      C, DeclBaseName::createConstructor(),
-      {C.getIdentifier("_owning"), C.getIdentifier("count")});
-  auto *initReq = getProtocolRequirement(tensorArrayProto, initName);
+      C, DeclBaseName::createConstructor(), {C.getIdentifier("_owning")});
+  auto *initReq = getProtocolRequirement(tensorGroupProto, initName);
   auto *tensorHandleCountReq = getProtocolRequirement(
       tensorArrayProto, C.Id_tensorHandleCount);
 

lib/Sema/DerivedConformances.cpp

@@ -344,7 +344,7 @@ ValueDecl *DerivedConformance::getDerivableRequirement(TypeChecker &tc,
       // SWIFT_ENABLE_TENSORFLOW
       // TensorArrayProtocol.init(_owning:count)
       if (argumentNames[0] == ctx.getIdentifier("_owning") && 
-          argumentNames[0] == ctx.getIdentifier("count")) {
+          argumentNames[1] == ctx.getIdentifier("count")) {
         return getRequirement(KnownProtocolKind::TensorArrayProtocol);
       }
     }

test/TensorFlowRuntime/tensor_array_protocol.swift

@@ -17,22 +17,22 @@ struct Simple : TensorGroup {
   var w, b: Tensor<Float>
 }
 
-struct Mixed : TensorArrayProtocol {
+struct Mixed : TensorGroup {
   // Mutable.
   var string: StringTensor
   var float: Tensor<Float>
   // Immutable.
   let int: Tensor<Int32>
 }
 
-struct Nested : TensorArrayProtocol {
+struct Nested : TensorGroup {
   // Immutable.
   let simple: Simple
   // Mutable.
   var mixed: Mixed
 }
 
-struct Generic<T: TensorGroup, U: TensorGroup> : TensorArrayProtocol {
+struct Generic<T: TensorGroup, U: TensorGroup> : TensorGroup {
   var t: T
   var u: U
 }
@@ -157,7 +157,7 @@ TensorArrayProtocolTests.test("GenericUnpackTensorHandles") {
 TensorArrayProtocolTests.test("NestedGenericTensorHandleCount") {
   struct NestedGeneric {
     func function() {
-      struct UltraNested<T: TensorArrayProtocol, V: TensorArrayProtocol> : TensorArrayProtocol {
+      struct UltraNested<T: TensorGroup, V: TensorGroup> : TensorArrayProtocol {
         var a: Generic<T, V>
         var b: Generic<V, T>
       }
@@ -181,7 +181,7 @@ TensorArrayProtocolTests.test("NestedGenericTensorHandleCount") {
 TensorArrayProtocolTests.test("NestedGenericUnpackTensorHandles") {
   struct NestedGeneric {
     func function() {
-      struct UltraNested<T: TensorArrayProtocol, V: TensorArrayProtocol> : TensorArrayProtocol {
+      struct UltraNested<T: TensorGroup, V: TensorGroup> : TensorArrayProtocol {
         var a: Generic<T, V>
         var b: Generic<V, T>
       }