From 539de53a75d9daebda8f3fc8e5ad0e04d1dfa06e Mon Sep 17 00:00:00 2001 From: Mark Daoust Date: Tue, 17 Sep 2019 10:00:05 -0700 Subject: [PATCH] Replace all "tensorflow/contrib/android => tensorflow/tools/android/inference_interface" This is still deprecated but needs to be moved out of contrib (contrib is being deleted). PiperOrigin-RevId: 269592570 --- tensorflow/contrib/cmake/python_modules.txt | 14 +++++++------- tensorflow/contrib/makefile/README.md | 6 +++--- .../makefile/sub_makefiles/android/Makefile.in | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tensorflow/contrib/cmake/python_modules.txt b/tensorflow/contrib/cmake/python_modules.txt index ae6f77238c5..7b7d5526f7f 100644 --- a/tensorflow/contrib/cmake/python_modules.txt +++ b/tensorflow/contrib/cmake/python_modules.txt @@ -83,13 +83,13 @@ tensorflow/tools/graph_transforms tensorflow/contrib tensorflow/contrib/all_reduce tensorflow/contrib/all_reduce/python -tensorflow/contrib/android -tensorflow/contrib/android/java -tensorflow/contrib/android/java/org -tensorflow/contrib/android/java/org/tensorflow -tensorflow/contrib/android/java/org/tensorflow/contrib -tensorflow/contrib/android/java/org/tensorflow/contrib/android -tensorflow/contrib/android/jni +tensorflow/tools/android/inference_interface +tensorflow/tools/android/inference_interface/java +tensorflow/tools/android/inference_interface/java/org +tensorflow/tools/android/inference_interface/java/org/tensorflow +tensorflow/tools/android/inference_interface/java/org/tensorflow/contrib +tensorflow/tools/android/inference_interface/java/org/tensorflow/tools/android/inference_interface +tensorflow/tools/android/inference_interface/jni tensorflow/contrib/batching tensorflow/contrib/batching/python tensorflow/contrib/batching/python/ops diff --git a/tensorflow/contrib/makefile/README.md b/tensorflow/contrib/makefile/README.md index 7ace5d970ac..a7b8113f597 100644 --- a/tensorflow/contrib/makefile/README.md +++ b/tensorflow/contrib/makefile/README.md @@ -176,8 +176,8 @@ Build the native binaries first as above. Then, build the aar and package the na mkdir -p /tmp/tf/jni/arm64-v8a cp tensorflow/contrib/makefile/gen/lib/android_tegra/libtensorflow_*.so /tmp/tf/jni/arm64-v8a/ cp $TEGRA_LIBS /tmp/tf/jni/arm64-v8a -bazel build //tensorflow/contrib/android:android_tensorflow_inference_java.aar -cp bazel-bin/tensorflow/contrib/android/android_tensorflow_inference_java.aar /tmp/tf/tensorflow.aar +bazel build //tensorflow/tools/android/inference_interface:android_tensorflow_inference_java.aar +cp bazel-bin/tensorflow/tools/android/inference_interface/android_tensorflow_inference_java.aar /tmp/tf/tensorflow.aar cd /tmp/tf chmod +w tensorflow.aar zip -ur tensorflow.aar $(find jni -name *.so) @@ -188,7 +188,7 @@ Build binaries first as above, then edit tensorflow/examples/android/BUILD and r ``` srcs = [ ":libtensorflow_demo.so", - "//tensorflow/contrib/android:libtensorflow_inference.so", + "//tensorflow/tools/android/inference_interface:libtensorflow_inference.so", ], ``` with: diff --git a/tensorflow/contrib/makefile/sub_makefiles/android/Makefile.in b/tensorflow/contrib/makefile/sub_makefiles/android/Makefile.in index 3081084ee76..f7bb4934946 100644 --- a/tensorflow/contrib/makefile/sub_makefiles/android/Makefile.in +++ b/tensorflow/contrib/makefile/sub_makefiles/android/Makefile.in @@ -28,7 +28,7 @@ # This library provides TensorFlow support on Android via the Java API and # TensorFlowInferenceInterface. # It should be packaged into the Android APK along with the Java counterparts -# under tensorflow/java and tensorflow/contrib/android/java. +# under tensorflow/java and tensorflow/tools/android/inference_interface/java. INFERENCE_SRCS := \ tensorflow/c/tf_status_helper.cc \ tensorflow/c/checkpoint_reader.cc \ @@ -41,7 +41,7 @@ tensorflow/java/src/main/native/operation_jni.cc \ tensorflow/java/src/main/native/session_jni.cc \ tensorflow/java/src/main/native/tensorflow_jni.cc \ tensorflow/java/src/main/native/tensor_jni.cc \ -tensorflow/contrib/android/jni/run_stats_jni.cc +tensorflow/tools/android/inference_interface/jni/run_stats_jni.cc INFERENCE_OBJS := $(addprefix $(OBJDIR), $(INFERENCE_SRCS:.cc=.o))