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

Commit e6f2e04

Browse files
authored
Convert enums to camelcase. (#256)
1 parent ced1e68 commit e6f2e04

File tree

2 files changed

+56
-56
lines changed

2 files changed

+56
-56
lines changed

Sources/TensorFlow/Core/LazyTensorOperation.swift

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -140,22 +140,22 @@ class LazyTensorOperation: TensorOperation {
140140
}
141141

142142
enum Attribute {
143-
case BoolValue(Bool)
144-
case IntValue(Int)
145-
case FloatValue(Float)
146-
case DoubleValue(Double)
147-
case StringValue(String)
148-
case BoolArray([Bool])
149-
case IntArray([Int])
150-
case FloatArray([Float])
151-
case DoubleArray([Double])
152-
case StringArray([String])
153-
case ConstTensor(TFETensorHandle)
154-
case TensorDataTypeValue(TensorDataType)
155-
case TensorFunctionPointer(_TensorFunctionPointer)
156-
case TensorDataTypeArray([TensorDataType])
157-
case OptionalTensorShape(TensorShape?)
158-
case OptionalTensorShapeArray([TensorShape?])
143+
case boolValue(Bool)
144+
case intValue(Int)
145+
case floatValue(Float)
146+
case doubleValue(Double)
147+
case stringValue(String)
148+
case boolArray([Bool])
149+
case intArray([Int])
150+
case floatArray([Float])
151+
case doubleArray([Double])
152+
case stringArray([String])
153+
case constTensor(TFETensorHandle)
154+
case tensorDataTypeValue(TensorDataType)
155+
case tensorFunctionPointer(_TensorFunctionPointer)
156+
case tensorDataTypeArray([TensorDataType])
157+
case optionalTensorShape(TensorShape?)
158+
case optionalTensorShapeArray([TensorShape?])
159159
}
160160

161161
let name: String
@@ -228,49 +228,49 @@ class LazyTensorOperation: TensorOperation {
228228
}
229229

230230
func updateAttribute(_ name: String, _ value: Bool) {
231-
attributes[name] = Attribute.BoolValue(value)
231+
attributes[name] = Attribute.boolValue(value)
232232
}
233233
func updateAttribute(_ name: String, _ value: Int) {
234-
attributes[name] = Attribute.IntValue(value)
234+
attributes[name] = Attribute.intValue(value)
235235
}
236236
func updateAttribute(_ name: String, _ value: Int32) {
237-
attributes[name] = Attribute.IntValue(Int(value))
237+
attributes[name] = Attribute.intValue(Int(value))
238238
}
239239
func updateAttribute(_ name: String, _ value: Int64) {
240-
attributes[name] = Attribute.IntValue(Int(value))
240+
attributes[name] = Attribute.intValue(Int(value))
241241
}
242242
func updateAttribute(_ name: String, _ value: Float) {
243-
attributes[name] = Attribute.FloatValue(value)
243+
attributes[name] = Attribute.floatValue(value)
244244
}
245245
func updateAttribute(_ name: String, _ value: Double) {
246-
attributes[name] = Attribute.DoubleValue(value)
246+
attributes[name] = Attribute.doubleValue(value)
247247
}
248248
func updateAttribute(_ name: String, _ value: String) {
249-
attributes[name] = Attribute.StringValue(value)
249+
attributes[name] = Attribute.stringValue(value)
250250
}
251251
func updateAttribute(_ name: String, _ value: [Bool]) {
252-
attributes[name] = Attribute.BoolArray(value)
252+
attributes[name] = Attribute.boolArray(value)
253253
}
254254
func updateAttribute(_ name: String, _ value: [Int]) {
255-
attributes[name] = Attribute.IntArray(value)
255+
attributes[name] = Attribute.intArray(value)
256256
}
257257
func updateAttribute(_ name: String, _ value: [Int32]) {
258-
attributes[name] = Attribute.IntArray(value.map { Int($0) })
258+
attributes[name] = Attribute.intArray(value.map { Int($0) })
259259
}
260260
func updateAttribute(_ name: String, _ value: [Int64]) {
261-
attributes[name] = Attribute.IntArray(value.map { Int($0) })
261+
attributes[name] = Attribute.intArray(value.map { Int($0) })
262262
}
263263
func updateAttribute(_ name: String, _ value: [Float]) {
264-
attributes[name] = Attribute.FloatArray(value)
264+
attributes[name] = Attribute.floatArray(value)
265265
}
266266
func updateAttribute(_ name: String, _ value: [Double]) {
267-
attributes[name] = Attribute.DoubleArray(value)
267+
attributes[name] = Attribute.doubleArray(value)
268268
}
269269
func updateAttribute(_ name: String, _ value: [String]) {
270-
attributes[name] = Attribute.StringArray(value)
270+
attributes[name] = Attribute.stringArray(value)
271271
}
272272
func updateAttribute(_ name: String, _ value: _TensorFunctionPointer) {
273-
attributes[name] = Attribute.TensorFunctionPointer(value)
273+
attributes[name] = Attribute.tensorFunctionPointer(value)
274274
}
275275
}
276276

@@ -317,22 +317,22 @@ extension LazyTensorOperation: TFTensorOperation {
317317
}
318318

