torch-rb 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97908e85a67729120f763bb4140323505b77a831d5648e9d2d0961259e3d300c
-  data.tar.gz: f366548f9880dac7dffce6305e192f75a7467526ae55ae13af05d355918375ba
+  metadata.gz: f17982ebcf982b779b2c88dc0ef13a9c94b2e9a6a87007a0c3136ad5f2ef261b
+  data.tar.gz: d4ddddfc7cbb9baee0e117e36decfe8a757903f876ddcf510db4db53363f7adf
 SHA512:
-  metadata.gz: cc32ddbc43131175452a8b62df5d1eac6bc8450eea174018affd5cd073f81e2c9825d613014c62c5f8137cf5dddd1ab6ab6de60a4b3a67a757387446dbc1efad
-  data.tar.gz: c322e0b7ec7f03f12311d737034dad45037d2ad7710974e24250e11f4a0db14e221e870ddc52c0f2b723476be6f41fca8a8719068b0d0b7d8974d2080e9be6dc
+  metadata.gz: 00ff39bb405350f0107974b1786bf14ac6ca558744f05653ee2f16445d46f66658f82dcfa069bd3a92b44c33ba642dd196fc29a21379f188111fd7e8648f5eab
+  data.tar.gz: b66d48682789f71032c1d928174829791df43a04e829ebc241cafab884bc076983323bdffbcb12f5785c6d4614c13d2fed32bb5f20106957a4d6326289b7a1ea

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.3.3 (2020-08-25)
+
+- Added spectral ops
+- Fixed tensor indexing
+
 ## 0.3.2 (2020-08-24)
 
 - Added `enable_grad` method

data/README.md

