torch-rb 0.2.4 → 0.3.1

data/lib/torch/native/parser.rb

@@ -75,7 +75,7 @@ module Torch
                 v.is_a?(Tensor)
               when "Tensor?"
                 v.nil? || v.is_a?(Tensor)
-              when "Tensor[]"
+              when "Tensor[]", "Tensor?[]"
                 v.is_a?(Array) && v.all? { |v2| v2.is_a?(Tensor) }
               when "int"
                 if k == "reduction"

data/lib/torch/nn/conv2d.rb

@@ -18,7 +18,6 @@ module Torch
         F.conv2d(input, @weight, @bias, @stride, @padding, @dilation, @groups)
       end
 
-      # TODO add more parameters
       def extra_inspect
         s = String.new("%{in_channels}, %{out_channels}, kernel_size: %{kernel_size}, stride: %{stride}")
         s += ", padding: %{padding}" if @padding != [0] * @padding.size

data/lib/torch/nn/module.rb

@@ -145,7 +145,7 @@ module Torch
         params = {}
         if recurse
           named_children.each do |name, mod|
-            params.merge!(mod.named_parameters(prefix: "#{name}.", recurse: recurse))
+            params.merge!(mod.named_parameters(prefix: "#{prefix}#{name}.", recurse: recurse))
           end
         end
         instance_variables.each do |name|
@@ -286,8 +286,11 @@ module Torch
         str % vars
       end
 
+      # used for format
+      # remove tensors for performance
+      # so we can skip call to inspect
       def dict
-        instance_variables.map { |k| [k[1..-1].to_sym, instance_variable_get(k)] }.to_h
+        instance_variables.reject { |k| instance_variable_get(k).is_a?(Tensor) }.map { |k| [k[1..-1].to_sym, instance_variable_get(k)] }.to_h
       end
     end
   end

data/lib/torch/optim/optimizer.rb

@@ -32,9 +32,11 @@ module Torch
       end
 
       def state_dict
+        raise NotImplementedYet
+
         pack_group = lambda do |group|
-          packed = group.select { |k, _| k != :params }.to_h
-          packed[:params] = group[:params].map { |p| p.object_id }
+          packed = group.select { |k, _| k != :params }.map { |k, v| [k.to_s, v] }.to_h
+          packed["params"] = group[:params].map { |p| p.object_id }
           packed
         end
 
@@ -42,8 +44,8 @@ module Torch
         packed_state = @state.map { |k, v| [k.is_a?(Tensor) ? k.object_id : k, v] }.to_h
 
         {
-          state: packed_state,
-          param_groups: param_groups
+          "state" => packed_state,
+          "param_groups" => param_groups
         }
       end
 

data/lib/torch/optim/rprop.rb

@@ -11,9 +11,6 @@ module Torch
       end
 
       def step(closure = nil)
-        # TODO implement []=
-        raise NotImplementedYet
-
         loss = nil
         if closure
           loss = closure.call

data/lib/torch/tensor.rb

@@ -1,6 +1,7 @@
 module Torch
   class Tensor
     include Comparable
+    include Enumerable
     include Inspector
 
     alias_method :requires_grad?, :requires_grad
@@ -25,14 +26,36 @@ module Torch
       inspect
     end
 
+    def each
+      return enum_for(:each) unless block_given?
+
+      size(0).times do |i|
+        yield self[i]
+      end
+    end
+
+    # TODO make more performant
     def to_a
-      reshape_arr(_flat_data, shape)
+      arr = _flat_data
+      if shape.empty?
+        arr
+      else
+        shape[1..-1].reverse.each do |dim|
+          arr = arr.each_slice(dim)
+        end
+        arr.to_a
+      end
     end
 
-    # TODO support dtype
-    def to(device, non_blocking: false, copy: false)
+    def to(device = nil, dtype: nil, non_blocking: false, copy: false)
+      device ||= self.device
       device = Device.new(device) if device.is_a?(String)
