diff --git a/tensorflow-examples/pom.xml b/tensorflow-examples/pom.xml index 276a10f..b6e41a7 100644 --- a/tensorflow-examples/pom.xml +++ b/tensorflow-examples/pom.xml @@ -18,25 +18,15 @@ org.tensorflow tensorflow-core-platform - 0.1.0-SNAPSHOT + 0.2.0 org.tensorflow tensorflow-framework - 0.1.0-SNAPSHOT + 0.2.0 - - - tensorflow-snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - true - - - - diff --git a/tensorflow-examples/src/main/java/org/tensorflow/model/examples/cnn/lenet/CnnMnist.java b/tensorflow-examples/src/main/java/org/tensorflow/model/examples/cnn/lenet/CnnMnist.java index a590d30..5b29722 100644 --- a/tensorflow-examples/src/main/java/org/tensorflow/model/examples/cnn/lenet/CnnMnist.java +++ b/tensorflow-examples/src/main/java/org/tensorflow/model/examples/cnn/lenet/CnnMnist.java @@ -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; @@ -160,8 +160,8 @@ public static Graph build(String optimizerName) { // Loss function & regularization OneHot oneHot = tf .oneHot(labels, tf.constant(10), tf.constant(1.0f), tf.constant(0.0f)); - SoftmaxCrossEntropyWithLogits batchLoss = tf.nn - .softmaxCrossEntropyWithLogits(logits, oneHot); + SoftmaxCrossEntropyWithLogits batchLoss = tf.nn.raw + .softmaxCrossEntropyWithLogits(logits, oneHot); Mean labelLoss = tf.math.mean(batchLoss.loss(), tf.constant(0)); Add regularizers = tf.math.add(tf.nn.l2Loss(fc1Weights), tf.math .add(tf.nn.l2Loss(fc1Biases), diff --git a/tensorflow-examples/src/main/java/org/tensorflow/model/examples/cnn/vgg/VGGModel.java b/tensorflow-examples/src/main/java/org/tensorflow/model/examples/cnn/vgg/VGGModel.java index 3519517..13f3ff6 100644 --- a/tensorflow-examples/src/main/java/org/tensorflow/model/examples/cnn/vgg/VGGModel.java +++ b/tensorflow-examples/src/main/java/org/tensorflow/model/examples/cnn/vgg/VGGModel.java @@ -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; @@ -159,7 +159,7 @@ public static Add buildFCLayersAndRegularization(Ops tf, Placeholder oneHot = tf .oneHot(labels, tf.constant(10), tf.constant(1.0f), tf.constant(0.0f)); - SoftmaxCrossEntropyWithLogits batchLoss = tf.nn + SoftmaxCrossEntropyWithLogits batchLoss = tf.nn.raw .softmaxCrossEntropyWithLogits(logits, oneHot); Mean labelLoss = tf.math.mean(batchLoss.loss(), tf.constant(0)); Add regularizers = tf.math.add(tf.nn.l2Loss(fc1Weights), tf.math diff --git a/tensorflow-examples/src/main/java/org/tensorflow/model/examples/datasets/ImageBatch.java b/tensorflow-examples/src/main/java/org/tensorflow/model/examples/datasets/ImageBatch.java index 61100cb..a6e1b11 100644 --- a/tensorflow-examples/src/main/java/org/tensorflow/model/examples/datasets/ImageBatch.java +++ b/tensorflow-examples/src/main/java/org/tensorflow/model/examples/datasets/ImageBatch.java @@ -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 { diff --git a/tensorflow-examples/src/main/java/org/tensorflow/model/examples/datasets/ImageBatchIterator.java b/tensorflow-examples/src/main/java/org/tensorflow/model/examples/datasets/ImageBatchIterator.java index f9f6739..6651cbd 100644 --- a/tensorflow-examples/src/main/java/org/tensorflow/model/examples/datasets/ImageBatchIterator.java +++ b/tensorflow-examples/src/main/java/org/tensorflow/model/examples/datasets/ImageBatchIterator.java @@ -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 { diff --git a/tensorflow-examples/src/main/java/org/tensorflow/model/examples/datasets/mnist/MnistDataset.java b/tensorflow-examples/src/main/java/org/tensorflow/model/examples/datasets/mnist/MnistDataset.java index caec509..a2ffe92 100644 --- a/tensorflow-examples/src/main/java/org/tensorflow/model/examples/datasets/mnist/MnistDataset.java +++ b/tensorflow-examples/src/main/java/org/tensorflow/model/examples/datasets/mnist/MnistDataset.java @@ -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 { diff --git a/tensorflow-examples/src/main/java/org/tensorflow/model/examples/dense/SimpleMnist.java b/tensorflow-examples/src/main/java/org/tensorflow/model/examples/dense/SimpleMnist.java index fb7e63a..994aae3 100644 --- a/tensorflow-examples/src/main/java/org/tensorflow/model/examples/dense/SimpleMnist.java +++ b/tensorflow-examples/src/main/java/org/tensorflow/model/examples/dense/SimpleMnist.java @@ -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; diff --git a/tensorflow-examples/src/main/java/org/tensorflow/model/examples/regression/linear/LinearRegressionExample.java b/tensorflow-examples/src/main/java/org/tensorflow/model/examples/regression/linear/LinearRegressionExample.java index a887b50..b8f7f24 100644 --- a/tensorflow-examples/src/main/java/org/tensorflow/model/examples/regression/linear/LinearRegressionExample.java +++ b/tensorflow-examples/src/main/java/org/tensorflow/model/examples/regression/linear/LinearRegressionExample.java @@ -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; diff --git a/tensorflow-examples/src/main/java/org/tensorflow/model/examples/tensors/TensorCreation.java b/tensorflow-examples/src/main/java/org/tensorflow/model/examples/tensors/TensorCreation.java index 2487123..8533d90 100644 --- a/tensorflow-examples/src/main/java/org/tensorflow/model/examples/tensors/TensorCreation.java +++ b/tensorflow-examples/src/main/java/org/tensorflow/model/examples/tensors/TensorCreation.java @@ -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;