Skip to content

Revert "[TF-76][Python Interop] add PythonConvertible conformance to TensorShape" #24044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Revert "[TF-76][Python Interop] add PythonConvertible conformance to TensorShape" #24044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 0 additions & 19 deletions stdlib/public/TensorFlow/TensorShape.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
//
//===----------------------------------------------------------------------===//

import Python

// NOTE: it may be possible to edit `TensorShape` to support "labeled tensors".
// Dimensions may be either an Int32 or an enum representing a label.

Expand Down Expand Up @@ -160,20 +158,3 @@ extension TensorShape : Codable {
self.init(dimensions)
}
}

extension TensorShape : PythonConvertible {
public var pythonObject: PythonObject {
return dimensions.pythonObject
}

public init?(_ pythonObject: PythonObject) {
let hasLen = Bool(Python.hasattr(pythonObject, "__len__"))
if(hasLen == true) {
guard let array = [Int32](pythonObject) else { return nil }
self.init(array)
} else {
guard let num = Int32(pythonObject) else { return nil }
self.init(num)
}
}
}
14 changes: 2 additions & 12 deletions test/Python/python_runtime.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ PythonRuntimeTestSuite.testWithLeakChecking("PythonList") {
}

PythonRuntimeTestSuite.testWithLeakChecking("PythonDict") {
let dict: PythonObject = ["a" : 1, 1 : 0.5]
let dict: PythonObject = ["a": 1, 1: 0.5]
expectEqual(2, Python.len(dict))
expectEqual(1, dict["a"])
expectEqual(0.5, dict[1])
Expand Down Expand Up @@ -210,7 +210,7 @@ PythonRuntimeTestSuite.testWithLeakChecking("Tuple") {
let element1: PythonObject = 0
let element2: PythonObject = "abc"
let element3: PythonObject = [0, 0]
let element4: PythonObject = ["a" : 0, "b" : "c"]
let element4: PythonObject = ["a": 0, "b": "c"]
let pair = PythonObject(tupleOf: element1, element2)
let (pair1, pair2) = pair.tuple2
expectEqual(element1, pair1)
Expand Down Expand Up @@ -258,8 +258,6 @@ PythonRuntimeTestSuite.testWithLeakChecking("ConvertibleFromPython") {
let five: PythonObject = 5
let half: PythonObject = 0.5
let string: PythonObject = "abc"
let intArray: PythonObject = [2, 3]
let dict: PythonObject = ["abc" : 97]

expectEqual(-1, Int(minusOne))
expectEqual(-1, Int8(minusOne))
Expand Down Expand Up @@ -287,9 +285,6 @@ PythonRuntimeTestSuite.testWithLeakChecking("ConvertibleFromPython") {

expectEqual("abc", String(string))

expectEqual([2, 3], Array(intArray))
expectEqual(["abc" : 97], Dictionary<String, Int32>(dict))

expectNil(String(zero))
expectNil(Int(string))
expectNil(Double(string))
Expand All @@ -298,8 +293,6 @@ PythonRuntimeTestSuite.testWithLeakChecking("ConvertibleFromPython") {
PythonRuntimeTestSuite.testWithLeakChecking("PythonConvertible") {
let minusOne: PythonObject = -1
let five: PythonObject = 5
let intArray: PythonObject = [2, 3]
let dict: PythonObject = ["abc" : 7]

expectEqual(minusOne, Int(-1).pythonObject)
expectEqual(minusOne, Int8(-1).pythonObject)
Expand All @@ -316,9 +309,6 @@ PythonRuntimeTestSuite.testWithLeakChecking("PythonConvertible") {
expectEqual(five, UInt64(5).pythonObject)
expectEqual(five, Float(5).pythonObject)
expectEqual(five, Double(5).pythonObject)

expectEqual(intArray, [2, 3].pythonObject)
expectEqual(dict, ["abc" : 7].pythonObject)
}

PythonRuntimeTestSuite.testWithLeakChecking("Optional") {
Expand Down
4 changes: 2 additions & 2 deletions test/TensorFlow/integration.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ public func testResourceAndVariants() {
// expected-error @+1 {{op named 'TensorDataSet' is not registered in TensorFlow}}
#tfop("TensorDataSet", values,
Toutput_types$dtype: [Float.tensorFlowDataType],
output_shapes: [TensorShape([1])])
output_shapes: [TensorShape(1)])

// REGISTER_OP("Iterator")
// .Output("handle: resource")
Expand All @@ -388,7 +388,7 @@ public func testResourceAndVariants() {
// .SetShapeFn(shape_inference::ScalarShape);
let iterator: ResourceHandle =
#tfop("Iterator", shared_name: "foo", container: "bar",
output_types$dtype: [Float.tensorFlowDataType], output_shapes: [TensorShape([1])])
output_types$dtype: [Float.tensorFlowDataType], output_shapes: [TensorShape(1)])

// REGISTER_OP("MakeIterator")
// .Input("dataset: variant")
Expand Down
24 changes: 0 additions & 24 deletions test/TensorFlowRuntime/numpy_conversion.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,6 @@ NumpyConversionTests.test("shaped-array-conversion") {
array)
}

let reshaped = np.reshape(numpyArrayInt32, [2, 3] as TensorShape)
if let array = expectNotNil(ShapedArray<Int32>(numpy: reshaped)) {
expectEqual(ShapedArray(shape: [2, 3], scalars: [1, 2, 3, 4, 5, 6]),
array)
}

let numpyArray1D = np.ones(28)
let reshaped3D = np.reshape(numpyArray1D, [2, 7, 2] as TensorShape)
expectEqual(TensorShape(reshaped3D.shape), [2, 7, 2])
let reshaped2D = np.reshape(reshaped3D, [14, 2] as TensorShape)
expectEqual(TensorShape(reshaped2D.shape), [14, 2])

let numpyArrayStrided = np.array([[1, 2], [1, 2]], dtype: np.int32)[
Python.slice(Python.None), 1]
// Assert that the array has a stride, so that we're certainly testing a
Expand Down Expand Up @@ -107,12 +95,6 @@ NumpyConversionTests.test("tensor-conversion") {
tensor.array)
}

let reshaped = np.reshape(numpyArrayInt32, [2, 3] as TensorShape)
if let tensor = expectNotNil(Tensor<Int32>(numpy: reshaped)) {
expectEqual(ShapedArray(shape: [2, 3], scalars: [1, 2, 3, 4, 5, 6]),
tensor.array)
}

let numpyArrayStrided = np.array([[1, 2], [1, 2]], dtype: np.int32)[
Python.slice(Python.None), 1]
// Assert that the array has a stride, so that we're certainly testing a
Expand All @@ -136,12 +118,6 @@ NumpyConversionTests.test("tensor-round-trip") {
let t3 = Tensor<Int32>(repeating: 30, shape: [8,5,4])
expectEqual(t3, Tensor<Int32>(numpy: t3.makeNumpyArray())!)
}

NumpyConversionTests.test("tensor-shape") {
let pyArray = [2, 3].pythonObject
expectEqual(pyArray, TensorShape(2, 3).pythonObject)
expectEqual(TensorShape(2, 3), TensorShape(pyArray))
}
#endif

runAllTests()