diff --git a/android/build.gradle b/android/build.gradle index 28c92ed..5daebaf 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -12,12 +12,12 @@ buildscript { apply plugin: 'com.android.library' android { - compileSdkVersion 23 + compileSdkVersion 26 buildToolsVersion "26.0.1" defaultConfig { minSdkVersion 16 - targetSdkVersion 22 + targetSdkVersion 26 versionCode 1 versionName "1.0" } @@ -38,5 +38,5 @@ allprojects { dependencies { compile 'com.facebook.react:react-native:+' - compile 'org.tensorflow:tensorflow-android:1.3.0' + compile 'org.tensorflow:tensorflow-android:+' } diff --git a/android/src/main/java/com/rntensorflow/RNTensorFlowInferenceModule.java b/android/src/main/java/com/rntensorflow/RNTensorFlowInferenceModule.java index 713c81d..b0f72df 100755 --- a/android/src/main/java/com/rntensorflow/RNTensorFlowInferenceModule.java +++ b/android/src/main/java/com/rntensorflow/RNTensorFlowInferenceModule.java @@ -89,10 +89,10 @@ public void feed(String id, ReadableMap data, Promise promise) { inference.feed(inputName, Tensor.create(shape, IntBuffer.wrap(srcData))); } else if(dtype == DataType.BOOL) { byte[] srcData = readableArrayToByteBoolArray(data.getArray("data")); - inference.feed(inputName, Tensor.create(dtype, shape, ByteBuffer.wrap(srcData))); + inference.feed(inputName, Tensor.create(Boolean.class, shape, ByteBuffer.wrap(srcData))); } else if(dtype == DataType.STRING) { byte[] srcData = readableArrayToByteStringArray(data.getArray("data")); - inference.feed(inputName, Tensor.create(dtype, shape, ByteBuffer.wrap(srcData))); + inference.feed(inputName, Tensor.create(String.class, shape, ByteBuffer.wrap(srcData))); } else { promise.reject(new IllegalArgumentException("Data type is not supported")); return; diff --git a/android/src/main/java/com/rntensorflow/RNTensorflowInference.java b/android/src/main/java/com/rntensorflow/RNTensorflowInference.java index 0aa9674..2ac368b 100644 --- a/android/src/main/java/com/rntensorflow/RNTensorflowInference.java +++ b/android/src/main/java/com/rntensorflow/RNTensorflowInference.java @@ -64,7 +64,7 @@ public void run(String[] outputNames, boolean enableStats) { for (String outputName : outputNames) { tfContext.runner.fetch(outputName); } - List tensors = tfContext.runner.run(); + List> tensors = tfContext.runner.run(); tfContext.outputTensors.clear(); for (int i = 0; i < outputNames.length; i++) {