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

Replace all "tensorflow/contrib/android => tensorflow/tools/android/inference_interface"

Browse Source 
This is still deprecated but needs to be moved out of contrib (contrib is being deleted).

PiperOrigin-RevId: 269592570
This commit is contained in:
Mark Daoust 2019-09-17 10:00:05 -07:00 committed by TensorFlower Gardener
parent 2f5451a726
commit 539de53a75
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tensorflow/contrib/cmake/python_modules.txt
View File

@ -83,13 +83,13 @@ tensorflow/tools/graph_transforms
tensorflow/contrib tensorflow/contrib
tensorflow/contrib/all_reduce tensorflow/contrib/all_reduce
tensorflow/contrib/all_reduce/python tensorflow/contrib/all_reduce/python
tensorflow/contrib/android tensorflow/tools/android/inference_interface
tensorflow/contrib/android/java tensorflow/tools/android/inference_interface/java
tensorflow/contrib/android/java/org tensorflow/tools/android/inference_interface/java/org
tensorflow/contrib/android/java/org/tensorflow tensorflow/tools/android/inference_interface/java/org/tensorflow
tensorflow/contrib/android/java/org/tensorflow/contrib tensorflow/tools/android/inference_interface/java/org/tensorflow/contrib
tensorflow/contrib/android/java/org/tensorflow/contrib/android tensorflow/tools/android/inference_interface/java/org/tensorflow/tools/android/inference_interface
tensorflow/contrib/android/jni tensorflow/tools/android/inference_interface/jni
tensorflow/contrib/batching tensorflow/contrib/batching
tensorflow/contrib/batching/python tensorflow/contrib/batching/python
tensorflow/contrib/batching/python/ops tensorflow/contrib/batching/python/ops

6
tensorflow/contrib/makefile/README.md
View File

@ -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 mkdir -p /tmp/tf/jni/arm64-v8a
cp tensorflow/contrib/makefile/gen/lib/android_tegra/libtensorflow_*.so /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 cp $TEGRA_LIBS /tmp/tf/jni/arm64-v8a
bazel build //tensorflow/contrib/android:android_tensorflow_inference_java.aar bazel build //tensorflow/tools/android/inference_interface:android_tensorflow_inference_java.aar
cp bazel-bin/tensorflow/contrib/android/android_tensorflow_inference_java.aar /tmp/tf/tensorflow.aar cp bazel-bin/tensorflow/tools/android/inference_interface/android_tensorflow_inference_java.aar /tmp/tf/tensorflow.aar
cd /tmp/tf cd /tmp/tf
chmod +w tensorflow.aar chmod +w tensorflow.aar
zip -ur tensorflow.aar $(find jni -name *.so) 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 = [ srcs = [
":libtensorflow_demo.so", ":libtensorflow_demo.so",
"//tensorflow/contrib/android:libtensorflow_inference.so", "//tensorflow/tools/android/inference_interface:libtensorflow_inference.so",
], ],
``` ```
with: with:

4
tensorflow/contrib/makefile/sub_makefiles/android/Makefile.in
View File

@ -28,7 +28,7 @@
# This library provides TensorFlow support on Android via the Java API and # This library provides TensorFlow support on Android via the Java API and
# TensorFlowInferenceInterface. # TensorFlowInferenceInterface.
# It should be packaged into the Android APK along with the Java counterparts # 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 := \ INFERENCE_SRCS := \
tensorflow/c/tf_status_helper.cc \ tensorflow/c/tf_status_helper.cc \
tensorflow/c/checkpoint_reader.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/session_jni.cc \
tensorflow/java/src/main/native/tensorflow_jni.cc \ tensorflow/java/src/main/native/tensorflow_jni.cc \
tensorflow/java/src/main/native/tensor_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)) INFERENCE_OBJS := $(addprefix $(OBJDIR), $(INFERENCE_SRCS:.cc=.o))