Skip to content
Closed
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
c57a2e7
Merge pull request #3 from tensorflow/master
JimClarke5 Oct 8, 2020
09fc07e
Merge pull request #4 from tensorflow/master
JimClarke5 Oct 27, 2020
a99dcb4
Merge pull request #5 from tensorflow/master
JimClarke5 Nov 17, 2020
ba294ea
Merge pull request #6 from tensorflow/master
JimClarke5 Nov 19, 2020
04f419a
Merge pull request #7 from tensorflow/master
JimClarke5 Dec 30, 2020
02e7ebf
Merge pull request #8 from tensorflow/master
JimClarke5 Jan 29, 2021
e0c9ed8
Merge pull request #9 from tensorflow/master
JimClarke5 Feb 1, 2021
5b0374b
Merge pull request #10 from tensorflow/master
JimClarke5 Feb 11, 2021
e038bbd
Merge pull request #11 from tensorflow/master
JimClarke5 Feb 23, 2021
def3051
Merge pull request #13 from tensorflow/master
JimClarke5 Mar 3, 2021
11748ae
Merge pull request #15 from tensorflow/master
JimClarke5 Mar 21, 2021
dc94953
Moved high level tf.nn ops to framework.
JimClarke5 Mar 26, 2021
1878b60
Added FrameworkOps analogous to Ops.
JimClarke5 Mar 26, 2021
9225a48
Added FrameworkOps analogous to Ops.
JimClarke5 Mar 27, 2021
caab79b
Move l2Normalize to MathOps
JimClarke5 Mar 27, 2021
bd072f4
Reformat code, fix javadocs
JimClarke5 Mar 27, 2021
a9412ea
Merge pull request #16 from tensorflow/master
JimClarke5 Apr 9, 2021
d29262b
Add confusionMatrix() method. add Unit test
JimClarke5 Apr 16, 2021
2ff8dfe
Merge pull request #17 from tensorflow/master
JimClarke5 Apr 22, 2021
ee5e38a
Merge pull request #18 from tensorflow/master
JimClarke5 May 1, 2021
26394d6
Merge pull request #19 from tensorflow/master
JimClarke5 May 2, 2021
e0a4a26
Moved high level tf.nn ops to framework.
JimClarke5 Mar 26, 2021
28db4df
Added FrameworkOps analogous to Ops.
JimClarke5 Mar 26, 2021
ba24371
Added FrameworkOps analogous to Ops.
JimClarke5 Mar 27, 2021
4d3f17c
Move l2Normalize to MathOps
JimClarke5 Mar 27, 2021
9e07483
Reformat code, fix javadocs
JimClarke5 Mar 27, 2021
790bf35
Add confusionMatrix() method. add Unit test
JimClarke5 Apr 16, 2021
b4ca97a
Added linalg methods for matmul
JimClarke5 May 2, 2021
e83d26b
add nn ops for sigmoidCrossEntropyWithLogits, softmaxCrossEntropyWith…
JimClarke5 May 2, 2021
e4e65f2
Moved SetOps to FrameworkOps
JimClarke5 May 2, 2021
a2ed723
Added tensordot and reduceLogSumExp
JimClarke5 May 2, 2021
be1fe66
Added frameworkOps for nn and linalg
JimClarke5 May 2, 2021
7b51e7f
Modified to use FrameworkOps
JimClarke5 May 2, 2021
f1c63c0
move nn.raw classes to nn in core, remove nn.raw
JimClarke5 May 2, 2021
f4b75b9
Merge remote-tracking branch 'origin/Framework_Ops' into Framework_Ops
JimClarke5 May 2, 2021
043654b
Update FrameworkOps.java
JimClarke5 May 2, 2021
06c28df
Fix unusual regression error in confustion matrix. Needed to reduceA…
JimClarke5 May 3, 2021
8f33d21
javadoc fixes
JimClarke5 May 3, 2021
198ea27
Initial checkin
JimClarke5 Apr 26, 2021
8497449
Initial checkin
JimClarke5 Apr 26, 2021
b95c750
Initial checkin
JimClarke5 Apr 26, 2021
bdcbb21
Initial checkin
JimClarke5 May 1, 2021
056d3ec
Initial checkin
JimClarke5 May 6, 2021
a653d33
Merge branch 'tensorflow:master' into master
JimClarke5 May 6, 2021
749e8b3
Merge branch 'master' of https://github.com/JimClarke5/java into laye…
JimClarke5 May 6, 2021
f621a88
changed tf.nn.raw to tf.nn based on Framework Ops change
JimClarke5 May 6, 2021
adb5a89
Refactor the 2d transpose that is common to softmax and logSoftmax. A…
JimClarke5 May 10, 2021
1ebe917
Reformat code
JimClarke5 May 10, 2021
61673df
Reformat code
JimClarke5 May 10, 2021
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
Prev Previous commit
Next Next commit
javadoc fixes
  • Loading branch information
