Tensor Handle allocator working better.

Author: Iainmon

bridge/include/bridge.h

@@ -7,14 +7,17 @@
 extern "C" {
 #endif
 
+typedef float float32_t;
+typedef double float64_t;
+typedef char bool_t;
+
 typedef struct bridge_tensor_t {
     float* data;
     int* sizes;
     int dim;
+    bool_t created_by_c;
 } bridge_tensor_t;
 
-typedef float float32_t;
-typedef double float64_t;
 
 int baz(void);
 

bridge/lib/bridge.cpp

@@ -34,6 +34,7 @@ void store_tensor(torch::Tensor &input, float32_t* dest) {
 
 bridge_tensor_t torch_to_bridge(torch::Tensor &tensor) {
     bridge_tensor_t result;
+    result.created_by_c = true;
     result.dim = tensor.dim();
     result.sizes = new int[result.dim];
     for (int i = 0; i < result.dim; ++i) {

lib/Bridge.chpl

@@ -9,6 +9,7 @@ module Bridge {
         var data: c_ptr(real(32));
         var sizes: c_ptr(int(32));
         var dim: int(32);
+        var created_by_c: bool;
     }
 
     proc tensorHandle(type eltType) type {
@@ -51,8 +52,10 @@ module Bridge {
         var result: [dom] real(32);
         forall (i,idx) in dom.everyZip() do
             result[idx] = package.data[i];
-        deallocate(package.data);
-        deallocate(package.sizes);
+        if package.created_by_c {
+            deallocate(package.data);
+            deallocate(package.sizes);
+        }
         return result;
     }
 
@@ -64,8 +67,10 @@ module Bridge {
         const dom = existing.domain;
         forall (i,idx) in dom.everyZip() do
             existing[idx] = package.data[i];
-        deallocate(package.data);
-        deallocate(package.sizes);
+        if package.created_by_c {
+            deallocate(package.data);
+            deallocate(package.sizes);
+        }
     }
 
     proc createBridgeTensor(const ref data: [] real(32)): bridge_tensor_t {

test/tiny/layer_test.chpl

@@ -66,7 +66,10 @@ writeln(arr);
 writeln(arr.toBridgeTensor());
 
 var bt = arr.toBridgeTensor();
+writeln(bt);
 arr.loadFromBridgeTensor(bt);
 writeln(arr);
 writeln(arr.shape);
+writeln(bt);
+
 writeln(ndarray.fromBridgeTensor(2,bt));