Use torch.typename in isTensor and isStorage

This supports tensor types that are implemented using cdata.
These cdata objects do not have a unique metatable. Their
names are available through torch.typename.

1 files changed, 10 insertions, 2 deletions

diff --git a/init.lua b/init.lua
index 76e08d0..ae2ccf5 100644
--- a/init.lua
+++ b/init.lua
@@ -127,11 +127,19 @@ function torch.totable(obj)
 end
 
 function torch.isTensor(obj)
-  return type(obj) == 'userdata' and torch.isTypeOf(obj, 'torch.*Tensor')
+   local typename = torch.typename(obj)
+   if typename and typename:find('torch.*Tensor') then
+      return true
+   end
+   return false
 end
 
 function torch.isStorage(obj)
-  return type(obj) == 'userdata' and torch.isTypeOf(obj, 'torch.*Storage')
+   local typename = torch.typename(obj)
+   if typename and typename:find('torch.*Storage') then
+      return true
+   end
+   return false
 end
 -- alias for convenience
 torch.Tensor.isTensor = torch.isTensor