Skip to content
This repository was archived by the owner on Jul 1, 2023. It is now read-only.

Canonicalize the attribute list when printing a LazyTensorOperation #223

Merged
merged 3 commits into from
Jun 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions Sources/TensorFlow/Core/LazyTensorOperation.swift
Original file line number Diff line number Diff line change
Expand Up @@ -687,26 +687,24 @@ extension LazyTensor: CustomStringConvertible {

extension LazyTensorOperation: CustomStringConvertible {
public var description: String {
let attrsDesc = attrs.map { (name, value) in "\(name): \(value)" }
let inputsDesc = inputs.map { (input: Input) -> String in
let attrsDesc = attrs.sorted(by: { $0.key < $1.key }).map { "\($0): \($1)" }
let inputsDesc = inputs.map { input -> String in
switch input {
case Input.single(let lazyTensor):
return "\(lazyTensor)"
case Input.list(let lazyTensorList):
do {
let lazyTensors = lazyTensorList.map { "\($0)" }
let lazyTensorsDesc = lazyTensors.joined(separator: ", ")
return "[\(lazyTensorsDesc)]"
}
let lazyTensors = lazyTensorList.map { "\($0)" }
let lazyTensorsDesc = lazyTensors.joined(separator: ", ")
return "[\(lazyTensorsDesc)]"
}
}
var desc = "\(outputName) = \(name)"
if attrs.count > 0 {
if !attrs.isEmpty {
desc += "["
desc += attrsDesc.joined(separator: ", ")
desc += "]"
}
desc += "("
desc += "("
desc += inputsDesc.joined(separator: ", ")
desc += ")"
return desc
Expand Down
5 changes: 1 addition & 4 deletions Tests/TensorFlowTests/LazyTensorOperationTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -166,10 +166,7 @@ final class LazyTensorOperationTests: XCTestCase {
_id: "0", name: "Nop", outputCount: 1)
op0.updateAttribute("b", true)
op0.updateAttribute("s", "hello")
XCTAssert(
(op0.description == "%0 = Nop[b: true, s: \"hello\"]()") ||
(op0.description == "%0 = Nop[s: \"hello\", b: true]()")
)
XCTAssertEqual(op0.description, "%0 = Nop[b: true, s: \"hello\"]()")
}

func testFunctionAttribute() {
Expand Down