Update scope for fix review comments

Signed-off-by: Ryan Nett <JNett96@gmail.com>

Author: rnett

tensorflow-core/tensorflow-core-api/src/gen/annotations/org/tensorflow/op/Ops.java

@@ -367,10 +367,10 @@ public final class Ops {
 
   public final SparseOps sparse;
 
-  public final BitwiseOps bitwise;
-
   public final TpuOps tpu;
 
+  public final BitwiseOps bitwise;
+
   public final MathOps math;
 
   public final AudioOps audio;
@@ -398,8 +398,8 @@ public final class Ops {
     random = new RandomOps(this);
     strings = new StringsOps(this);
     sparse = new SparseOps(this);
-    bitwise = new BitwiseOps(this);
     tpu = new TpuOps(this);
+    bitwise = new BitwiseOps(this);
     math = new MathOps(this);
     audio = new AudioOps(this);
     signal = new SignalOps(this);

tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/BaseGradientAdapter.java

@@ -79,10 +79,10 @@ protected static GraphOperation getGraphOp(Graph g, Node node) {
   }
 
   /**
-   * Use builders without locking.  This should only be used during custom gradient building.
+   * Use builders without locking. This should only be used during custom gradient building.
    *
-   * The graph locks are not re-entrant, so attempting to add an op to a graph that has
-   * been locked by the gradient builder will fail without this.
+   * <p>The graph locks are not re-entrant, so attempting to add an op to a graph that has been
+   * locked by the gradient builder will fail without this.
    */
   protected static void useDangerousLockedBuilders(Graph g, boolean dangerous) {
     g.setDangerousGradientBuilder(dangerous);

tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Graph.java

@@ -905,10 +905,10 @@ synchronized SaverDef saverDef() {
   private boolean newInitializers = false;
 
   /**
-   * Use builders without locking.  This should only be used during custom gradient building.
+   * Use builders without locking. This should only be used during custom gradient building.
    *
-   * The graph locks are not re-entrant, so attempting to add an op to a graph that has
-   * been locked by the gradient builder will fail without this.
+   * <p>The graph locks are not re-entrant, so attempting to add an op to a graph that has been
+   * locked by the gradient builder will fail without this.
    */
   synchronized void setDangerousGradientBuilder(boolean dangerous) {
     dangerousGradientBuilder = dangerous;

tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/GraphOperation.java

@@ -386,7 +386,7 @@ public Set<GraphOperation> controlConsumers() {
   /**
    * Get the native handle of this operation.
    *
-   * No liveness or non-null checking is done, the operation may have been deallocated.
+   * <p>No liveness or non-null checking is done, the operation may have been deallocated.
    */
   public TF_Operation getUnsafeNativeHandle() {
     return unsafeNativeHandle;

tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/GraphOperationBuilder.java

@@ -402,10 +402,10 @@ public OperationBuilder setAttr(String name, AttrValue value) {
   private final Scope scope;
 
   /**
-   * Use builders without locking.  This should only be used during custom gradient building.
+   * Use builders without locking. This should only be used during custom gradient building.
    *
-   * The graph locks are not re-entrant, so attempting to add an op to a graph that has
-   * been locked by the gradient builder will fail without this.
+   * <p>The graph locks are not re-entrant, so attempting to add an op to a graph that has been
+   * locked by the gradient builder will fail without this.
    */
   private final boolean dangerousGradientBuilder;
 
@@ -437,10 +437,10 @@ private static TF_OperationDescription allocate(TF_Graph graphHandle, String typ
   }
 
   /**
-   * Use builders without locking.  This should only be used during custom gradient building.
+   * Use builders without locking. This should only be used during custom gradient building.
    *
-   * The graph locks are not re-entrant, so attempting to add an op to a graph that has
-   * been locked by the gradient builder will fail without this.
+   * <p>The graph locks are not re-entrant, so attempting to add an op to a graph that has been
+   * locked by the gradient builder will fail without this.
    */
   private static TF_OperationDescription allocateDangerousGradient(
       TF_Graph graphHandle, String type, String name) {
@@ -462,10 +462,10 @@ private static TF_Operation finish(TF_OperationDescription handle) {
   }
 
   /**
-   * Use builders without locking.  This should only be used during custom gradient building.
+   * Use builders without locking. This should only be used during custom gradient building.
    *
-   * The graph locks are not re-entrant, so attempting to add an op to a graph that has
-   * been locked by the gradient builder will fail without this.
+   * <p>The graph locks are not re-entrant, so attempting to add an op to a graph that has been
+   * locked by the gradient builder will fail without this.
    */
   private static TF_Operation finishDangerousGradient(TF_Graph g, TF_OperationDescription handle) {
     requireHandle(handle);

tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/TensorFlow.java

@@ -154,7 +154,7 @@ private TensorFlow() {}
   /**
    * Keeps references to custom gradient functions to prevent them from being deallocated.
    *
-   * <b>Required for correctness</b>
+   * <p><b>Required for correctness</b>
    */
   private static final Set<GradFunc> gradientFuncs =
       Collections.newSetFromMap(new IdentityHashMap<>());

tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/GradientScope.java

@@ -38,7 +38,7 @@ public ExecutionEnvironment env() {
 
   @Override
   public GradientScope withSubScope(String childScopeName) {
-    return new GradientScope(nativeScope.NewSubScope(childScopeName), graph, childScopeName, device);
+    return new GradientScope(nativeScope.NewSubScope(childScopeName), graph, null, device);
   }
 
   @Override
@@ -48,12 +48,17 @@ public GradientScope withName(String opName) {
 
   @Override
   public GradientScope withNameAsSubScope(String defaultName) {
-    return withSubScope(opName);
+    if (opName == null) {
+      return withSubScope(defaultName);
+    } else {
+      return withSubScope(opName);
+    }
   }
 
   @Override
   public GradientScope withDevice(DeviceSpec newDevice) {
-    return new GradientScope(nativeScope.WithDevice(newDevice.toString()), graph, newDevice.toString());
+    return new GradientScope(
+        nativeScope.WithDevice(newDevice.toString()), graph, newDevice.toString());
   }
 
   @Override
@@ -90,7 +95,8 @@ public GradientScope withControlDependencies(Iterable<Op> controls) {
           .put(new NativeOperation(((GraphOperation) op).getUnsafeNativeHandle().node()));
     }
 
-    return new GradientScope(nativeScope.WithControlDependencies(new NativeOperation(ops)), graph, device);
+    return new GradientScope(
+        nativeScope.WithControlDependencies(new NativeOperation(ops)), graph, device);
   }
 
   @Override
@@ -108,7 +114,8 @@ public Scope withControlDependencyOps(Iterable<Operation> controls) {
           .put(new NativeOperation(((GraphOperation) op).getUnsafeNativeHandle().node()));
     }
 
-    return new GradientScope(nativeScope.WithControlDependencies(new NativeOperation(ops)), graph, device);
+    return new GradientScope(
+        nativeScope.WithControlDependencies(new NativeOperation(ops)), graph, device);
   }
 
   @Override
@@ -122,7 +129,8 @@ public void onOpCreated(Operation op) {}
   @Override
   public String getDeviceString() {
     if (device == null) {
-      throw new UnsupportedOperationException("Can't get device string for gradient scope unless it has been explicitly set");
+      throw new UnsupportedOperationException(
+          "Can't get device string for gradient scope unless it has been explicitly set");
     } else {
       return device;
     }

tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/RawGradientAdapter.java

@@ -61,6 +61,8 @@ public NativeStatus call(
 
       GraphOperation operation = BaseGradientAdapter.getGraphOp(g, op.node());
 
+      // The graph locks are not re-entrant, so attempting to add an op to a graph that has been
+      // locked by the gradient builder will fail without this.
       BaseGradientAdapter.useDangerousLockedBuilders(g, true);
       List<Operand<?>> gradOutputs = gradient.call(tf, operation, gradInputs);
       BaseGradientAdapter.useDangerousLockedBuilders(g, false);

tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/Scope.java

@@ -224,6 +224,7 @@ default OperationBuilder opBuilder(String type, String name) {
     return env().opBuilder(type, makeOpName(name), this);
   }
 
+  /** Check whether {@code name} is a valid name for an operation. */
   static boolean isValidOpName(String name) {
     return NameScope.isValidName(name);
   }

tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/op/TypedGradientAdapter.java

@@ -68,6 +68,8 @@ public NativeStatus call(
 
       T rawOp = ctor.newInstance(BaseGradientAdapter.getGraphOp(g, op.node()));
 
+      // The graph locks are not re-entrant, so attempting to add an op to a graph that has been
+      // locked by the gradient builder will fail without this.
       BaseGradientAdapter.useDangerousLockedBuilders(g, true);
       List<Operand<?>> gradOutputs = gradient.call(tf, rawOp, gradInputs);
       BaseGradientAdapter.useDangerousLockedBuilders(g, false);