-      _to(device, _dtype, non_blocking, copy)
+
+      dtype ||= self.dtype
+      enum = DTYPE_TO_ENUM[dtype]
+      raise Error, "Unknown type: #{dtype}" unless enum
+
+      _to(device, enum, non_blocking, copy)
     end
 
     def cpu
@@ -64,7 +87,7 @@ module Torch
       if numel != 1
         raise Error, "only one element tensors can be converted to Ruby scalars"
       end
-      _flat_data.first
+      to_a.first
     end
 
     def to_i
@@ -80,15 +103,16 @@ module Torch
       Torch.empty(0, dtype: dtype)
     end
 
-    def backward(gradient = nil)
-      _backward(gradient)
+    def backward(gradient = nil, retain_graph: nil, create_graph: false)
+      retain_graph = create_graph if retain_graph.nil?
+      _backward(gradient, retain_graph, create_graph)
     end
 
     # TODO read directly from memory
     def numo
       cls = Torch._dtype_to_numo[dtype]
       raise Error, "Cannot convert #{dtype} to Numo" unless cls
-      cls.cast(_flat_data).reshape(*shape)
+      cls.from_string(_data_str).reshape(*shape)
     end
 
     def new_ones(*size, **options)
@@ -116,15 +140,6 @@ module Torch
       _view(size)
     end
 
-    # value and other are swapped for some methods
-    def add!(value = 1, other)
-      if other.is_a?(Numeric)
-        _add__scalar(other, value)
-      else
-        _add__tensor(other, value)
-      end
-    end
-
     def +(other)
       add(other)
     end
@@ -153,12 +168,25 @@ module Torch
       neg
     end
 
+    def &(other)
+      logical_and(other)
+    end
+
+    def |(other)
+      logical_or(other)
+    end
+
+    def ^(other)
+      logical_xor(other)
+    end
+
     # TODO better compare?
     def <=>(other)
       item <=> other
     end
 
-    # based on python_variable_indexing.cpp
+    # based on python_variable_indexing.cpp and
+    # https://pytorch.org/cppdocs/notes/tensor_indexing.html
     def [](*indexes)
       result = self
       dim = 0
@@ -170,6 +198,8 @@ module Torch
           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
@@ -183,24 +213,37 @@ module Torch
       result
     end
 
-    # TODO
-    # based on python_variable_indexing.cpp
+    # based on python_variable_indexing.cpp and
+    # https://pytorch.org/cppdocs/notes/tensor_indexing.html
     def []=(index, value)
       raise ArgumentError, "Tensor does not support deleting items" if value.nil?
 
-      value = Torch.tensor(value) unless value.is_a?(Tensor)
+      value = Torch.tensor(value, dtype: dtype) unless value.is_a?(Tensor)
 
       if index.is_a?(Numeric)
-        copy_to(_select_int(0, index), value)
+        index_put!([Torch.tensor(index)], value)
       elsif index.is_a?(Range)
         finish = index.end
         finish += 1 unless index.exclude_end?
-        copy_to(_slice_tensor(0, index.begin, finish, 1), value)
+        _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
     end
 
+    # native functions that need manually defined
+
+    # value and other are swapped for some methods
+    def add!(value = 1, other)
+      if other.is_a?(Numeric)
+        _add__scalar(other, value)
+      else
+        _add__tensor(other, value)
+      end
+    end
+
     # native functions overlap, so need to handle manually
     def random!(*args)
       case args.size
@@ -213,22 +256,9 @@ module Torch
       end
     end
 
-    private
-
-    def copy_to(dst, src)
-      dst.copy!(src)
-    end
-
-    def reshape_arr(arr, dims)
-      if dims.empty?
-        arr
-      else
-        arr = arr.flatten
-        dims[1..-1].reverse.each do |dim|
-          arr = arr.each_slice(dim)
-        end
-        arr.to_a
-      end
+    def clamp!(min, max)
+      _clamp_min_(min)
+      _clamp_max_(max)
     end
   end
 end

data/lib/torch/version.rb

@@ -1,3 +1,3 @@
 module Torch
-  VERSION = "0.2.4"
+  VERSION = "0.3.1"
 end

metadata

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