experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid hard coding in NativeLibrary.getMajorVersionNumber

Browse Source
This commit is contained in:
sharkdtu 2019-11-20 21:48:46 +08:00
parent 2ffb2fbed3
commit deb4d14153
2 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tensorflow/java/BUILD
View File

@ -5,6 +5,7 @@ load(":build_defs.bzl", "JAVACOPTS")
load(":src/gen/gen_ops.bzl", "tf_java_op_gen_srcjar") load(":src/gen/gen_ops.bzl", "tf_java_op_gen_srcjar")
load( load(
"//tensorflow:tensorflow.bzl", "//tensorflow:tensorflow.bzl",
"VERSION",
"tf_binary_additional_srcs", "tf_binary_additional_srcs",
"tf_cc_binary", "tf_cc_binary",
"tf_cc_test", "tf_cc_test",
@ -27,9 +28,26 @@ java_library(
data = tf_binary_additional_srcs() + [":libtensorflow_jni"], data = tf_binary_additional_srcs() + [":libtensorflow_jni"],
javacopts = JAVACOPTS, javacopts = JAVACOPTS,
plugins = [":processor"], plugins = [":processor"],
resources = [":java_resources"],
visibility = ["//visibility:public"], visibility = ["//visibility:public"],
) )
genrule(
name = "version-info",
outs = ["src/main/resources/tensorflow-version-info"],
cmd = "echo version=%s > $@" % VERSION,
output_to_bindir = 1,
)
filegroup(
name = "java_resources",
srcs = [":version-info"],
visibility = [
"//tensorflow/contrib/android:__pkg__",
"//tensorflow/java:__pkg__",
],
)
# NOTE(ashankar): Rule to include the Java API in the Android Inference Library # NOTE(ashankar): Rule to include the Java API in the Android Inference Library
# .aar. At some point, might make sense for a .aar rule here instead. # .aar. At some point, might make sense for a .aar rule here instead.
filegroup( filegroup(

34
tensorflow/java/src/main/java/org/tensorflow/NativeLibrary.java
View File

@ -19,6 +19,7 @@ import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Properties;
/** /**
* Helper class for loading the TensorFlow Java native library. * Helper class for loading the TensorFlow Java native library.
@ -169,19 +170,30 @@ final class NativeLibrary {
* determined. * determined.
*/ */
private static String getMajorVersionNumber() { private static String getMajorVersionNumber() {
// getImplementationVersion() retrun null. InputStream resourceStream = NativeLibrary.class.getClassLoader()
String version = NativeLibrary.class.getPackage().getImplementationVersion(); .getResourceAsStream("tensorflow-version-info");
// expecting a string like 1.14.0, we want to get the first '1'. if (resourceStream == null) {
int dotIndex; return null;
if (version == null || (dotIndex = version.indexOf('.')) == -1) {
// we want to get the version 1.
return "1";
} }
String majorVersion = version.substring(0, dotIndex);
try { try {
Integer.parseInt(majorVersion); Properties props = new Properties();
return majorVersion; props.load(resourceStream);
} catch (NumberFormatException unused) { String version = props.getProperty("version");
// expecting a string like 1.14.0, we want to get the first '1'.
int dotIndex;
if (version == null || (dotIndex = version.indexOf('.')) == -1) {
return null;
}
String majorVersion = version.substring(0, dotIndex);
try {
Integer.parseInt(majorVersion);
return majorVersion;
} catch (NumberFormatException unused) {
return null;
}
} catch (IOException e) {
log("failed to load tensorflow version info.");
return null; return null;
} }
} }