updated to 1.15.2

pom.xml

@@ -8,12 +8,12 @@
 	<dependency>
 	  <groupId>org.tensorflow</groupId>
 	  <artifactId>libtensorflow</artifactId>
-	  <version>1.15.0</version>
+	  <version>1.15.2</version>
 	</dependency>
 	<dependency>
 	  <groupId>org.tensorflow</groupId>
 	  <artifactId>libtensorflow_jni_gpu</artifactId>
-	  <version>1.15.0</version>
+	  <version>1.15.2</version>
 	</dependency>
 	<!-- https://mvnrepository.com/artifact/org.tensorflow/proto -->
 	<dependency>

src/main/java/tfhello.java

@@ -155,9 +155,9 @@ public class tfhello{
 		System.out.println(TensorFlow.version());
 		System.out.println("Test 3 end\n");
 				
-		System.out.println("Test 4 start\n  - Test simple custom JNI function added to TF");
-		System.out.println(TensorFlow.elphelVersion());
-		System.out.println("Test 4 end\n");
+		//System.out.println("Test 4 start\n  - Test simple custom JNI function added to TF");
+		//System.out.println(TensorFlow.elphelVersion());
+		//System.out.println("Test 4 end\n");
 				
 		//callableOpts.newBuilder().putFeedDevices(key, value);
 		
@@ -220,14 +220,14 @@ public class tfhello{
 	        	
 	        	// natively got GPU device name to insert into options
 	        	// it's the same all the time
-	        	String gpuDeviceName = s.elphelGPUDeviceName();
+	        	String gpuDeviceName = s.GPUDeviceName();
 	        	
 	    		// GPU allocation: dims must be power of 2?
-	    		Tensor t3 = Tensor.elphelCreateGPUTensor(new long[]{256},DataType.FLOAT);
+	    		Tensor t3 = Tensor.createGPU(new long[]{256},DataType.FLOAT);
 	    		//System.out.println(t2.nativeRef);
 	    	
 	    		// Let's check what happended
-	    		long t3_gpuptr = t3.elphel_GetGPUTensorPointer();
+	    		long t3_gpuptr = t3.GPUPointer();
 	    		// Print address
 	    		//System.out.println("Pointer address: "+String.format("0x%08x", t3_gpuptr));
 	    		
@@ -276,8 +276,8 @@ public class tfhello{
 	    		System.out.println(callableOpts);
 	    		
 	    		// callable handle
-	    		long feed_gpu_fetch_cpu = s.MakeCallable(callableOpts.toByteArray());
-	    		Tensor<?> t3out = s.runner().fetch("array_tensor_out").feed("array_tensor_in",t3).runElphelCallable(feed_gpu_fetch_cpu).get(0);
+	    		long feed_gpu_fetch_cpu = s.makeCallable(callableOpts.toByteArray());
+	    		Tensor<?> t3out = s.runner().fetch("array_tensor_out").feed("array_tensor_in",t3).runCallable(feed_gpu_fetch_cpu).get(0);
 	    		System.out.println(t3);
 	    		System.out.println(t3out);
 	    		

tf_jni/TensorFlow.java

-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-package org.tensorflow;
-
-/** Static utility methods describing the TensorFlow runtime. */
-public final class TensorFlow {
-  /** Returns the version of the underlying TensorFlow runtime. */
-  public static native String version();
-
-  /** Returns the version of the underlying TensorFlow runtime. */
-  public static native String elphelVersion();
-
-  /**
-   * All the TensorFlow operations available in this address space.
-   *
-   * @return A serialized representation of an <a
-   *     href="https://www.tensorflow.org/code/tensorflow/core/framework/op_def.proto">OpList</a>
-   *     protocol buffer, which lists all the available TensorFlow operations.
-   */
-  public static native byte[] registeredOpList();
-
-  /**
-   * Load the dynamic library in filename and register the operations and kernels present in that
-   * library.
-   *
-   * @param filename Path of the dynamic library containing operations and kernels to load.
-   * @return Serialized bytes of the <a
-   *     href="https://www.tensorflow.org/code/tensorflow/core/framework/op_def.proto">OpList</a>
-   *     protocol buffer message defining the operations defined in the library.
-   * @throws UnsatisfiedLinkError if filename cannot be loaded.
-   */
-  public static byte[] loadLibrary(String filename) {
-    long h = 0;
-    try {
-      h = libraryLoad(filename);
-    } catch (RuntimeException e) {
-      throw new UnsatisfiedLinkError(e.getMessage());
-    }
-    try {
-      return libraryOpList(h);
-    } finally {
-      libraryDelete(h);
-    }
-  }
-
-  private static native long libraryLoad(String filename);
-
-  private static native void libraryDelete(long handle);
-
-  private static native byte[] libraryOpList(long handle);
-
-  private TensorFlow() {}
-
-  /** Load the TensorFlow runtime C library. */
-  static void init() {
-    try {
-      NativeLibrary.load();
-    } catch (Exception e) {
-      /*
-       * This code is called during static initialization of this and of other classes.
-       * If this fails then a NoClassDefFoundError is thrown however this does not
-       * include a cause. Printing the exception manually here ensures that the
-       * necessary information to fix the problem is available.
-       */
-      System.err.println("Failed to load TensorFlow native library");
-      e.printStackTrace();
-      throw e;
-    }
-  }
-
-  static {
-    init();
-  }
-}

tf_jni/session_jni.h

-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#ifndef TENSORFLOW_JAVA_SRC_MAIN_NATIVE_SESSION_JNI_H_
-#define TENSORFLOW_JAVA_SRC_MAIN_NATIVE_SESSION_JNI_H_
-
-#include <jni.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Class:     org_tensorflow_Session
- * Method:    allocate
- * Signature: (J)J
- */
-JNIEXPORT jlong JNICALL Java_org_tensorflow_Session_allocate(JNIEnv *, jclass,
-                                                             jlong);
-
-/*
- * Class:     org_tensorflow_Session
- * Method:    allocate2
- * Signature: (JLjava/lang/String;[B)J
- */
-JNIEXPORT jlong JNICALL Java_org_tensorflow_Session_allocate2(JNIEnv *, jclass,
-                                                              jlong, jstring,
-                                                              jbyteArray);
-
-/*
- * Class:     org_tensorflow_Session
- * Method:    delete
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_org_tensorflow_Session_delete(JNIEnv *, jclass,
-                                                          jlong);
-
-/*
- * Class:     org_tensorflow_Session
- * Method:    run
- * Signature: (J[B[J[J[I[J[I[JZ[J)[B
- */
-JNIEXPORT jbyteArray JNICALL Java_org_tensorflow_Session_run(
-    JNIEnv *, jclass, jlong, jbyteArray, jlongArray, jlongArray, jintArray,
-    jlongArray, jintArray, jlongArray, jboolean, jlongArray);
-
-
-JNIEXPORT jstring JNICALL Java_org_tensorflow_Session_elphelGetGPUDeviceName(
-    JNIEnv*, jclass, jlong handle);
-
-JNIEXPORT jlong JNICALL Java_org_tensorflow_Session_elphelMakeCallable(
-    JNIEnv*, jclass, jlong, jbyteArray);
-
-JNIEXPORT jbyteArray JNICALL Java_org_tensorflow_Session_elphelRunCallable(
-	JNIEnv*, jclass, jlong, jlong, jlongArray, jlongArray);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif  // __cplusplus
-#endif  // TENSORFLOW_JAVA_SRC_MAIN_NATIVE_SESSION_JNI_H_

tf_jni/tensor_jni.h

-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#ifndef TENSORFLOW_JAVA_SRC_MAIN_NATIVE_TENSOR_JNI_H_
-#define TENSORFLOW_JAVA_SRC_MAIN_NATIVE_TENSOR_JNI_H_
-
-#include <jni.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Class:     org_tensorflow_Tensor
- * Method:    allocate
- * Signature: (I[JJ)J
- */
-JNIEXPORT jlong JNICALL Java_org_tensorflow_Tensor_allocate(JNIEnv *, jclass,
-                                                            jint, jlongArray,
-                                                            jlong);
-
-JNIEXPORT jlong JNICALL Java_org_tensorflow_Tensor_elphelAllocateGPUTensor(JNIEnv *, jclass,
-                                                            jlongArray, jint);
-
-
-JNIEXPORT jlong JNICALL Java_org_tensorflow_Tensor_elphelGetGPUTensorPointer(JNIEnv*, jclass,
-                                                            jlong);
-
-/*
- * Class:     org_tensorflow_Tensor
- * Method:    allocateScalarBytes
- * Signature: ([B)J
- */
-JNIEXPORT jlong JNICALL
-Java_org_tensorflow_Tensor_allocateScalarBytes(JNIEnv *, jclass, jbyteArray);
-
-/*
- * Class:     org_tensorflow_Tensor
- * Method:    allocateNonScalarBytes
- * Signature: ([J[Ljava/lang/Object;)J
- */
-JNIEXPORT jlong JNICALL Java_org_tensorflow_Tensor_allocateNonScalarBytes(
-    JNIEnv *, jclass, jlongArray, jobjectArray);
-
-/*
- * Class:     org_tensorflow_Tensor
- * Method:    delete
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_org_tensorflow_Tensor_delete(JNIEnv *, jclass,
-                                                         jlong);
-
-/*
- * Class:     org_tensorflow_Tensor
- * Method:    buffer
- * Signature: (J)Ljava/nio/ByteBuffer;
- */
-JNIEXPORT jobject JNICALL Java_org_tensorflow_Tensor_buffer(JNIEnv *, jclass,
-                                                            jlong);
-
-/*
- * Class:     org_tensorflow_Tensor
- * Method:    dtype
- * Signature: (J)I
- */
-JNIEXPORT jint JNICALL Java_org_tensorflow_Tensor_dtype(JNIEnv *, jclass,
-                                                        jlong);
-
-/*
- * Class:     org_tensorflow_Tensor
- * Method:    shape
- * Signature: (J)[J
- */
-JNIEXPORT jlongArray JNICALL Java_org_tensorflow_Tensor_shape(JNIEnv *, jclass,
-                                                              jlong);
-
-/*
- * Class:     org_tensorflow_Tensor
- * Method:    setValue
- * Signature: (JLjava/lang/Object;)V
- *
- * REQUIRES: The jobject's type and shape are compatible the with the DataType
- * and shape of the Tensor referred to by the jlong handle.
- */
-JNIEXPORT void JNICALL Java_org_tensorflow_Tensor_setValue(JNIEnv *, jclass,
-                                                           jlong, jobject);
-
-/*
- * Class:     org_tensorflow_Tensor
- * Method:    scalarFloat
- * Signature: (J)F
- *
- */
-JNIEXPORT jfloat JNICALL Java_org_tensorflow_Tensor_scalarFloat(JNIEnv *,
-                                                                jclass, jlong);
-
-/*
- * Class:     org_tensorflow_Tensor
- * Method:    scalarDouble
- * Signature: (J)D
- */
-JNIEXPORT jdouble JNICALL Java_org_tensorflow_Tensor_scalarDouble(JNIEnv *,
-                                                                  jclass,
-                                                                  jlong);
-
-/*
- * Class:     org_tensorflow_Tensor
- * Method:    scalarInt
- * Signature: (J)I
- */
-JNIEXPORT jint JNICALL Java_org_tensorflow_Tensor_scalarInt(JNIEnv *, jclass,
-                                                            jlong);
-
-/*
- * Class:     org_tensorflow_Tensor
- * Method:    scalarLong
- * Signature: (J)J
- */
-JNIEXPORT jlong JNICALL Java_org_tensorflow_Tensor_scalarLong(JNIEnv *, jclass,
-                                                              jlong);
-
-/*
- * Class:     org_tensorflow_Tensor
- * Method:    scalarBoolean
- * Signature: (J)Z
- */
-JNIEXPORT jboolean JNICALL Java_org_tensorflow_Tensor_scalarBoolean(JNIEnv *,
-                                                                    jclass,
-                                                                    jlong);
-
-/*
- * Class:     org_tensorflow_Tensor
- * Method:    scalarBytes
- * Signature: (J)[B
- */
-JNIEXPORT jbyteArray JNICALL Java_org_tensorflow_Tensor_scalarBytes(JNIEnv *,
-                                                                    jclass,
-                                                                    jlong);
-
-/*
- * Class:     org_tensorflow_Tensor
- * Method:    readNDArray
- * Signature: (JLjava/lang/Object;)V
- */
-JNIEXPORT void JNICALL Java_org_tensorflow_Tensor_readNDArray(JNIEnv *, jclass,
-                                                              jlong, jobject);
-/*
-JNIEXPORT int JNICALL Java_org_tensorflow_Tensor_elphelIsCUDATensor(JNIEnv *,
-                                                                    jclass,
-                                                                    jlong);
-*/
-/*
-JNIEXPORT int JNICALL Java_org_tensorflow_Tensor_elphelTestCUDAPointer(JNIEnv *,
-                                                                        jclass);
-*/
-#ifdef __cplusplus
-}  // extern "C"
-#endif  // __cplusplus
-#endif  // TENSORFLOW_JAVA_SRC_MAIN_NATIVE_TENSOR_JNI_H_

tf_jni/tensorflow_jni.cc

-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#include "tensorflow/java/src/main/native/tensorflow_jni.h"
-
-#include <limits>
-#include "tensorflow/c/c_api.h"
-#include "tensorflow/java/src/main/native/exception_jni.h"
-
-JNIEXPORT jstring JNICALL Java_org_tensorflow_TensorFlow_version(JNIEnv* env,
-                                                                 jclass clazz) {
-  return env->NewStringUTF(TF_Version());
-}
-
-JNIEXPORT jstring JNICALL Java_org_tensorflow_TensorFlow_elphelVersion(JNIEnv* env,
-                                                                 jclass clazz) {
-  return env->NewStringUTF("Elphel TensorFlow JNI call 1.0");
-}
-
-JNIEXPORT jbyteArray JNICALL
-Java_org_tensorflow_TensorFlow_registeredOpList(JNIEnv* env, jclass clazz) {
-  TF_Buffer* buf = TF_GetAllOpList();
-  jint length = static_cast<int>(buf->length);
-  jbyteArray ret = env->NewByteArray(length);
-  env->SetByteArrayRegion(ret, 0, length, static_cast<const jbyte*>(buf->data));
-  TF_DeleteBuffer(buf);
-  return ret;
-}
-
-JNIEXPORT jlong JNICALL Java_org_tensorflow_TensorFlow_libraryLoad(
-    JNIEnv* env, jclass clazz, jstring filename) {
-  TF_Status* status = TF_NewStatus();
-  const char* cname = env->GetStringUTFChars(filename, nullptr);
-  TF_Library* h = TF_LoadLibrary(cname, status);
-  throwExceptionIfNotOK(env, status);
-  env->ReleaseStringUTFChars(filename, cname);
-  TF_DeleteStatus(status);
-  return reinterpret_cast<jlong>(h);
-}
-
-JNIEXPORT void JNICALL Java_org_tensorflow_TensorFlow_libraryDelete(
-    JNIEnv* env, jclass clazz, jlong handle) {
-  if (handle != 0) {
-    TF_DeleteLibraryHandle(reinterpret_cast<TF_Library*>(handle));
-  }
-}
-
-JNIEXPORT jbyteArray JNICALL Java_org_tensorflow_TensorFlow_libraryOpList(
-    JNIEnv* env, jclass clazz, jlong handle) {
-  TF_Buffer buf = TF_GetOpList(reinterpret_cast<TF_Library*>(handle));
-  if (buf.length > std::numeric_limits<jint>::max()) {
-    throwException(env, kIndexOutOfBoundsException,
-                   "Serialized OpList is too large for a byte[] array");
-    return nullptr;
-  }
-  auto ret_len = static_cast<jint>(buf.length);
-  jbyteArray ret = env->NewByteArray(ret_len);
-  env->SetByteArrayRegion(ret, 0, ret_len, static_cast<const jbyte*>(buf.data));
-  return ret;
-}

tf_jni/tensorflow_jni.h

-/* Copyright 2016 The TensorFlow Authors. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-==============================================================================*/
-
-#ifndef TENSORFLOW_JAVA_SRC_MAIN_NATIVE_TENSORFLOW_JNI_H_
-#define TENSORFLOW_JAVA_SRC_MAIN_NATIVE_TENSORFLOW_JNI_H_
-
-#include <jni.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif  // __cplusplus
-
-/*
- *  Class:     org_tensorflow_TensorFlow
- *  Method:    version
- *  Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_org_tensorflow_TensorFlow_version(JNIEnv *,
-                                                                 jclass);
-
-/*
- *  Class:     org_tensorflow_TensorFlow
- *  Method:    version2
- *  Signature: ()Ljava/lang/String;
- */
-JNIEXPORT jstring JNICALL Java_org_tensorflow_TensorFlow_elphelVersion(JNIEnv *,
-                                                                 jclass);
-
-/*
- * Class:     org_tensorflow_TensorFlow
- * Method:    registeredOpList
- * Signature: ()[B
- */
-JNIEXPORT jbyteArray JNICALL
-Java_org_tensorflow_TensorFlow_registeredOpList(JNIEnv *, jclass);
-
-/*
- * Class:     org_tensorflow_TensorFlow
- * Method:    libraryLoad
- * Signature: (Ljava/lang/String;)J
- */
-JNIEXPORT jlong JNICALL Java_org_tensorflow_TensorFlow_libraryLoad(JNIEnv *,
-                                                                   jclass,
-                                                                   jstring);
-
-/*
- * Class:     org_tensorflow_TensorFlow
- * Method:    libraryDelete
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_org_tensorflow_TensorFlow_libraryDelete(JNIEnv *,
-                                                                    jclass,
-                                                                    jlong);
-
-/*
- * Class:     org_tensorflow_TensorFlow
- * Method:    libraryOpList
- * Signature: (J)[B
- */
-JNIEXPORT jbyteArray JNICALL
-Java_org_tensorflow_TensorFlow_libraryOpList(JNIEnv *, jclass, jlong);
-
-#ifdef __cplusplus
-}  // extern "C"
-#endif  // __cplusplus
-#endif  // TENSORFLOW_JAVA_SRC_MAIN_NATIVE_TENSORFLOW_JNI_H_