Load TF library before computing TString size (#322)

karllessard · web-flow · commit 94f5b151b17d · 2021-05-17T16:20:19.000-04:00
diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/EagerSession.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/EagerSession.java
@@ -404,6 +404,11 @@ private static void delete(TFE_Context handle) {
   }
 
   static {
-    TensorFlow.init();
+    try {
+      // Ensure that TensorFlow native library and classes are ready to be used
+      Class.forName("org.tensorflow.TensorFlow");
+    } catch (ClassNotFoundException e) {
+      throw new RuntimeException(e);
+    }
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Graph.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Graph.java
@@ -1070,6 +1070,11 @@ private static SaverDef addVariableSaver(Graph graph) {
   }
 
   static {
-    TensorFlow.init();
+    try {
+      // Ensure that TensorFlow native library and classes are ready to be used
+      Class.forName("org.tensorflow.TensorFlow");
+    } catch (ClassNotFoundException e) {
+      throw new RuntimeException(e);
+    }
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/RawTensor.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/RawTensor.java
@@ -228,6 +228,11 @@ private static long[] shape(TF_Tensor handle) {
   private ByteDataBuffer buffer = null;
 
   static {
-    TensorFlow.init();
+    try {
+      // Ensure that TensorFlow native library and classes are ready to be used
+      Class.forName("org.tensorflow.TensorFlow");
+    } catch (ClassNotFoundException e) {
+      throw new RuntimeException(e);
+    }
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/SavedModelBundle.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/SavedModelBundle.java
@@ -435,6 +435,11 @@ private static void validateTags(String[] tags) {
   }
 
   static {
-    TensorFlow.init();
+    try {
+      // Ensure that TensorFlow native library and classes are ready to be used
+      Class.forName("org.tensorflow.TensorFlow");
+    } catch (ClassNotFoundException e) {
+      throw new RuntimeException(e);
+    }
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Server.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/Server.java
@@ -178,6 +178,11 @@ private static void delete(TF_Server nativeHandle) {
   private int numJoining;
 
   static {
-    TensorFlow.init();
+    try {
+      // Ensure that TensorFlow native library and classes are ready to be used
+      Class.forName("org.tensorflow.TensorFlow");
+    } catch (ClassNotFoundException e) {
+      throw new RuntimeException(e);
+    }
   }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/TensorFlow.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/TensorFlow.java
@@ -32,6 +32,7 @@
 
 /** Static utility methods describing the TensorFlow runtime. */
 public final class TensorFlow {
+
   /** Returns the version of the underlying TensorFlow runtime. */
   public static String version() {
     return TF_Version().getString();
@@ -106,7 +107,7 @@ private static OpList libraryOpList(TF_Library handle) {
   private TensorFlow() {}
 
   /** Load the TensorFlow runtime C library. */
-  static void init() {
+  static {
     try {
       NativeLibrary.load();
     } catch (Exception e) {
@@ -121,8 +122,4 @@ static void init() {
       throw e;
     }
   }
-
-  static {
-    init();
-  }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/buffer/ByteSequenceTensorBuffer.java b/tensorflow-core/tensorflow-core-api/src/main/java/org/tensorflow/internal/buffer/ByteSequenceTensorBuffer.java
@@ -28,6 +28,7 @@
 import org.bytedeco.javacpp.Loader;
 import org.bytedeco.javacpp.Pointer;
 import org.bytedeco.javacpp.PointerScope;
+import org.tensorflow.TensorFlow;
 import org.tensorflow.ndarray.buffer.DataBuffer;
 import org.tensorflow.internal.c_api.TF_TString;
 import org.tensorflow.ndarray.impl.buffer.AbstractDataBuffer;
@@ -132,4 +133,13 @@ void writeNext(byte[] bytes) {
   }
 
   private final TF_TString data;
+
+  static {
+    try {
+      // Ensure that TensorFlow native library and classes are ready to be used
+      Class.forName("org.tensorflow.TensorFlow");
+    } catch (ClassNotFoundException e) {
+      throw new RuntimeException(e);
+    }
+  }
 }
diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/WrongEnvTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/WrongEnvTest.java
@@ -20,7 +20,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tensorflow.op.Ops;
 import org.tensorflow.types.TInt32;
 
diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/BooleanMaskTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/BooleanMaskTest.java
@@ -18,7 +18,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tensorflow.Graph;
 import org.tensorflow.Operand;
 import org.tensorflow.Session;
@@ -29,6 +29,7 @@
 import org.tensorflow.types.TInt32;
 
 public class BooleanMaskTest {
+
   @Test
   public void testBooleanMask(){
     try (Graph g = new Graph();
@@ -43,24 +44,24 @@ public void testBooleanMask(){
       Operand<TInt32> output1 = BooleanMask.create(scope, input, mask);
       Operand<TInt32> output2 = BooleanMask.create(scope, input2, mask, BooleanMask.axis(1));
 
-      try (TFloat32 result = (TFloat32) sess.runner().fetch(output1).run().get(0)) {
+      try (TInt32 result = (TInt32) sess.runner().fetch(output1).run().get(0)) {
         // expected shape from Python tensorflow
         assertEquals(Shape.of(5), result.shape());
-        assertEquals(0, result.getFloat(0));
-        assertEquals(1, result.getFloat(1));
-        assertEquals(4, result.getFloat(2));
-        assertEquals(5, result.getFloat(3));
-        assertEquals(6, result.getFloat(4));
+        assertEquals(0, result.getInt(0));
+        assertEquals(1, result.getInt(1));
+        assertEquals(4, result.getInt(2));
+        assertEquals(5, result.getInt(3));
+        assertEquals(6, result.getInt(4));
       }
 
-      try (TFloat32 result = (TFloat32) sess.runner().fetch(output2).run().get(0)) {
+      try (TInt32 result = (TInt32) sess.runner().fetch(output2).run().get(0)) {
         // expected shape from Python tensorflow
-        assertEquals(Shape.of(5), result.shape());
-        assertEquals(0, result.getFloat(0));
-        assertEquals(1, result.getFloat(1));
-        assertEquals(4, result.getFloat(2));
-        assertEquals(5, result.getFloat(3));
-        assertEquals(6, result.getFloat(4));
+        assertEquals(Shape.of(1, 5), result.shape());
+        assertEquals(0, result.getInt(0, 0));
+        assertEquals(1, result.getInt(0, 1));
+        assertEquals(4, result.getInt(0, 2));
+        assertEquals(5, result.getInt(0, 3));
+        assertEquals(6, result.getInt(0, 4));
       }
     }
   }
diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/BooleanMaskUpdateTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/BooleanMaskUpdateTest.java
@@ -19,7 +19,8 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.List;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
 import org.tensorflow.Graph;
 import org.tensorflow.Operand;
 import org.tensorflow.Session;
diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/IndexingTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/op/core/IndexingTest.java
@@ -17,7 +17,7 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.tensorflow.Graph;
 import org.tensorflow.Session;
 import org.tensorflow.ndarray.Shape;
diff --git a/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TStringTest.java b/tensorflow-core/tensorflow-core-api/src/test/java/org/tensorflow/types/TStringTest.java
@@ -23,7 +23,9 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.nio.charset.StandardCharsets;
+
 import org.bytedeco.javacpp.Pointer;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.tensorflow.ndarray.NdArray;
 import org.tensorflow.ndarray.NdArrays;
@@ -39,16 +41,15 @@ public void createScalar() {
     assertEquals("Pretty vacant", tensor.getObject());
   }
 
-    @Test
-    public void createrScalarLongerThan127() {
-        TString tensor = TString.scalarOf("Long String 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 !");
-        assertNotNull(tensor);
-        assertEquals(Shape.scalar(), tensor.shape());
-        assertEquals("Long String 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 !", tensor.getObject());
-    }
-
+  @Test
+  public void createrScalarLongerThan127() {
+    TString tensor = TString.scalarOf("Long String 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 !");
+    assertNotNull(tensor);
+    assertEquals(Shape.scalar(), tensor.shape());
+    assertEquals("Long String 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 !", tensor.getObject());
+  }
 
-    @Test
+  @Test
   public void createVector() {
     TString tensor = TString.vectorOf("Pretty", "vacant");
     assertNotNull(tensor);
@@ -106,6 +107,7 @@ public void initializingTensorWithRawBytes() {
   }
 
   @Test
+  @Disabled // FIXME This test does not deterministically succeed, so skip it by default
   public void testNoLeaks() throws Exception {
     // warm up and try to get all JIT compilation done to stabilize memory usage...
     for (int i = 0; i < 1000; i++) {

Original file line number	Diff line number	Diff line change
`@@ -404,6 +404,11 @@ private static void delete(TFE_Context handle) {`
`404`	`404`	`}`
`405`	`405`
`406`	`406`	`static {`
`407`		`- TensorFlow.init();`
	`407`	`+ try {`
	`408`	`+ // Ensure that TensorFlow native library and classes are ready to be used`
	`409`	`+ Class.forName("org.tensorflow.TensorFlow");`
	`410`	`+ } catch (ClassNotFoundException e) {`
	`411`	`+ throw new RuntimeException(e);`
	`412`	`+ }`
`408`	`413`	`}`
`409`	`414`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1070,6 +1070,11 @@ private static SaverDef addVariableSaver(Graph graph) {`
`1070`	`1070`	`}`
`1071`	`1071`
`1072`	`1072`	`static {`
`1073`		`- TensorFlow.init();`
	`1073`	`+ try {`
	`1074`	`+ // Ensure that TensorFlow native library and classes are ready to be used`
	`1075`	`+ Class.forName("org.tensorflow.TensorFlow");`
	`1076`	`+ } catch (ClassNotFoundException e) {`
	`1077`	`+ throw new RuntimeException(e);`
	`1078`	`+ }`
`1074`	`1079`	`}`
`1075`	`1080`	`}`
Original file line number	Diff line number	Diff line change
`@@ -228,6 +228,11 @@ private static long[] shape(TF_Tensor handle) {`
`228`	`228`	`private ByteDataBuffer buffer = null;`
`229`	`229`
`230`	`230`	`static {`
`231`		`- TensorFlow.init();`
	`231`	`+ try {`
	`232`	`+ // Ensure that TensorFlow native library and classes are ready to be used`
	`233`	`+ Class.forName("org.tensorflow.TensorFlow");`
	`234`	`+ } catch (ClassNotFoundException e) {`
	`235`	`+ throw new RuntimeException(e);`
	`236`	`+ }`
`232`	`237`	`}`
`233`	`238`	`}`
Original file line number	Diff line number	Diff line change
`@@ -435,6 +435,11 @@ private static void validateTags(String[] tags) {`
`435`	`435`	`}`
`436`	`436`
`437`	`437`	`static {`
`438`		`- TensorFlow.init();`
	`438`	`+ try {`
	`439`	`+ // Ensure that TensorFlow native library and classes are ready to be used`
	`440`	`+ Class.forName("org.tensorflow.TensorFlow");`
	`441`	`+ } catch (ClassNotFoundException e) {`
	`442`	`+ throw new RuntimeException(e);`
	`443`	`+ }`
`439`	`444`	`}`
`440`	`445`	`}`
Original file line number	Diff line number	Diff line change
`@@ -178,6 +178,11 @@ private static void delete(TF_Server nativeHandle) {`
`178`	`178`	`private int numJoining;`
`179`	`179`
`180`	`180`	`static {`
`181`		`- TensorFlow.init();`
	`181`	`+ try {`
	`182`	`+ // Ensure that TensorFlow native library and classes are ready to be used`
	`183`	`+ Class.forName("org.tensorflow.TensorFlow");`
	`184`	`+ } catch (ClassNotFoundException e) {`
	`185`	`+ throw new RuntimeException(e);`
	`186`	`+ }`
`182`	`187`	`}`
`183`	`188`	`}`