Skip to content
This repository was archived by the owner on Apr 19, 2026. It is now read-only.

Updated for 0.2 version #18

Merged
karllessard merged 4 commits into from
Oct 10, 2020
Merged

Updated for 0.2 version #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a3a6e61
Updated for 0.2 version
zaleslaw Oct 9, 2020
5fae0d7
Updated for 0.2 version
zaleslaw Oct 9, 2020
04fe8ac
Fixed CNN Mnist example
zaleslaw Oct 10, 2020
10376b9
Fixed POM file
zaleslaw Oct 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions tensorflow-examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,15 @@
<dependency>
<groupId>org.tensorflow</groupId>
<artifactId>tensorflow-core-platform</artifactId>
<version>0.1.0-SNAPSHOT</version>
<version>0.2.0</version>
</dependency>
<dependency>
<groupId>org.tensorflow</groupId>
<artifactId>tensorflow-framework</artifactId>
<version>0.1.0-SNAPSHOT</version>
<version>0.2.0</version>
</dependency>
</dependencies>

<repositories>
<repository>
<id>tensorflow-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>

<build>
<plugins>
<plugin>
Expand Down
14 changes: 7 additions & 7 deletions tensorflow-examples/src/main/java/org/tensorflow/model/examples/cnn/lenet/CnnMnist.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@
import org.tensorflow.op.nn.MaxPool;
import org.tensorflow.op.nn.Relu;
import org.tensorflow.op.nn.Softmax;
import org.tensorflow.op.nn.SoftmaxCrossEntropyWithLogits;
import org.tensorflow.op.nn.raw.SoftmaxCrossEntropyWithLogits;
import org.tensorflow.op.random.TruncatedNormal;
import org.tensorflow.tools.Shape;
import org.tensorflow.tools.ndarray.ByteNdArray;
import org.tensorflow.tools.ndarray.FloatNdArray;
import org.tensorflow.tools.ndarray.index.Indices;
import org.tensorflow.ndarray.Shape;
import org.tensorflow.ndarray.ByteNdArray;
import org.tensorflow.ndarray.FloatNdArray;
import org.tensorflow.ndarray.index.Indices;
import org.tensorflow.framework.optimizers.AdaDelta;
import org.tensorflow.framework.optimizers.AdaGrad;
import org.tensorflow.framework.optimizers.AdaGradDA;
Expand Down Expand Up @@ -160,8 +160,8 @@ public static Graph build(String optimizerName) {
// Loss function & regularization
OneHot<TFloat32> oneHot = tf
.oneHot(labels, tf.constant(10), tf.constant(1.0f), tf.constant(0.0f));
SoftmaxCrossEntropyWithLogits<TFloat32> batchLoss = tf.nn
.softmaxCrossEntropyWithLogits(logits, oneHot);
SoftmaxCrossEntropyWithLogits<TFloat32> batchLoss = tf.nn.raw
.softmaxCrossEntropyWithLogits(logits, oneHot);
Mean<TFloat32> labelLoss = tf.math.mean(batchLoss.loss(), tf.constant(0));
Add<TFloat32> regularizers = tf.math.add(tf.nn.l2Loss(fc1Weights), tf.math
.add(tf.nn.l2Loss(fc1Biases),
Expand Down
12 changes: 6 additions & 6 deletions tensorflow-examples/src/main/java/org/tensorflow/model/examples/cnn/vgg/VGGModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
import org.tensorflow.op.nn.Conv2d;
import org.tensorflow.op.nn.MaxPool;
import org.tensorflow.op.nn.Relu;
import org.tensorflow.op.nn.SoftmaxCrossEntropyWithLogits;
import org.tensorflow.op.nn.raw.SoftmaxCrossEntropyWithLogits;
import org.tensorflow.op.random.TruncatedNormal;
import org.tensorflow.tools.Shape;
import org.tensorflow.tools.ndarray.ByteNdArray;
import org.tensorflow.tools.ndarray.FloatNdArray;
import org.tensorflow.tools.ndarray.index.Indices;
import org.tensorflow.ndarray.Shape;
import org.tensorflow.ndarray.ByteNdArray;
import org.tensorflow.ndarray.FloatNdArray;
import org.tensorflow.ndarray.index.Indices;
import org.tensorflow.types.TFloat32;
import org.tensorflow.types.TUint8;

Expand Down Expand Up @@ -159,7 +159,7 @@ public static Add<TFloat32> buildFCLayersAndRegularization(Ops tf, Placeholder<T
// Loss function & regularization
OneHot<TFloat32> oneHot = tf
.oneHot(labels, tf.constant(10), tf.constant(1.0f), tf.constant(0.0f));
SoftmaxCrossEntropyWithLogits<TFloat32> batchLoss = tf.nn
SoftmaxCrossEntropyWithLogits<TFloat32> batchLoss = tf.nn.raw
.softmaxCrossEntropyWithLogits(logits, oneHot);
Mean<TFloat32> labelLoss = tf.math.mean(batchLoss.loss(), tf.constant(0));
Add<TFloat32> regularizers = tf.math.add(tf.nn.l2Loss(fc1Weights), tf.math
Expand Down
2 changes: 1 addition & 1 deletion tensorflow-examples/src/main/java/org/tensorflow/model/examples/datasets/ImageBatch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/
package org.tensorflow.model.examples.datasets;

import org.tensorflow.tools.ndarray.ByteNdArray;
import org.tensorflow.ndarray.ByteNdArray;

/** Batch of images for batch training. */
public class ImageBatch {
Expand Down
8 changes: 5 additions & 3 deletions ...low-examples/src/main/java/org/tensorflow/model/examples/datasets/ImageBatchIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@
*/
package org.tensorflow.model.examples.datasets;

import static org.tensorflow.tools.ndarray.index.Indices.range;
import static org.tensorflow.ndarray.index.Indices.range;

import java.util.Iterator;
import org.tensorflow.tools.ndarray.ByteNdArray;
import org.tensorflow.tools.ndarray.index.Index;

import org.tensorflow.ndarray.index.Index;
import org.tensorflow.ndarray.ByteNdArray;
import org.tensorflow.ndarray.index.Index;

/** Basic batch iterator across images presented in datset. */
public class ImageBatchIterator implements Iterator<ImageBatch> {
Expand Down
12 changes: 6 additions & 6 deletions ...low-examples/src/main/java/org/tensorflow/model/examples/datasets/mnist/MnistDataset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@

import org.tensorflow.model.examples.datasets.ImageBatch;
import org.tensorflow.model.examples.datasets.ImageBatchIterator;
import org.tensorflow.tools.Shape;
import org.tensorflow.tools.buffer.DataBuffers;
import org.tensorflow.tools.ndarray.ByteNdArray;
import org.tensorflow.tools.ndarray.NdArrays;
import org.tensorflow.ndarray.Shape;
import org.tensorflow.ndarray.buffer.DataBuffers;
import org.tensorflow.ndarray.ByteNdArray;
import org.tensorflow.ndarray.NdArrays;

import java.io.DataInputStream;
import java.io.IOException;
import java.util.zip.GZIPInputStream;

import static org.tensorflow.tools.ndarray.index.Indices.from;
import static org.tensorflow.tools.ndarray.index.Indices.to;
import static org.tensorflow.ndarray.index.Indices.from;
import static org.tensorflow.ndarray.index.Indices.to;

/** Common loader and data preprocessor for MNIST and FashionMNIST datasets. */
public class MnistDataset {
Expand Down
4 changes: 2 additions & 2 deletions tensorflow-examples/src/main/java/org/tensorflow/model/examples/dense/SimpleMnist.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
import org.tensorflow.op.core.Variable;
import org.tensorflow.op.math.Mean;
import org.tensorflow.op.nn.Softmax;
import org.tensorflow.tools.Shape;
import org.tensorflow.tools.ndarray.ByteNdArray;
import org.tensorflow.ndarray.Shape;
import org.tensorflow.ndarray.ByteNdArray;
import org.tensorflow.types.TFloat32;
import org.tensorflow.types.TInt64;

Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/org/tensorflow/model/examples/regression/linear/LinearRegressionExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import org.tensorflow.op.math.Div;
import org.tensorflow.op.math.Mul;
import org.tensorflow.op.math.Pow;
import org.tensorflow.tools.Shape;
import org.tensorflow.ndarray.Shape;
import org.tensorflow.types.TFloat32;

import java.util.List;
Expand Down
6 changes: 3 additions & 3 deletions tensorflow-examples/src/main/java/org/tensorflow/model/examples/tensors/TensorCreation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
package org.tensorflow.model.examples.tensors;

import org.tensorflow.Tensor;
import org.tensorflow.tools.Shape;
import org.tensorflow.tools.ndarray.IntNdArray;
import org.tensorflow.tools.ndarray.NdArrays;
import org.tensorflow.ndarray.Shape;
import org.tensorflow.ndarray.IntNdArray;
import org.tensorflow.ndarray.NdArrays;
import org.tensorflow.types.TInt32;

import java.util.Arrays;
Expand Down