Eagerly create the base scope

Signed-off-by: Ryan Nett <[email protected]>

Author: rnett

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

@@ -309,11 +309,7 @@ public void checkInput(Op input) {
   }
 
   @Override
-  public synchronized Scope baseScope() {
-    if(baseScope == null){
-      baseScope = new Scope(this);
-    }
-
+  public Scope baseScope() {
     return baseScope;
   }
 
@@ -373,7 +369,7 @@ void detach(Pointer... resources) {
   private final WeakPointerScope nativeResources;
   private TFE_Context nativeHandle;
 
-  private Scope baseScope = null;
+  private final Scope baseScope = new Scope(this);
 
   private EagerSession(Options options) {
     this.nativeResources = new WeakPointerScope();

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

@@ -392,11 +392,7 @@ public void checkInput(Op input) {
   }
 
   @Override
-  public synchronized Scope baseScope() {
-    if(baseScope == null){
-      baseScope = new Scope(this);
-    }
-
+  public Scope baseScope() {
     return baseScope;
   }
 
@@ -702,7 +698,7 @@ synchronized SaverDef saverDef() {
   private TF_Graph nativeHandle;
   private int refcount = 0;
   private SaverDef saverDef;
-  private Scope baseScope = null;
+  private final Scope baseScope = new Scope(this);
 
   private final List<Op> initializers = new ArrayList<>();