JimClarke5 committed May 3, 2021
commit 8f33d21c2a79fa554138cface5d771905ff597e8
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ public class LinalgOps {
}

/**
* Multiplies matrix <code>a</code> by matrix <code>b</code>, producing <code>a</code> * <code>b
* </code>.
* Multiplies matrix {@code a} by matrix {@code b}, producing {@code a} * {@code b
* }.
*
* <p>The inputs must, following any transpositions, be tensors of rank >= 2 where the inner 2
* <p>The inputs must, following any transpositions, be tensors of {@code rank >= 2} where the inner 2
* dimensions specify valid matrix multiplication dimensions, and any further outer dimensions
* specify matching batch size.
*
* <p>Both matrices must be of the same type. The supported types are: <code>TFloat16</code>,
* <code>TFloat32</code>, <code>TFloat64</code>, <code>TInt32</code>.
* <p>Both matrices must be of the same type. The supported types are: {@code TFloat16},
* {@code TFloat32}, {@code TFloat64}, {@code TInt32}.
*
* <p>Either matrix can be transposed or adjointed (conjugated and transposed) on the fly by
* setting one of the corresponding flag to true. These are false by default.
Expand All @@ -80,37 +80,35 @@ public class LinalgOps {
*
* <p>Note: This is matrix product, not element-wise product.
*
* @param a an Operand of of type <code>TFloat16</code>, <code>TFloat32</code>, <code>TFloat64
* </code>, <code>TInt32</code>. with a rank > 1
* @param b an Operand with same type and rank as <code>a</code>.
* @param a an Operand of of type {@code TFloat16}, {@code TFloat32}, {@code TFloat64
* }, {@code TInt32}. with a {@code rank > 1}
* @param b an Operand with same type and rank as {@code a}.
* @param <T> the data type of the Operands
* @return A Operand of the same type as <code>a</code> and <code>b</code> where each inner-most
* matrix is the product of the corresponding matrices in <code>a</code> and <code>b</code>.
* @return A Operand of the same type as {@code a} and {@code b} where each inner-most
* matrix is the product of the corresponding matrices in {@code a} and {@code b}.
* This is the matrix product not an element-wise product.
* @throws java.lang.IllegalArgumentException If <code>transposeA</code> and <code>adjointA</code>
* , or <code>transposeB</code> and <code>adjointB</code> are both set to `true`.
* @throws java.lang.IllegalArgumentException If {@code transposeA} and {@code adjointA}
* , or {@code transposeB} and {@code adjointB} are both set to `true`.
*/
@Endpoint(name = "matmul")
public <T extends TNumber> Operand<T> matmul(Operand<T> a, Operand<T> b) {
return matmul(a, b, false, false, false, false, false, false);
}

