FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

resolve conflict · attackgithub/TensorFlow.NET@ec7637e · GitHub

Repository navigation

Commit ec7637e

Browse files
committed
resolve conflict
2 parents 98fb777 + 5933fe4 commit ec7637e

2 files changed

Lines changed: 19 additions & 3 deletions

File tree

‎src/TensorFlowNET.Core/APIs/tf.math.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ public static unsafe Tensor add(Tensor a, Tensor b)
1111
return gen_math_ops.add(a, b);
1212
}
1313

14+
public static unsafe Tensor sub(Tensor a, Tensor b)
15+
{
16+
return gen_math_ops.sub(a, b);
17+
}
18+
1419
public static unsafe Tensor add(Tensor a, RefVariable b)
1520
{
1621
return gen_math_ops.add(a, b);

‎src/TensorFlowNET.Core/Operations/gen_math_ops.cs‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ public static class gen_math_ops
99
{
1010
public static OpDefLibrary _op_def_lib = new OpDefLibrary();
1111

12-
public static Tensor add(Tensor a, Tensor b)
12+
public static Tensor add(Tensor x, Tensor y)
1313
{
1414
var keywords = new Dictionary<string, object>();
15-
keywords.Add("x", a);
16-
keywords.Add("y", b);
15+
keywords.Add("x", x);
16+
keywords.Add("y", y);
1717

1818
var _op = _op_def_lib._apply_op_helper("Add", name: "add", keywords: keywords);
1919

@@ -31,6 +31,17 @@ public static Tensor add(Tensor a, RefVariable b)
3131
return new Tensor(_op, 0, _op.OutputType(0));
3232
}
3333

34+
public static Tensor sub(Tensor x, Tensor y)
35+
{
36+
var keywords = new Dictionary<string, object>();
37+
keywords.Add("x", x);
38+
keywords.Add("y", y);
39+
40+
var _op = _op_def_lib._apply_op_helper("Sub", name: "sub", keywords: keywords);
41+
42+
return new Tensor(_op, 0, _op.OutputType(0));
43+
}
44+
3445
public static Tensor mul(Tensor x, Tensor y)
3546
{
3647
var keywords = new Dictionary<string, object>();

0 commit comments

Comments
 (0)

Back | FazBrowse Home | New Git URL