@@ -2,7 +2,11 @@
 
 :fire: Deep learning for Ruby, powered by [LibTorch](https://pytorch.org)
 
-For computer vision tasks, also check out [TorchVision](https://github.com/ankane/torchvision)
+Check out:
+
+- [TorchVision](https://github.com/ankane/torchvision) for computer vision tasks
+- [TorchText](https://github.com/ankane/torchtext) for text and NLP tasks
+- [TorchAudio](https://github.com/ankane/torchaudio) for audio tasks
 
 [![Build Status](https://travis-ci.org/ankane/torch.rb.svg?branch=master)](https://travis-ci.org/ankane/torch.rb)
 

data/ext/torch/ext.cpp

@@ -16,6 +16,7 @@
 #include "nn_functions.hpp"
 
 using namespace Rice;
+using torch::indexing::TensorIndex;
 
 // need to make a distinction between parameters and tensors
 class Parameter: public torch::autograd::Variable {
@@ -28,6 +29,15 @@ void handle_error(torch::Error const & ex)
   throw Exception(rb_eRuntimeError, ex.what_without_backtrace());
 }
 
+std::vector<TensorIndex> index_vector(Array a) {
+  auto indices = std::vector<TensorIndex>();
+  indices.reserve(a.size());
+  for (size_t i = 0; i < a.size(); i++) {
+    indices.push_back(from_ruby<TensorIndex>(a[i]));
+  }
+  return indices;
+}
+
 extern "C"
 void Init_ext()
 {
@@ -58,6 +68,13 @@ void Init_ext()
         return generator.seed();
       });
 
+  Class rb_cTensorIndex = define_class_under<TensorIndex>(rb_mTorch, "TensorIndex")
+    .define_singleton_method("boolean", *[](bool value) { return TensorIndex(value); })
+    .define_singleton_method("integer", *[](int64_t value) { return TensorIndex(value); })
+    .define_singleton_method("tensor", *[](torch::Tensor& value) { return TensorIndex(value); })
+    .define_singleton_method("slice", *[](torch::optional<int64_t> start_index, torch::optional<int64_t> stop_index) { return TensorIndex(torch::indexing::Slice(start_index, stop_index)); })
+    .define_singleton_method("none", *[]() { return TensorIndex(torch::indexing::None); });
+
   // https://pytorch.org/cppdocs/api/structc10_1_1_i_value.html
   Class rb_cIValue = define_class_under<torch::IValue>(rb_mTorch, "IValue")
     .add_handler<torch::Error>(handle_error)
@@ -330,6 +347,18 @@ void Init_ext()
     .define_method("numel", &torch::Tensor::numel)
     .define_method("element_size", &torch::Tensor::element_size)
     .define_method("requires_grad", &torch::Tensor::requires_grad)
+    .define_method(
+      "_index",
+      *[](Tensor& self, Array indices) {
+        auto vec = index_vector(indices);
+        return self.index(vec);
+      })
+    .define_method(
+      "_index_put_custom",
+      *[](Tensor& self, Array indices, torch::Tensor& value) {
+        auto vec = index_vector(indices);
+        return self.index_put_(vec, value);
+      })
     .define_method(
       "contiguous?",
       *[](Tensor& self) {
@@ -508,6 +537,7 @@ void Init_ext()
       });
 
   Module rb_mInit = define_module_under(rb_mNN, "Init")
+    .add_handler<torch::Error>(handle_error)
     .define_singleton_method(
       "_calculate_gain",
       *[](NonlinearityType nonlinearity, double param) {
@@ -594,8 +624,8 @@ void Init_ext()
       });
 
   Class rb_cDevice = define_class_under<torch::Device>(rb_mTorch, "Device")
-    .define_constructor(Constructor<torch::Device, std::string>())
     .add_handler<torch::Error>(handle_error)
+    .define_constructor(Constructor<torch::Device, std::string>())
     .define_method("index", &torch::Device::index)
     .define_method("index?", &torch::Device::has_index)
     .define_method(

data/ext/torch/templates.hpp

@@ -9,6 +9,10 @@
 
 using namespace Rice;
 
+using torch::Device;
+using torch::ScalarType;
+using torch::Tensor;
+
 // need to wrap torch::IntArrayRef() since
 // it doesn't own underlying data
 class IntArrayRef {
@@ -174,8 +178,6 @@ MyReduction from_ruby<MyReduction>(Object x)
   return MyReduction(x);
 }
 
-typedef torch::Tensor Tensor;
-
 class OptionalTensor {
   Object value;
   public:
@@ -197,47 +199,28 @@ OptionalTensor from_ruby<OptionalTensor>(Object x)
   return OptionalTensor(x);
 }
 
-class ScalarType {
-  Object value;
-  public:
-    ScalarType(Object o) {
-      value = o;
-    }
-    operator at::ScalarType() {
-      throw std::runtime_error("ScalarType arguments not implemented yet");
-    }
-};
-
 template<>
 inline
-ScalarType from_ruby<ScalarType>(Object x)
+torch::optional<torch::ScalarType> from_ruby<torch::optional<torch::ScalarType>>(Object x)
 {
-  return ScalarType(x);
+  if (x.is_nil()) {
+    return torch::nullopt;
+  } else {
+    return torch::optional<torch::ScalarType>{from_ruby<torch::ScalarType>(x)};
+  }
 }
 
-class OptionalScalarType {
-  Object value;
-  public:
-    OptionalScalarType(Object o) {
-      value = o;
-    }
-    operator c10::optional<at::ScalarType>() {
-      if (value.is_nil()) {
-        return c10::nullopt;
-      }
-      return ScalarType(value);
-    }
-};
-
 template<>
 inline
-OptionalScalarType from_ruby<OptionalScalarType>(Object x)
+torch::optional<int64_t> from_ruby<torch::optional<int64_t>>(Object x)
 {
-  return OptionalScalarType(x);
+  if (x.is_nil()) {
+    return torch::nullopt;
+  } else {
+    return torch::optional<int64_t>{from_ruby<int64_t>(x)};
+  }
 }
 
-typedef torch::Device Device;
-
 Object wrap(std::tuple<torch::Tensor, torch::Tensor> x);
 Object wrap(std::tuple<torch::Tensor, torch::Tensor, torch::Tensor> x);
 Object wrap(std::tuple<torch::Tensor, torch::Tensor, torch::Tensor, torch::Tensor> x);

data/lib/torch.rb

@@ -460,6 +460,17 @@ module Torch
       zeros(input.size, **like_options(input, options))
     end
 
+    def stft(input, n_fft, hop_length: nil, win_length: nil, window: nil, center: true, pad_mode: "reflect", normalized: false, onesided: true)
+      if center
+        signal_dim = input.dim
+        extended_shape = [1] * (3 - signal_dim) + input.size
+        pad = n_fft.div(2).to_i
+        input = NN::F.pad(input.view(extended_shape), [pad, pad], mode: pad_mode)
+        input = input.view(input.shape[-signal_dim..-1])
+      end
+      _stft(input, n_fft, hop_length, win_length, window, normalized, onesided)
+    end
+
     private
 
     def to_ivalue(obj)

data/lib/torch/native/function.rb

@@ -1,10 +1,14 @@
 module Torch
   module Native
     class Function
-      attr_reader :function
+      attr_reader :function, :tensor_options
 
       def initialize(function)
         @function = function
+
+        tensor_options_str = ", *, ScalarType? dtype=None, Layout? layout=None, Device? device=None, bool? pin_memory=None)"
+        @tensor_options = @function["func"].include?(tensor_options_str)
+        @function["func"].sub!(tensor_options_str, ")")
       end
 
       def func

data/lib/torch/native/generator.rb

@@ -33,30 +33,14 @@ module Torch
               f.args.any? do |a|
                 a[:type].include?("?") && !["Tensor?", "Generator?", "int?", "ScalarType?", "Tensor?[]"].include?(a[:type]) ||
                 skip_args.any? { |sa| a[:type].include?(sa) } ||
+                # call to 'range' is ambiguous
+                f.cpp_name == "_range" ||
                 # native_functions.yaml is missing size argument for normal
                 # https://pytorch.org/cppdocs/api/function_namespacetorch_1a80253fe5a3ded4716ec929a348adb4b9.html
                 (f.base_name == "normal" && !f.out?)
               end
             end
 
-          # generate additional functions for optional arguments
-          # there may be a better way to do this
-          optional_functions, functions = functions.partition { |f| f.args.any? { |a| a[:type] == "int?" } }
-          optional_functions.each do |f|
-            next if f.ruby_name == "cross"
-            next if f.ruby_name.start_with?("avg_pool") && f.out?
-
-            opt_args = f.args.select { |a| a[:type] == "int?" }
-            if opt_args.size == 1
-              sep = f.name.include?(".") ? "_" : "."
-              f1 = Function.new(f.function.merge("func" => f.func.sub("(", "#{sep}#{opt_args.first[:name]}(").gsub("int?", "int")))
-              # TODO only remove some arguments
-              f2 = Function.new(f.function.merge("func" => f.func.sub(/, int\?.+\) ->/, ") ->")))
-              functions << f1
-              functions << f2
-            end
-          end
-
           # todo_functions.each do |f|
           #   puts f.func
           #   puts
@@ -97,7 +81,8 @@ void add_%{type}_functions(Module m) {
 
           cpp_defs = []
           functions.sort_by(&:cpp_name).each do |func|
-            fargs = func.args #.select { |a| a[:type] != "Generator?" }
+            fargs = func.args.dup #.select { |a| a[:type] != "Generator?" }
+            fargs << {name: "options", type: "TensorOptions"} if func.tensor_options
 
             cpp_args = []
             fargs.each do |a|
@@ -109,7 +94,7 @@ void add_%{type}_functions(Module m) {
                   # TODO better signature
                   "OptionalTensor"
                 when "ScalarType?"
-                  "OptionalScalarType"
+                  "torch::optional<ScalarType>"
                 when "Tensor[]"
                   "TensorList"
                 when "Tensor?[]"
@@ -117,6 +102,8 @@ void add_%{type}_functions(Module m) {
                   "TensorList"
                 when "int"
                   "int64_t"
+                when "int?"
+                  "torch::optional<int64_t>"
                 when "float"
                   "double"
                 when /\Aint\[/
@@ -125,6 +112,8 @@ void add_%{type}_functions(Module m) {
                   "Tensor &"
                 when "str"
                   "std::string"
+                when "TensorOptions"
+                  "const torch::TensorOptions &"
                 else
                   a[:type]
                 end

data/lib/torch/native/parser.rb

@@ -83,6 +83,8 @@ module Torch
                 else
                   v.is_a?(Integer)
                 end
+              when "int?"
+                v.is_a?(Integer) || v.nil?
               when "float"
                 v.is_a?(Numeric)
               when /int\[.*\]/
@@ -126,9 +128,11 @@ module Torch
         end
 
         func = candidates.first
+        args = func.args.map { |a| final_values[a[:name]] }
+        args << TensorOptions.new.dtype(6) if func.tensor_options
         {
           name: func.cpp_name,
-          args: func.args.map { |a| final_values[a[:name]] }
+          args: args
         }
       end
     end

data/lib/torch/tensor.rb

@@ -188,49 +188,15 @@ module Torch
     # based on python_variable_indexing.cpp and
     # https://pytorch.org/cppdocs/notes/tensor_indexing.html
     def [](*indexes)
-      result = self
-      dim = 0
-      indexes.each do |index|
-        if index.is_a?(Numeric)
-          result = result._select_int(dim, index)
-        elsif index.is_a?(Range)
-          finish = index.end
-          finish += 1 unless index.exclude_end?
-          result = result._slice_tensor(dim, index.begin, finish, 1)
-          dim += 1
-        elsif index.is_a?(Tensor)
-          result = result.index([index])
-        elsif index.nil?
-          result = result.unsqueeze(dim)
-          dim += 1
-        elsif index == true
-          result = result.unsqueeze(dim)
-          # TODO handle false
-        else
-          raise Error, "Unsupported index type: #{index.class.name}"
-        end
-      end
-      result
+      _index(tensor_indexes(indexes))
     end
 
     # based on python_variable_indexing.cpp and
     # https://pytorch.org/cppdocs/notes/tensor_indexing.html
-    def []=(index, value)
+    def []=(*indexes, value)
       raise ArgumentError, "Tensor does not support deleting items" if value.nil?
-
       value = Torch.tensor(value, dtype: dtype) unless value.is_a?(Tensor)
-
-      if index.is_a?(Numeric)
-        index_put!([Torch.tensor(index)], value)
-      elsif index.is_a?(Range)
-        finish = index.end
-        finish += 1 unless index.exclude_end?
-        _slice_tensor(0, index.begin, finish, 1).copy!(value)
-      elsif index.is_a?(Tensor)
-        index_put!([index], value)
-      else
-        raise Error, "Unsupported index type: #{index.class.name}"
-      end
+      _index_put_custom(tensor_indexes(indexes), value)
     end
 
     # native functions that need manually defined
@@ -244,13 +210,13 @@ module Torch
       end
     end
 
-    # native functions overlap, so need to handle manually
+    # parser can't handle overlap, so need to handle manually
     def random!(*args)
       case args.size
       when 1
         _random__to(*args)
       when 2
-        _random__from_to(*args)
+        _random__from(*args)
       else
         _random_(*args)
       end
@@ -260,5 +226,32 @@ module Torch
       _clamp_min_(min)
       _clamp_max_(max)
     end
+
+    private
+
+    def tensor_indexes(indexes)
+      indexes.map do |index|
+        case index
+        when Integer
+          TensorIndex.integer(index)
+        when Range
+          finish = index.end
+          if finish == -1 && !index.exclude_end?
+            finish = nil
+          else
+            finish += 1 unless index.exclude_end?
+          end
+          TensorIndex.slice(index.begin, finish)
+        when Tensor
+          TensorIndex.tensor(index)
+        when nil
+          TensorIndex.none
+        when true, false
+          TensorIndex.boolean(index)
+        else
+          raise Error, "Unsupported index type: #{index.class.name}"
+        end
+      end
+    end
   end
 end

data/lib/torch/version.rb

@@ -1,3 +1,3 @@
 module Torch
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torch-rb
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice