Merge remote-tracking branch 'origin/Regularizers_1' into Regularizers_1

JimClarke5 · JimClarke5 · commit 1a93bdc275c7 · 2021-05-02T08:40:37.000-04:00
# Conflicts:
#	tensorflow-framework/src/main/java/org/tensorflow/framework/regularizers/RegularizerLoss.java
diff --git a/tensorflow-framework/src/main/java/org/tensorflow/framework/regularizers/RegularizerLoss.java b/tensorflow-framework/src/main/java/org/tensorflow/framework/regularizers/RegularizerLoss.java
@@ -52,7 +52,6 @@ public RegularizerLoss(Ops tf, String name, Regularizer regularizer) {
     this.regularizer = regularizer;
   }
 
-
   /** {@inheritDoc} */
   @Override
   public <T extends TNumber> Operand<T> call(

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,6 @@ public RegularizerLoss(Ops tf, String name, Regularizer regularizer) {`
`52`	`52`	`this.regularizer = regularizer;`
`53`	`53`	`}`
`54`	`54`
`55`		`-`
`56`	`55`	`/** {@inheritDoc} */`
`57`	`56`	`@Override`
`58`	`57`	`public <T extends TNumber> Operand<T> call(`