torch-rb 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7884d0bd8ffd23e775b3a1ca59e536bc18cd79c6bbe2736a9802a2b1693d40de
-  data.tar.gz: 10849c8a248a70eca7178ca3529fa7428fc3d8e5cfe2ca774b0be6cb5e75eb9b
+  metadata.gz: f4665eec43d85fbf02ce75f4b268dbf001bfad7e3ae1ecace0e9911b651e2cc2
+  data.tar.gz: d11ee1386ce7feeea68333de6c361d8737a7164cfd1626abce3a511deecb2963
 SHA512:
-  metadata.gz: d81587eae00527e9d1e4a65b62a686dbdab27eed9401539faddf553d3a0730ad7394b01bac615bdd0474d1a6602cd0a3117e1d7cb3a3f1d5fbf8bd989fa39e59
-  data.tar.gz: d581d07821f103ee69267bc8e6b15d5094d8b8ef004917af947e2570649e7fbe750c9893d40600b62ee970646654fc545a270e7a59adb764be2ba73f1fa18b62
+  metadata.gz: cf346bc03f36d4fc920151b0554c93c33a59d0fecd35c6f110dc862ad8b35c6b8641d306124505ddd012ce9d903363672e99772cc2bd7b981d962c9d00f08d3e
+  data.tar.gz: 265157846417fdc3c024e0f50d0b0a663d345ca423ad9233a7d0e722bf5134a8e15e1afce30248992155787484e80311e484c64c5787945b5f5a88625115479a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.10.1 (2022-04-12)
+
+- Fixed `dtype`, `device`, and `layout` for `new_*` and `like_*` methods
+
 ## 0.10.0 (2022-03-13)
 
 - Updated LibTorch to 1.11.0

data/codegen/generate_functions.rb

@@ -293,7 +293,13 @@ def split_opt_params(params)
 end
 
 def generate_tensor_options(function, opt_params)
-  code = "\n  const auto options = TensorOptions()"
+  new_function = function.base_name.start_with?("new_")
+  like_function = function.base_name.end_with?("_like")
+
+  code = String.new("")
+  code << "\n  auto self = _r.tensor(0);" if like_function
+  code << "\n  const auto options = TensorOptions()"
+
   order = ["dtype", "device", "layout", "requires_grad", "pin_memory"]
   opt_params.sort_by { |v| order.index(v[:name]) }.each do |opt|
     i = opt[:position]
@@ -304,12 +310,24 @@ def generate_tensor_options(function, opt_params)
         if function.base_name == "arange"
           "dtype(_r.scalartypeOptional(#{i}))"
         else
-          "dtype(_r.scalartype(#{i}))"
+          if new_function || like_function
+            "dtype(_r.scalartypeWithDefault(#{i}, self.scalar_type()))"
+          else
+            "dtype(_r.scalartype(#{i}))"
+          end
         end
       when "device"
-        "device(_r.device(#{i}))"
+        if new_function || like_function
+          "device(_r.deviceWithDefault(#{i}, self.device()))"
+        else
+          "device(_r.device(#{i}))"
+        end
       when "layout"
-        "layout(_r.layoutOptional(#{i}))"
+        if new_function || like_function
+          "layout(_r.layoutWithDefault(#{i}, self.layout()))"
+        else
+          "layout(_r.layoutOptional(#{i}))"
+        end
       when "requires_grad"
         "requires_grad(_r.toBool(#{i}))"
       when "pin_memory"

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/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/version.rb

@@ -1,3 +1,3 @@
 module Torch
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torch-rb
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-13 00:00:00.000000000 Z
+date: 2022-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice