update onnxruntime along with String tensor

Change-Id: Ie50ee7cd63864a14dc46ae7be0566f1f0b319931

Author: Qing Lan

api/src/main/java/ai/djl/ndarray/BaseNDManager.java

@@ -49,6 +49,12 @@ public NDArray create(String data) {
         throw new UnsupportedOperationException("Not supported!");
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public NDArray create(String[] data) {
+        throw new UnsupportedOperationException("Not supported!");
+    }
+
     /** {@inheritDoc} */
     @Override
     public NDArray create(Shape shape, DataType dataType) {

api/src/main/java/ai/djl/ndarray/NDManager.java

@@ -235,14 +235,21 @@ default NDArray create(boolean data) {
     }
 
     /**
-     * Creates and initializes a scalar {@link NDArray}. NDArray of String DataType only supports
-     * scalar.
+     * Creates and initializes a scalar {@link NDArray}.
      *
      * @param data the String data that needs to be set
      * @return a new instance of {@link NDArray}
      */
     NDArray create(String data);
 
+    /**
+     * Creates and initializes 1D {@link NDArray}.
+     *
+     * @param data the String data that needs to be set
+     * @return a new instance of {@link NDArray}
+     */
+    NDArray create(String[] data);
+
     /**
      * Creates and initializes a 1D {@link NDArray}.
      *

gradle.properties

@@ -13,7 +13,7 @@ pytorch_version=1.7.1
 tensorflow_version=2.3.1
 tflite_version=2.4.1
 dlr_version=1.6.0
-onnxruntime_version=1.5.2
+onnxruntime_version=1.7.0
 paddlepaddle_version=2.0.0
 sentencepiece_version=0.1.92
 fasttext_version=0.9.2

onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/engine/OrtNDManager.java

@@ -63,6 +63,26 @@ public OrtNDArray create(Buffer data, Shape shape, DataType dataType) {
         }
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public NDArray create(String data) {
+        return create(new String[] {data});
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public NDArray create(String[] data) {
+        return create(data, new Shape(data.length));
+    }
+
+    public NDArray create(String[] data, Shape shape) {
+        try {
+            return new OrtNDArray(this, OrtUtils.toTensor(env, data, shape));
+        } catch (OrtException e) {
+            throw new EngineException(e);
+        }
+    }
+
     /** {@inheritDoc} */
     @Override
     public NDArray zeros(Shape shape, DataType dataType) {

onnxruntime/onnxruntime-engine/src/main/java/ai/djl/onnxruntime/engine/OrtUtils.java

@@ -63,6 +63,12 @@ public static OnnxTensor toTensor(
         }
     }
 
+    public static OnnxTensor toTensor(OrtEnvironment env, String[] inputs, Shape shape)
+            throws OrtException {
+        long[] sh = shape.getShape();
+        return OnnxTensor.createTensor(env, inputs, sh);
+    }
+
     public static NDArray toNDArray(NDManager manager, OnnxTensor tensor) {
         if (manager instanceof OrtNDManager) {
             return ((OrtNDManager) manager).create(tensor);

tensorflow/tensorflow-engine/src/main/java/ai/djl/tensorflow/engine/TfNDManager.java

@@ -149,12 +149,19 @@ public NDArray create(float data) {
     /** {@inheritDoc} */
     @Override
     public NDArray create(String data) {
-        // create scalar tensor with float
         try (Tensor<TString> tensor = TString.scalarOf(data)) {
             return new TfNDArray(this, tensor);
         }
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public NDArray create(String[] data) {
+        try (Tensor<TString> tensor = TString.vectorOf(data)) {
+            return new TfNDArray(this, tensor);
+        }
+    }
+
     /** {@inheritDoc} */
     @Override
     public NDArray create(Shape shape, DataType dataType) {