updated to 1.15.2 (f2ca38ae) · Commits · Oleg Dzhimiev / tfhello

pom.xml

+2 −2

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

src/main/java/tfhello.java

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -155,9 +155,9 @@ public class tfhello{
	System.out.println(TensorFlow.version());		System.out.println(TensorFlow.version());
	System.out.println("Test 3 end\n");		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("Test 4 start\n - Test simple custom JNI function added to TF");
	System.out.println(TensorFlow.elphelVersion());		//System.out.println(TensorFlow.elphelVersion());
	System.out.println("Test 4 end\n");		//System.out.println("Test 4 end\n");

	//callableOpts.newBuilder().putFeedDevices(key, value);		//callableOpts.newBuilder().putFeedDevices(key, value);

	@@ -220,14 +220,14 @@ public class tfhello{

	// natively got GPU device name to insert into options		// natively got GPU device name to insert into options
	// it's the same all the time		// it's the same all the time
	String gpuDeviceName = s.elphelGPUDeviceName();		String gpuDeviceName = s.GPUDeviceName();

	// GPU allocation: dims must be power of 2?		// 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);		//System.out.println(t2.nativeRef);

	// Let's check what happended		// Let's check what happended
	long t3_gpuptr = t3.elphel_GetGPUTensorPointer();		long t3_gpuptr = t3.GPUPointer();
	// Print address		// Print address
	//System.out.println("Pointer address: "+String.format("0x%08x", t3_gpuptr));		//System.out.println("Pointer address: "+String.format("0x%08x", t3_gpuptr));

	@@ -276,8 +276,8 @@ public class tfhello{
	System.out.println(callableOpts);		System.out.println(callableOpts);

	// callable handle		// callable handle
	long feed_gpu_fetch_cpu = s.MakeCallable(callableOpts.toByteArray());		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);		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(t3);
	System.out.println(t3out);		System.out.println(t3out);

tf_jni/Session.java

deleted100644 → 0

+0 −582

File deleted.

Preview size limit exceeded, changes collapsed.

tf_jni/Tensor.java

deleted100644 → 0

+0 −873

File deleted.

Preview size limit exceeded, changes collapsed.

tf_jni/TensorFlow.java

deleted100644 → 0

+0 −87

File deleted.

Preview size limit exceeded, changes collapsed.

Admin message