Merge pull request #80 from d11/isTensor

Replace utils.istensor with torch.isTensor.

5 files changed, 4 insertions, 11 deletions

diff --git a/gmodule.lua b/gmodule.lua
index 79f3033..41ae384 100644
--- a/gmodule.lua
+++ b/gmodule.lua
@@ -1,7 +1,7 @@
 
 local nesting = paths.dofile('nesting.lua')
 local utils = paths.dofile('utils.lua')
-local istensor = utils.istensor
+local istensor = torch.isTensor
 local istable = utils.istable
 local istorchclass = utils.istorchclass
 
diff --git a/init.lua b/init.lua
index ad154bb..a009eb0 100644
--- a/init.lua
+++ b/init.lua
@@ -10,7 +10,7 @@ torch.include('nngraph','ModuleFromCriterion.lua')
 
 -- handy functions
 local utils = paths.dofile('utils.lua')
-local istensor = utils.istensor
+local istensor = torch.isTensor
 local istable = utils.istable
 local istorchclass = utils.istorchclass
 
diff --git a/nesting.lua b/nesting.lua
index 0a61b36..18899c1 100644
--- a/nesting.lua
+++ b/nesting.lua
@@ -2,7 +2,7 @@
 local nesting = {}
 
 local utils = paths.dofile('utils.lua')
-local istensor = utils.istensor
+local istensor = torch.isTensor
 
 -- Creates a clone of a tensor or of a table with tensors.
 function nesting.cloneNested(obj)
diff --git a/node.lua b/node.lua
index 7ef55be..f9e893e 100644
--- a/node.lua
+++ b/node.lua
@@ -1,6 +1,6 @@
 
 local utils = paths.dofile('utils.lua')
-local istensor = utils.istensor
+local istensor = torch.isTensor
 local istable = utils.istable
 local istorchclass = utils.istorchclass
 require 'debug'
diff --git a/utils.lua b/utils.lua
index 7b1ba07..c0bccb2 100644
--- a/utils.lua
+++ b/utils.lua
@@ -1,12 +1,5 @@
 local utils = {}
 
-function utils.istensor(x)
-   if torch.typename(x) and torch.typename(x):find('Tensor') then
-      return true
-   end
-   return false
-end
-
 function utils.istorchclass(x)
    return type(x) == 'table' and torch.typename(x)
 end