/**
* Multiplies matrix <code>a</code> by matrix <code>b</code>, producing <code>a</code> * <code>b
* </code>.
* Multiplies matrix {@code a} by matrix {@code b}, producing {@code a} * {@code b
* }.
*
* <p>The inputs must, following any transpositions, be tensors of rank >= 2 where the inner 2
* <p>The inputs must, following any transpositions, be tensors of {@code rank >= 2} where the inner 2
* dimensions specify valid matrix multiplication dimensions, and any further outer dimensions
* specify matching batch size.
*
* <p>Both matrices must be of the same type. The supported types are: <code>TFloat16</code>,
* <code>TFloat32</code>, <code>TFloat64</code>, <code>TInt32</code>.
* <p>Both matrices must be of the same type. The supported types are: {@code TFloat16},
* {@code TFloat32}, {@code TFloat64}, {@code TInt32}.
*
* <p>Either matrix can be transposed or adjointed (conjugated and transposed) on the fly by
* setting one of the corresponding flag to true. These are false by default.
*
* <p>
*
* <p>Note: This is matrix product, not element-wise product.
*
* <p>A simple 2-D tensor matrix multiplication:
Expand All @@ -133,17 +131,17 @@ public <T extends TNumber> Operand<T> matmul(Operand<T> a, Operand<T> b) {
*
* }</pre>
*
* @param a an Operand of of type <code>TFloat16</code>, <code>TFloat32</code>, <code>TFloat64
* </code>, <code>TInt32</code>. with a rank > 1
* @param b an Operand with same type and rank as <code>a</code>.
* @param transposeA If `true`, <code>a</code> is transposed before multiplication.
* @param transposeB If `True`, <code>b</code> is transposed before multiplication
* @param a an Operand of of type {@code TFloat16}, {@code TFloat32}, {@code TFloat64
* }, {@code TInt32}. with a {@code rank > 1}
* @param b an Operand with same type and rank as {@code a}.
* @param transposeA If true, {@code a} is transposed before multiplication.
* @param transposeB If true, {@code b} is transposed before multiplication
* @param <T> the data type of the Operands
* @return A Operand of the same type as <code>a</code> and <code>b</code> where each inner-most
* matrix is the product of the corresponding matrices in <code>a</code> and <code>b</code>.
* @return A Operand of the same type as {@code a} and {@code b} where each inner-most
* matrix is the product of the corresponding matrices in {@code a} and {@code b}.
* This is the matrix product not an element-wise product.
* @throws java.lang.IllegalArgumentException If <code>transposeA</code> and <code>adjointA</code>
* , or <code>transposeB</code> and <code>adjointB</code> are both set to `true`.
* @throws java.lang.IllegalArgumentException If {@code transposeA} and {@code adjointA}
* , or {@code transposeB} and {@code adjointB} are both set to `true`.
*/
@Endpoint(name = "matmul")
public <T extends TNumber> Operand<T> matmul(
Expand All @@ -152,15 +150,15 @@ public <T extends TNumber> Operand<T> matmul(
}

/**
* Multiplies matrix <code>a</code> by matrix <code>b</code>, producing <code>a</code> * <code>b
* </code>.
* Multiplies matrix {@code a} by matrix {@code b}, producing {@code a} * {@code b
* }.
*
* <p>The inputs must, following any transpositions, be tensors of rank >= 2 where the inner 2
* <p>The inputs must, following any transpositions, be tensors of {@code rank >= 2} where the inner 2
* dimensions specify valid matrix multiplication dimensions, and any further outer dimensions
* specify matching batch size.
*
* <p>Both matrices must be of the same type. The supported types are: <code>TFloat16</code>,
* <code>TFloat32</code>, <code>TFloat64</code>, <code>TInt32</code>.
* <p>Both matrices must be of the same type. The supported types are: {@code TFloat16},
* {@code TFloat32}, {@code TFloat64}, {@code TInt32}.
*
* <p>Either matrix can be transposed or adjointed (conjugated and transposed) on the fly by
* setting one of the corresponding flag to true. These are false by default.
Expand All @@ -187,25 +185,25 @@ public <T extends TNumber> Operand<T> matmul(
*
* }</pre>
*
* @param a an Operand of of type <code>TFloat16</code>, <code>TFloat32</code>, <code>TFloat64
* </code>, <code>TInt32</code>. with a rank > 1
* @param b an Operand with same type and rank as <code>a</code>.
* @param transposeA If true, <code>a</code> is transposed before multiplication.
* @param transposeB If True, <code>b</code> is transposed before multiplication
* @param adjointA If true, <code>a</code> is conjugated and transposed before multiplication.
* @param adjointB If true, <code>b</code> is conjugated and transposed before multiplication.
* @param aIsSparse If true, <code>a</code> is treated as a sparse matrix. Notice, this <em>does
* @param a an Operand of of type {@code TFloat16}, {@code TFloat32}, {@code TFloat64
* }, {@code TInt32}. with a {@code rank > 1}
* @param b an Operand with same type and rank as {@code a}.
* @param transposeA If true, {@code a} is transposed before multiplication.
* @param transposeB If True, {@code b} is transposed before multiplication
* @param adjointA If true, {@code a} is conjugated and transposed before multiplication.
* @param adjointB If true, {@code b} is conjugated and transposed before multiplication.
* @param aIsSparse If true, {@code a} is treated as a sparse matrix. Notice, this <em>does
* not support {@link SparseTensor}</em>, it just makes optimizations that assume most values
* in <code>a</code> are zero.
* @param bIsSparse If true, <code>b</code> is treated as a sparse matrix. Notice, this <em>does
* in {@code a} are zero.
* @param bIsSparse If true, {@code b} is treated as a sparse matrix. Notice, this <em>does
* not support {@link SparseTensor}</em>, it just makes optimizations that assume most values
* in <code>b</code> are zero.
* in {@code b} are zero.
* @param <T> the data type of the Operands
* @return A Operand of the same type as <code>a</code> and <code>b</code> where each inner-most
* matrix is the product of the corresponding matrices in <code>a</code> and <code>b</code>.
* @return A Operand of the same type as {@code a} and {@code b} where each inner-most
* matrix is the product of the corresponding matrices in {@code a} and {@code b}.
* This is the matrix product not an element-wise product.
* @throws java.lang.IllegalArgumentException If <code>transposeA</code> and <code>adjointA</code>
* , or <code>transposeB</code> and <code>adjointB</code> are both set to `true`.
* @throws java.lang.IllegalArgumentException If {@code transposeA} and {@code adjointA}
* , or {@code transposeB} and {@code adjointB} are both set to `true`.
*/
@SuppressWarnings("unchecked")
@Endpoint(name = "matmul")
Expand Down