torch-rb 0.1.3 → 0.1.4

data/lib/torch/nn/mse_loss.rb

@@ -1,8 +1,8 @@
 module Torch
   module NN
-    class MSELoss < Module
+    class MSELoss < Loss
       def initialize(reduction: "mean")
-        @reduction = reduction
+        super(reduction)
       end
 
       def forward(input, target)

data/lib/torch/nn/nll_loss.rb

@@ -0,0 +1,14 @@
+module Torch
+  module NN
+    class NLLLoss < WeightedLoss
+      def initialize(weight: nil, ignore_index: -100, reduction: "mean")
+        super(weight, reduction)
+        @ignore_index = ignore_index
+      end
+
+      def forward(input, target)
+        F.nll_loss(input, target, weight: @weight, ignore_index: @ignore_index, reduction: @reduction)
+      end
+    end
+  end
+end

data/lib/torch/nn/pairwise_distance.rb

@@ -0,0 +1,16 @@
+module Torch
+  module NN
+    class PairwiseDistance < Module
+      def initialize(p: 2.0, eps: 1e-6, keepdim: false)
+        super()
+        @norm = p
+        @eps = eps
+        @keepdim = keepdim
+      end
+
+      def forward(x1, x2)
+        F.pairwise_distance(x1, x2, p: @norm, eps: @eps, keepdim: @keepdim)
+      end
+    end
+  end
+end

data/lib/torch/nn/parameter.rb

@@ -5,10 +5,6 @@ module Torch
         data = Tensor.new unless data
         Tensor._make_subclass(data, requires_grad)
       end
-
-      def grad
-        _grad if _grad_defined
-      end
     end
   end
 end

data/lib/torch/nn/poisson_nll_loss.rb

@@ -0,0 +1,16 @@
+module Torch
+  module NN
+    class PoissonNLLLoss < Loss
+      def initialize(log_input: true, full: false, eps: 1e-8, reduction: "mean")
+        super(reduction)
+        @log_input = log_input
+        @full = full
+        @eps = eps
+      end
+
+      def forward(log_input, target)
+        F.poisson_nll_loss(log_input, target, log_input: @log_input, full: @full, eps: @eps, reduction: @reduction)
+      end
+    end
+  end
+end

data/lib/torch/nn/prelu.rb

@@ -0,0 +1,19 @@
+module Torch
+  module NN
+    class PReLU < Module
+      def initialize(num_parameters: 1, init: 0.25)
+        @num_parameters = num_parameters
+        super()
+        @weight = Parameter.new(Tensor.new(num_parameters).fill!(init))
+      end
+
+      def forward(input)
+        F.prelu(input, @weight)
+      end
+
+      def extra_inspect
+        format("num_parameters: %s", @num_parameters)
+      end
+    end
+  end
+end

data/lib/torch/nn/relu.rb

@@ -1,12 +1,17 @@
 module Torch
   module NN
     class ReLU < Module
-      def initialize #(inplace: false)
-        # @inplace = inplace
+      def initialize(inplace: false)
+        super()
+        @inplace = inplace
       end
 
       def forward(input)
-        F.relu(input) #, inplace: @inplace)
+        F.relu(input, inplace: @inplace)
+      end
+
+      def extra_inspect
+        @inplace ? "inplace: true" : ""
       end
     end
   end

data/lib/torch/nn/sequential.rb

@@ -2,28 +2,19 @@ module Torch
   module NN
     class Sequential < Module
       def initialize(*args)
-        @modules = {}
+        super()
         # TODO support hash arg (named modules)
         args.each_with_index do |mod, idx|
           add_module(idx.to_s, mod)
         end
       end
 
-      def add_module(name, mod)
-        # TODO add checks
-        @modules[name] = mod
-      end
-
       def forward(input)
         @modules.values.each do |mod|
           input = mod.call(input)
         end
         input
       end
-
-      def parameters
-        @modules.flat_map { |_, mod| mod.parameters }
-      end
     end
   end
 end

data/lib/torch/nn/sigmoid.rb

@@ -0,0 +1,9 @@
+module Torch
+  module NN
+    class Sigmoid < Module
+      def forward(input)
+        Torch.sigmoid(input)
+      end
+    end
+  end
+end

data/lib/torch/nn/softmax.rb

@@ -0,0 +1,18 @@
+module Torch
+  module NN
+    class Softmax < Module
+      def initialize(dim: nil)
+        super()
+        @dim = dim
+      end
+
+      def forward(input)
+        F.softmax(input, dim: @dim)
+      end
+
+      def extra_inspect
+        format("dim: %s", @dim)
+      end
+    end
+  end
+end

data/lib/torch/nn/softmax2d.rb

@@ -0,0 +1,10 @@
+module Torch
+  module NN
+    class Softmax2d < Module
+      def forward(input)
+        raise ArgumentError, "Softmax2d requires a 4D tensor as input" unless input.dim == 4
+        F.softmax(input, dim: 1)
+      end
+    end
+  end
+end

data/lib/torch/nn/softmin.rb

@@ -0,0 +1,14 @@
+module Torch
+  module NN
+    class Softmin < Module
+      def initialize(dim: nil)
+        super()
+        @dim = dim
+      end
+
+      def forward(input)
+        F.softmin(input, dim: @dim)
+      end
+    end
+  end
+end

data/lib/torch/nn/softplus.rb

@@ -0,0 +1,19 @@
+module Torch
+  module NN
+    class Softplus < Module
+      def initialize(beta: 1, threshold: 20)
+        super()
+        @beta = beta
+        @threshold = threshold
+      end
+
+      def forward(input)
+        F.softplus(input, beta: @beta, threshold: @threshold)
+      end
+
+      def extra_inspect
+        format("beta: %s, threshold: %s", @beta, @threshold)
+      end
+    end
+  end
+end

