torch-rb 0.9.2 → 0.10.2

data/ext/torch/ruby_arg_parser.h

@@ -88,18 +88,18 @@ struct RubyArgs {
   inline c10::optional<at::Generator> generator(int i);
   inline at::Storage storage(int i);
   inline at::ScalarType scalartype(int i);
-  // inline at::ScalarType scalartypeWithDefault(int i, at::ScalarType default_scalartype);
+  inline at::ScalarType scalartypeWithDefault(int i, at::ScalarType default_scalartype);
   inline c10::optional<at::ScalarType> scalartypeOptional(int i);
   inline c10::optional<at::Scalar> scalarOptional(int i);
   inline c10::optional<int64_t> toInt64Optional(int i);
   inline c10::optional<bool> toBoolOptional(int i);
   inline c10::optional<double> toDoubleOptional(int i);
   inline c10::OptionalArray<double> doublelistOptional(int i);
-  // inline at::Layout layout(int i);
-  // inline at::Layout layoutWithDefault(int i, at::Layout default_layout);
+  inline at::Layout layout(int i);
+  inline at::Layout layoutWithDefault(int i, at::Layout default_layout);
   inline c10::optional<at::Layout> layoutOptional(int i);
   inline at::Device device(int i);
-  // inline at::Device deviceWithDefault(int i, const at::Device& default_device);
+  inline at::Device deviceWithDefault(int i, const at::Device& default_device);
   // inline c10::optional<at::Device> deviceOptional(int i);
   // inline at::Dimname dimname(int i);
   // inline std::vector<at::Dimname> dimnamelist(int i);
@@ -240,6 +240,11 @@ inline ScalarType RubyArgs::scalartype(int i) {
   return it->second;
 }
 
+inline at::ScalarType RubyArgs::scalartypeWithDefault(int i, at::ScalarType default_scalartype) {
+  if (NIL_P(args[i])) return default_scalartype;
+  return scalartype(i);
+}
+
 inline c10::optional<ScalarType> RubyArgs::scalartypeOptional(int i) {
   if (NIL_P(args[i])) return c10::nullopt;
   return scalartype(i);
@@ -284,8 +289,8 @@ inline c10::OptionalArray<double> RubyArgs::doublelistOptional(int i) {
   return res;
 }
 
-inline c10::optional<at::Layout> RubyArgs::layoutOptional(int i) {
-  if (NIL_P(args[i])) return c10::nullopt;
+inline at::Layout RubyArgs::layout(int i) {
+  if (NIL_P(args[i])) return signature.params[i].default_layout;
 
   static std::unordered_map<VALUE, Layout> layout_map = {
     {ID2SYM(rb_intern("strided")), Layout::Strided},
@@ -298,6 +303,16 @@ inline c10::optional<at::Layout> RubyArgs::layoutOptional(int i) {
   return it->second;
 }
 
+inline at::Layout RubyArgs::layoutWithDefault(int i, at::Layout default_layout) {
+  if (NIL_P(args[i])) return default_layout;
+  return layout(i);
+}
+
+inline c10::optional<at::Layout> RubyArgs::layoutOptional(int i) {
+  if (NIL_P(args[i])) return c10::nullopt;
+  return layout(i);
+}
+
 inline at::Device RubyArgs::device(int i) {
   if (NIL_P(args[i])) {
     return at::Device("cpu");
@@ -306,6 +321,11 @@ inline at::Device RubyArgs::device(int i) {
   return at::Device(device_str);
 }
 
+inline at::Device RubyArgs::deviceWithDefault(int i, const at::Device& default_device) {
+  if (NIL_P(args[i])) return default_device;
+  return device(i);
+}
+
 inline at::MemoryFormat RubyArgs::memoryformat(int i) {
   if (NIL_P(args[i])) return at::MemoryFormat::Contiguous;
   throw std::runtime_error("memoryformat not supported yet");

data/ext/torch/sparse_functions.h

@@ -0,0 +1,6 @@
+// generated by rake generate:functions
+// do not edit by hand
+
+#pragma once
+
+void add_sparse_functions(Rice::Module& m);

data/ext/torch/utils.h

@@ -1,8 +1,15 @@
 #pragma once
 
+#include <torch/torch.h>
+
 #include <rice/rice.hpp>
 #include <rice/stl.hpp>
 
+static_assert(
+  TORCH_VERSION_MAJOR == 1 && TORCH_VERSION_MINOR == 11,
+  "Incompatible LibTorch version"
+);
+
 // TODO find better place
 inline void handle_error(torch::Error const & ex) {
   throw Rice::Exception(rb_eRuntimeError, ex.what_without_backtrace());

data/lib/torch/nn/parameter_list.rb

@@ -0,0 +1,48 @@
+module Torch
+  module NN
+    class ParameterList < Module
+      include Enumerable
+
+      def initialize(parameters)
+        super()
+        @initialized = true
+        unless parameters.nil?
+          concat(parameters)
+        end
+      end
+
+      def length
+        @parameters.length
+      end
+      alias_method :count, :length
+      alias_method :size, :length
+
+      def concat(parameters)
+        unless parameters.is_a?(Enumerable)
+          raise TypeError, "ParameterList#concat should be called with an enumerable, but got #{parameters.class.name}"
+        end
+        offset = length
+        parameters.each_with_index do |param, i|
+          register_parameter((offset + i).to_s, param)
+        end
+        self
+      end
+
+      def each(&block)
+        if block_given?
+          @parameters.values.each(&block)
+        else
+          to_enum(:each)
+        end
+      end
+
+      def [](idx)
+        if idx.is_a?(Range)
+          self.class.new(@parameters.values[idx])
+        else
+          @parameters[idx.to_s]
+        end
+      end
+    end
+  end
+end

data/lib/torch/tensor.rb

@@ -199,5 +199,13 @@ module Torch
     def real
       Torch.real(self)
     end
+
+    def coerce(other)
+      if other.is_a?(Numeric)
+        [Torch.tensor(other), self]
+      else
+        raise TypeError, "#{self.class} can't be coerced into #{other.class}"
+      end
+    end
   end
 end

data/lib/torch/version.rb

@@ -1,3 +1,3 @@
 module Torch
-  VERSION = "0.9.2"
+  VERSION = "0.10.2"
 end

data/lib/torch.rb

@@ -40,6 +40,7 @@ require "torch/nn/utils"
 # nn containers
 require "torch/nn/module"
 require "torch/nn/module_list"
+require "torch/nn/parameter_list"
 require "torch/nn/sequential"
 
 # nn convolution layers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torch-rb
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-03 00:00:00.000000000 Z
+date: 2022-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -52,6 +52,7 @@ files:
 - ext/torch/random.cpp
 - ext/torch/ruby_arg_parser.cpp
 - ext/torch/ruby_arg_parser.h
+- ext/torch/sparse_functions.h
 - ext/torch/special.cpp
 - ext/torch/special_functions.h
 - ext/torch/templates.h
@@ -149,6 +150,7 @@ files:
 - lib/torch/nn/nll_loss.rb
 - lib/torch/nn/pairwise_distance.rb
 - lib/torch/nn/parameter.rb
+- lib/torch/nn/parameter_list.rb
 - lib/torch/nn/poisson_nll_loss.rb
 - lib/torch/nn/prelu.rb
 - lib/torch/nn/reflection_pad1d.rb
@@ -227,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Deep learning for Ruby, powered by LibTorch