Merge pull request #20 from ewanwm/feature_trig_functions

add trig functions in Tensor

nuTens/tensors/tensor.hpp

@@ -214,6 +214,19 @@ class Tensor{
 
         /// @}
 
+
+        /// @name Trigonometric
+        /// @{
+
+        /// @brief Get element-wise sin of a tensor
+        /// @param t The tensor
+        static Tensor sin(const Tensor &t);
+
+        /// @brief Get element-wise cosine of a tensor
+        /// @param t The tensor
+        static Tensor cos(const Tensor &t);
+
+        /// @}
 
         /// @brief Overwrite the << operator to print this tensor out to the command line
         friend std::ostream &operator<< (std::ostream &stream, const Tensor &tensor) {

nuTens/tensors/torch-tensor.cpp

@@ -1,6 +1,5 @@
 
 #include <nuTens/tensors/tensor.hpp>
-#include <torch/torch.h>
 
 
 // map between the data types used in nuTens and those used by pytorch
@@ -312,7 +311,7 @@ Tensor Tensor::operator- () const {
 
 Tensor Tensor::cumsum(int dim) const {
     Tensor ret;
-    ret._tensor = _tensor.cumsum(dim);
+    ret._tensor = torch::cumsum(_tensor, dim);
     return ret;
 }
 
@@ -332,6 +331,19 @@ Tensor Tensor::grad() const {
     return ret;
 }
 
+
+Tensor Tensor::sin(const Tensor &t) {
+    Tensor ret;
+    ret._tensor = torch::sin(t._tensor);
+    return ret;
+}
+
+Tensor Tensor::cos(const Tensor &t) {
+    Tensor ret;
+    ret._tensor = torch::cos(t._tensor);
+    return ret;
+}
+
 std::string Tensor::toString() const {
     std::ostringstream stream;
     stream << _tensor;