-
Notifications
You must be signed in to change notification settings - Fork 70
tests: Add protobuf 3.x compatibility tests with a third party library tensorflow #4082
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+102
−0
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
...gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITProtobuf3Compatibility.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| package com.google.showcase.v1beta1.it; | ||
|
|
||
| import static com.google.common.truth.Truth.assertThat; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
| import org.tensorflow.Graph; | ||
| import org.tensorflow.Session; | ||
| import org.tensorflow.op.Ops; | ||
| import org.tensorflow.op.core.Constant; | ||
| import org.tensorflow.op.math.Add; | ||
| import org.tensorflow.proto.GraphDef; | ||
| import org.tensorflow.types.TInt32; | ||
|
|
||
| /** | ||
| * Tensorflow depends on protobuf 3.x gen code and runtime, we test it in showcase module to prove | ||
| * that it works with protobuf 4.33+ gen code and runtime that comes with client libraries. | ||
| */ | ||
| class ITProtobuf3Compatibility { | ||
|
|
||
| @Test | ||
| void testTensorflow_helloWorldExample() { | ||
| try (Graph graph = new Graph()) { | ||
| // Hello world example for "10 + 32" operation. | ||
| Ops tf = Ops.create(graph); | ||
|
|
||
| int expectedValue1 = 10; | ||
| int expectedValue2 = 32; | ||
| int expectedSum = 42; | ||
|
|
||
| String name1 = "constant1"; | ||
| String name2 = "constant2"; | ||
|
|
||
| Constant<TInt32> constant1 = tf.withName(name1).constant(expectedValue1); | ||
| Constant<TInt32> constant2 = tf.withName(name2).constant(expectedValue2); | ||
|
|
||
| Add<TInt32> sum = tf.math.add(constant1, constant2); | ||
|
|
||
| try (Session s = new Session(graph)) { | ||
| try (TInt32 result = (TInt32) s.runner().fetch(sum).run().get(0)) { | ||
| int actualResult = result.getInt(); | ||
| assertThat(actualResult).isEqualTo(expectedSum); | ||
| } | ||
| } | ||
|
|
||
| // GraphDef is a protobuf gen code. | ||
| GraphDef graphDef = graph.toGraphDef(); | ||
|
|
||
| // Inspect the protobuf gen code | ||
| Integer actual1 = getValueFromGraphDefByName(graphDef, name1); | ||
| Integer actual2 = getValueFromGraphDefByName(graphDef, name2); | ||
|
|
||
| assertThat(actual1).isEqualTo(expectedValue1); | ||
| assertThat(actual2).isEqualTo(expectedValue2); | ||
| } | ||
| } | ||
|
|
||
| private static Integer getValueFromGraphDefByName(GraphDef graphDef, String name1) { | ||
| return graphDef.getNodeList().stream() | ||
| .filter(nodeDef -> nodeDef.getName().equals(name1)) | ||
| .findFirst() | ||
| .get() | ||
| .getAttrOrThrow("value") | ||
| .getTensor() | ||
| .getIntValList() | ||
| .get(0); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The current implementation of
getValueFromGraphDefByNameuses.get()on anOptionaland.get(0)on aListwithout checking for presence or emptiness. This can lead toNoSuchElementExceptionorIndexOutOfBoundsExceptionif the expected node or value is not found, which can make debugging test failures difficult. UsingorElseThrowwith a descriptive message would provide more informative error messages.Additionally, the parameter name
name1is a bit specific for a general-purpose helper method. Renaming it tonamewould improve clarity.I've suggested a change that addresses both points, making the method more robust and readable.