319319
func updateAttribute(_ name: String, _ value: TensorDataType) {
320-
attributes[name] = Attribute.TensorDataTypeValue(value)
320+
attributes[name] = Attribute.tensorDataTypeValue(value)
321321
}
322322
func updateAttribute(_ name: String, _ value: TensorShape) {
323-
attributes[name] = Attribute.OptionalTensorShape(value)
323+
attributes[name] = Attribute.optionalTensorShape(value)
324324
}
325325
func updateAttribute(_ name: String, _ value: TensorShape?) {
326-
attributes[name] = Attribute.OptionalTensorShape(value)
326+
attributes[name] = Attribute.optionalTensorShape(value)
327327
}
328328
func updateAttribute(_ name: String, _ value: [TensorDataType]) {
329-
attributes[name] = Attribute.TensorDataTypeArray(value)
329+
attributes[name] = Attribute.tensorDataTypeArray(value)
330330
}
331331
func updateAttribute(_ name: String, _ value: [TensorShape]) {
332-
attributes[name] = Attribute.OptionalTensorShapeArray(value)
332+
attributes[name] = Attribute.optionalTensorShapeArray(value)
333333
}
334334
func updateAttribute(_ name: String, _ value: [TensorShape?]) {
335-
attributes[name] = Attribute.OptionalTensorShapeArray(value)
335+
attributes[name] = Attribute.optionalTensorShapeArray(value)
336336
}
337337
func updateAttribute<In: TensorGroup, Out: TensorGroup>(
338338
_ name: String, _ value: (In) -> Out) {
@@ -649,25 +649,25 @@ extension TFETensorHandle {
649649
extension LazyTensorOperation.Attribute: CustomStringConvertible {
650650
var description: String {
651651
switch self {
652-
case .BoolValue(let v): return "\(v)"
653-
case .IntValue(let v): return "Int(\(v))"
654-
case .FloatValue(let v): return "Float(\(v))"
655-
case .DoubleValue(let v): return "Double(\(v))"
656-
case .StringValue(let v): return "\"\(v)\""
657-
case .BoolArray(let values): return arrayAsString("", values)
658-
case .IntArray(let values): return arrayAsString("Int", values)
659-
case .FloatArray(let values): return arrayAsString("Float", values)
660-
case .DoubleArray(let values): return arrayAsString("Double", values)
661-
case .StringArray(let values): return arrayAsString("String", values)
662-
case .ConstTensor(let v): return v.valueDescription
663-
case .TensorDataTypeValue(let v): return dataTypeAsString(v)
664-
case .TensorFunctionPointer(let v): return "TFFunction(\(v.name))"
665-
case .TensorDataTypeArray(let values):
652+
case .boolValue(let v): return "\(v)"
653+
case .intValue(let v): return "Int(\(v))"
654+
case .floatValue(let v): return "Float(\(v))"
655+
case .doubleValue(let v): return "Double(\(v))"
656+
case .stringValue(let v): return "\"\(v)\""
657+
case .boolArray(let values): return arrayAsString("", values)
658+
case .intArray(let values): return arrayAsString("Int", values)
659+
case .floatArray(let values): return arrayAsString("Float", values)
660+
case .doubleArray(let values): return arrayAsString("Double", values)
661+
case .stringArray(let values): return arrayAsString("String", values)
662+
case .constTensor(let v): return v.valueDescription
663+
case .tensorDataTypeValue(let v): return dataTypeAsString(v)
664+
case .tensorFunctionPointer(let v): return "TFFunction(\(v.name))"
665+
case .tensorDataTypeArray(let values):
666666
let descriptions = values.map { dataTypeAsString($0) }
667667
let descString = descriptions.joined(separator: ", ")
668668
return "[\(descString)]"
669-
case .OptionalTensorShape(let t): return String(describing: t)
670-
case .OptionalTensorShapeArray(let t): return "\(t)"
669+
case .optionalTensorShape(let t): return String(describing: t)
670+
case .optionalTensorShapeArray(let t): return "\(t)"
671671
}
672672
}
673673

Sources/TensorFlow/Core/LazyTensorTrace.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ class LazyTensorTrace {
6363
let cTensorHandle = handle._cTensorHandle
6464
let result = LazyTensorOperation("Const", 1)
6565
let dtype = TensorDataType(TFE_TensorHandleDataType(cTensorHandle))
66-
let dtypeAttr = LazyTensorOperation.Attribute.TensorDataTypeValue(dtype)
66+
let dtypeAttr = LazyTensorOperation.Attribute.tensorDataTypeValue(dtype)
6767
result.attributes = [
6868
"dtype": dtypeAttr,
69-
"value": LazyTensorOperation.Attribute.ConstTensor(handle)]
69+
"value": LazyTensorOperation.Attribute.constTensor(handle)]
7070
updateOperationAndCache(ObjectIdentifier(handle), result)
7171
return LazyTensor(_lazy: result, index: 0)
7272
}
@@ -76,7 +76,7 @@ class LazyTensorTrace {
7676
) -> LazyTensor {
7777
let cTensorHandle = handle._cTensorHandle
7878
let dtype = TensorDataType(TFE_TensorHandleDataType(cTensorHandle))
79-
let dtypeAttr = LazyTensorOperation.Attribute.TensorDataTypeValue(dtype)
79+
let dtypeAttr = LazyTensorOperation.Attribute.tensorDataTypeValue(dtype)
8080
let placeholder = LazyTensorOperation("Placeholder", 1)
8181
placeholder.attributes = ["dtype": dtypeAttr]
8282
updateOperationAndCache(ObjectIdentifier(handle), placeholder)

0 commit comments

Comments
 (0)