Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/torch/torch7.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSoumith Chintala <soumith@gmail.com>2016-04-17 02:54:34 +0300
committerSoumith Chintala <soumith@gmail.com>2016-04-17 02:54:34 +0300
commit2243cbd0b8de8ad457b0dae1d7b8b926dcb0cb84 (patch)
tree57393c9352a25aac605b02993ff49999b63fab3e /TensorMath.lua
parent28a415cd86b99b7235670f68a2e49b6597c88992 (diff)
parentdf137f9b417723f6369d6bccb1933257be69ba79 (diff)
Merge pull request #620 from liboyue/Add_fmod_remainder_and_remove_mod
Add fmod(), remainder(), remove mod() and fix tensor operator % behavior
Diffstat (limited to 'TensorMath.lua')
-rw-r--r--TensorMath.lua30
1 files changed, 28 insertions, 2 deletions
diff --git a/TensorMath.lua b/TensorMath.lua
index 7f1fed1..5a37b12 100644
--- a/TensorMath.lua
+++ b/TensorMath.lua
@@ -305,8 +305,21 @@ for _,Tensor in ipairs({"ByteTensor", "CharTensor",
{name=Tensor, method={default=1}},
{name=real}})
+ wrap("fmod",
+ cname("fmod"),
+ {{name=Tensor, default=true, returned=true, method={default='nil'}},
+ {name=Tensor, method={default=1}},
+ {name=real}})
+
+ wrap("remainder",
+ cname("remainder"),
+ {{name=Tensor, default=true, returned=true, method={default='nil'}},
+ {name=Tensor, method={default=1}},
+ {name=real}})
+
+ -- mod alias
wrap("mod",
- cname("mod"),
+ cname("fmod"),
{{name=Tensor, default=true, returned=true, method={default='nil'}},
{name=Tensor, method={default=1}},
{name=real}})
@@ -345,8 +358,21 @@ for _,Tensor in ipairs({"ByteTensor", "CharTensor",
{name=Tensor, method={default=1}},
{name=Tensor}})
+ wrap("cfmod",
+ cname("cfmod"),
+ {{name=Tensor, default=true, returned=true, method={default='nil'}},
+ {name=Tensor, method={default=1}},
+ {name=Tensor}})
+
+ wrap("cremainder",
+ cname("cremainder"),
+ {{name=Tensor, default=true, returned=true, method={default='nil'}},
+ {name=Tensor, method={default=1}},
+ {name=Tensor}})
+
+ -- cmod alias
wrap("cmod",
- cname("cmod"),
+ cname("cfmod"),
{{name=Tensor, default=true, returned=true, method={default='nil'}},
{name=Tensor, method={default=1}},
{name=Tensor}})