moved out model uitlities

Author: hhsecond

example.py

@@ -1,5 +1,5 @@
 from __future__ import print_function
-from redisai import Client, Tensor, ScalarTensor, \
+from redisai import Client, Tensor, \
     BlobTensor, DType, Device, Backend
 from redisai import model as raimodel
 
@@ -9,8 +9,8 @@
 print(t.value)
 
 model = raimodel.Model.load('../RedisAI/examples/models/graph.pb')
-client.tensorset('a', ScalarTensor(DType.float, 2, 3))
-client.tensorset('b', ScalarTensor(DType.float, 12, 10))
+client.tensorset('a', Tensor.scalar(DType.float, 2, 3))
+client.tensorset('b', Tensor.scalar(DType.float, 12, 10))
 client.modelset('m', Backend.tf,
                 Device.cpu,
                 input=['a', 'b'],
@@ -24,8 +24,8 @@
 client.scriptset('ket', Device.cpu, script)
 client.scriptrun('ket', 'bar', input=['a', 'b'], output='c')
 
-b1 = client.tensorget('c', astype=BlobTensor)
-b2 = client.tensorget('c', astype=BlobTensor)
+b1 = client.tensorget('c', as_type=BlobTensor)
+b2 = client.tensorget('c', as_type=BlobTensor)
 bt = BlobTensor(DType.float, b1.shape, b1, b2)
 
 print(len(bytes(bt.blob)))
@@ -34,4 +34,4 @@
 client.tensorset('d', BlobTensor(DType.float, b1.shape, b1, b2))
 
 tnp = b1.to_numpy()
-client.tensorset('e', tnp)
+client.tensorset('e', tnp)

redisai/__init__.py

@@ -1,22 +1,2 @@
-from .version import __version__
-from .client import (Client, Tensor, BlobTensor, DType, Device, Backend)
-
-
-def save_model(*args, **kwargs):
-    """
-    Importing inside to avoid loading the TF/PyTorch/ONNX
-    into the scope unnecessary. This function wraps the
-    internal save model utility to make it user friendly
-    """
-    from .model import Model
-    Model.save(*args, **kwargs)
-
-
-def load_model(*args, **kwargs):
-    """
-    Importing inside to avoid loading the TF/PyTorch/ONNX
-    into the scope unnecessary. This function wraps the
-    internal load model utility to make it user friendly
-    """
-    from .model import Model
-    return Model.load(*args, **kwargs)
+from .version import __version__  # noqa
+from .client import (Client, Tensor, BlobTensor, DType, Device, Backend)  # noqa

redisai/client.py

@@ -9,7 +9,7 @@
     np = None
 
 try:
-    from typing import Union, Any, AnyStr, ByteString, Collection, Type
+    from typing import Union, Any, AnyStr, ByteString, Collection, Type  # noqa
 except ImportError:
     pass
 
@@ -165,7 +165,7 @@ def _to_numpy_type(t):
         }
         if t in mm:
             return mm[t]
-        return t
+        return t.lower()
 
     @classmethod
     def from_resp(cls, dtype, shape, value):

test-requirements.txt

@@ -1,6 +1 @@
 numpy
-torch
-tensorflow
-onnx
-skl2onnx
-pandas