made tensor and graph objects opaque

Author: MeirShpilraien

src/graph.c

@@ -3,6 +3,15 @@
 
 RedisModuleType *RedisDL_GraphType = NULL;
 
+typedef struct RDL_Graph{
+  TF_Graph* graph;
+  // TODO: use session pool? The ideal would be to use one session per client.
+  //       If a client disconnects, we dispose the session or reuse it for
+  //       another client.
+  void *session;
+  size_t refCount;
+}RDL_Graph;
+
 typedef struct RDL_GraphCtxParam{
   TF_Output name;
   RDL_Tensor* tensor;
@@ -182,7 +191,7 @@ int Graph_Run(RDL_GraphRunCtx* gctx){
   TF_Output outputs[array_len(gctx->outputs)];
 
   for(size_t i = 0 ; i < array_len(gctx->inputs) ; ++i){
-    inputTensorsValues[i] = gctx->inputs[i].tensor->tensor;
+    inputTensorsValues[i] = Tensor_GetTensor(gctx->inputs[i].tensor);
     inputs[i] = gctx->inputs[i].name;
   }
 

src/graph.h

@@ -12,14 +12,7 @@
 #include "redismodule.h"
 #include "tensor.h"
 
-typedef struct RDL_Graph{
-  TF_Graph* graph;
-  // TODO: use session pool? The ideal would be to use one session per client.
-  //       If a client disconnects, we dispose the session or reuse it for
-  //       another client.
-  void *session;
-  size_t refCount;
-}RDL_Graph;
+typedef struct RDL_Graph RDL_Graph;
 
 typedef struct RDL_GraphCtxParam RDL_GraphCtxParam;
 

src/redisdl.c

@@ -291,7 +291,7 @@ int RedisDL_TDim_RedisCommand(RedisModuleCtx *ctx, RedisModuleString **argv, int
 
   RDL_Tensor *t = RedisModule_ModuleTypeGetValue(key);
 
-  long long ndims = TF_NumDims(t->tensor);
+  long long ndims = Tensor_NumDims(t);
 
   RedisModule_CloseKey(key);
 
@@ -313,11 +313,11 @@ int RedisDL_TShape_RedisCommand(RedisModuleCtx *ctx, RedisModuleString **argv, i
 
   RDL_Tensor *t = RedisModule_ModuleTypeGetValue(key);
 
-  long long ndims = TF_NumDims(t->tensor);
+  long long ndims = Tensor_NumDims(t);
 
   RedisModule_ReplyWithArray(ctx, ndims);
   for (long long i=0; i<ndims; i++) {
-    long long dim = TF_Dim(t->tensor, i);
+    long long dim = Tensor_Dim(t, i);
     RedisModule_ReplyWithLongLong(ctx, dim);
   }
 
@@ -341,7 +341,7 @@ int RedisDL_TByteSize_RedisCommand(RedisModuleCtx *ctx, RedisModuleString **argv
 
   RDL_Tensor *t = RedisModule_ModuleTypeGetValue(key);
 
-  long long size = TF_TensorByteSize(t->tensor);
+  long long size = Tensor_ByteSize(t);
 
   RedisModule_CloseKey(key);
 
@@ -375,8 +375,8 @@ int RedisDL_TGet_RedisCommand(RedisModuleCtx *ctx, RedisModuleString **argv, int
   RDL_Tensor *t = RedisModule_ModuleTypeGetValue(key);
 
   if (datafmt == REDISDL_DATA_BLOB) {
-    long long size = TF_TensorByteSize(t->tensor);
-    char *data = TF_TensorData(t->tensor);
+    long long size = Tensor_ByteSize(t);
+    char *data = Tensor_Data(t);
 
     int ret = RedisModule_ReplyWithStringBuffer(ctx, data, size);
 
@@ -386,14 +386,14 @@ int RedisDL_TGet_RedisCommand(RedisModuleCtx *ctx, RedisModuleString **argv, int
     }
   }
   else { // datafmt == REDISDL_DATA_VALUES
-    long long ndims = TF_NumDims(t->tensor);
+    long long ndims = Tensor_NumDims(t);
     long long len = 1;
     long long i;
     for (i=0; i<ndims; i++) {
-      len *= TF_Dim(t->tensor, i);
+      len *= Tensor_Dim(t, i);
     }
 
-    TF_DataType datatype = TF_TensorType(t->tensor);
+    TF_DataType datatype = Tensor_DataType(t);
 
     RedisModule_ReplyWithArray(ctx, len);
 

src/tensor.c

@@ -5,6 +5,11 @@
 
 RedisModuleType *RedisDL_TensorType = NULL;
 
+typedef struct RDL_Tensor {
+  TF_Tensor* tensor;
+  size_t refCount;
+}RDL_Tensor;
+
 static TF_DataType Tensor_GetDataType(const char* typestr){
   if (strcasecmp(typestr, "FLOAT") == 0){
     return TF_FLOAT;
@@ -220,3 +225,23 @@ RDL_Tensor* Tensor_GetShallowCopy(RDL_Tensor* t){
   ++t->refCount;
   return t;
 }
+
+int Tensor_NumDims(RDL_Tensor* t){
+  return TF_NumDims(t->tensor);
+}
+
+long long Tensor_Dim(RDL_Tensor* t, int dim){
+  return TF_Dim(t->tensor, dim);
+}
+
+size_t Tensor_ByteSize(RDL_Tensor* t){
+  return TF_TensorByteSize(t->tensor);
+}
+
+char* Tensor_Data(RDL_Tensor* t){
+  return TF_TensorData(t->tensor);
+}
+
+TF_Tensor* Tensor_GetTensor(RDL_Tensor* t){
+  return t->tensor;
+}

src/tensor.h

@@ -11,10 +11,7 @@
 #include "tensorflow/c/c_api.h"
 #include "redismodule.h"
 
-typedef struct RDL_Tensor {
-  TF_Tensor* tensor;
-  size_t refCount;
-}RDL_Tensor;
+typedef struct RDL_Tensor RDL_Tensor;
 
 extern RedisModuleType *RedisDL_TensorType;
 
@@ -30,6 +27,11 @@ int Tensor_SetValueFromDouble(RDL_Tensor* tensor, long long i, double val);
 int Tensor_GetValueAsDouble(RDL_Tensor* t, long long i, double* val);
 int Tensor_GetValueAsLongLong(RDL_Tensor* t, long long i, long long* val);
 RDL_Tensor* Tensor_GetShallowCopy(RDL_Tensor* t);
+int Tensor_NumDims(RDL_Tensor* t);
+long long Tensor_Dim(RDL_Tensor* t, int dim);
+size_t Tensor_ByteSize(RDL_Tensor* t);
+char* Tensor_Data(RDL_Tensor* t);
+TF_Tensor* Tensor_GetTensor(RDL_Tensor* t);