data/lib/torch/nn/weighted_loss.rb

@@ -0,0 +1,10 @@
+module Torch
+  module NN
+    class WeightedLoss < Loss
+      def initialize(weight, reduction)
+        super(reduction)
+        register_buffer("weight", weight)
+      end
+    end
+  end
+end

data/lib/torch/random.rb

@@ -0,0 +1,10 @@
+module Torch
+  module Random
+    class << self
+      # not available through LibTorch
+      def initial_seed
+        raise NotImplementedYet
+      end
+    end
+  end
+end

data/lib/torch/tensor.rb

@@ -66,16 +66,11 @@ module Torch
     end
 
     def backward(gradient = nil)
-      if gradient
-        _backward_gradient(gradient)
-      else
-        _backward
-      end
+      _backward(gradient)
     end
 
     # TODO read directly from memory
     def numo
-      raise Error, "Numo not found" unless defined?(Numo::NArray)
       cls = Torch._dtype_to_numo[dtype]
       raise Error, "Cannot convert #{dtype} to Numo" unless cls
       cls.cast(_data).reshape(*shape)
@@ -113,7 +108,7 @@ module Torch
     end
 
     # operations
-    %w(abs add argmax div dot eq exp gt log lt matmul max mean min mul neg norm num numel pow remainder reshape sign sqrt sub sum unsqueeze).each do |op|
+    %w(abs add argmax div dot eq exp gt log log_softmax lt matmul max mean min mul neg norm num numel pow relu remainder reshape sign softmax sqrt sub sum unsqueeze topk).each do |op|
       define_method(op) do |*args, **options, &block|
         if options.any?
           Torch.send(op, self, *args, **options, &block)
@@ -167,8 +162,14 @@ module Torch
           finish += 1 unless index.exclude_end?
           result = result._slice(dim, index.begin, finish, 1)
           dim += 1
+        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"
+          raise Error, "Unsupported index type: #{index.class.name}"
         end
       end
       result
@@ -176,11 +177,28 @@ module Torch
 
     # TODO
     # based on python_variable_indexing.cpp
-    # def []=(index, value)
-    # end
+    def []=(index, value)
+      raise ArgumentError, "Tensor does not support deleting items" if value.nil?
+
+      value = Torch.tensor(value) unless value.is_a?(Tensor)
+
+      if index.is_a?(Numeric)
+        copy_to(_select(0, index), value)
+      elsif index.is_a?(Range)
+        finish = index.end
+        finish += 1 unless index.exclude_end?
+        copy_to(_slice(0, index.begin, finish, 1), value)
+      else
+        raise Error, "Unsupported index type: #{index.class.name}"
+      end
+    end
 
     private
 
+    def copy_to(dst, src)
+      dst.copy!(src)
+    end
+
     def reshape_arr(arr, dims)
       if dims.empty?
         arr

data/lib/torch/version.rb

@@ -1,3 +1,3 @@
 module Torch
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torch-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-30 00:00:00.000000000 Z
+date: 2019-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -111,22 +111,48 @@ files:
 - lib/torch/ext.bundle
 - lib/torch/inspector.rb
 - lib/torch/nn/alpha_dropout.rb
+- lib/torch/nn/avg_pool2d.rb
+- lib/torch/nn/avg_poolnd.rb
+- lib/torch/nn/bce_loss.rb
+- lib/torch/nn/bilinear.rb
 - lib/torch/nn/conv2d.rb
 - lib/torch/nn/convnd.rb
+- lib/torch/nn/cosine_similarity.rb
+- lib/torch/nn/cross_entropy_loss.rb
+- lib/torch/nn/ctc_loss.rb
 - lib/torch/nn/dropout.rb
 - lib/torch/nn/dropout2d.rb
 - lib/torch/nn/dropout3d.rb
 - lib/torch/nn/dropoutnd.rb
 - lib/torch/nn/embedding.rb
+- lib/torch/nn/embedding_bag.rb
 - lib/torch/nn/feature_alpha_dropout.rb
 - lib/torch/nn/functional.rb
+- lib/torch/nn/identity.rb
 - lib/torch/nn/init.rb
+- lib/torch/nn/kl_div_loss.rb
+- lib/torch/nn/l1_loss.rb
+- lib/torch/nn/leaky_relu.rb
 - lib/torch/nn/linear.rb
+- lib/torch/nn/log_softmax.rb
+- lib/torch/nn/loss.rb
+- lib/torch/nn/max_pool2d.rb
+- lib/torch/nn/max_poolnd.rb
 - lib/torch/nn/module.rb
 - lib/torch/nn/mse_loss.rb
+- lib/torch/nn/nll_loss.rb
+- lib/torch/nn/pairwise_distance.rb
 - lib/torch/nn/parameter.rb
+- lib/torch/nn/poisson_nll_loss.rb
+- lib/torch/nn/prelu.rb
 - lib/torch/nn/relu.rb
 - lib/torch/nn/sequential.rb
+- lib/torch/nn/sigmoid.rb
+- lib/torch/nn/softmax.rb
+- lib/torch/nn/softmax2d.rb
+- lib/torch/nn/softmin.rb
+- lib/torch/nn/softplus.rb
+- lib/torch/nn/weighted_loss.rb
 - lib/torch/optim/adadelta.rb
 - lib/torch/optim/adagrad.rb
 - lib/torch/optim/adam.rb
@@ -139,6 +165,7 @@ files:
 - lib/torch/optim/rmsprop.rb
 - lib/torch/optim/rprop.rb
 - lib/torch/optim/sgd.rb
+- lib/torch/random.rb
 - lib/torch/tensor.rb
 - lib/torch/utils/data/data_loader.rb
 - lib/torch/utils/data/tensor_dataset.rb