torch-rb 0.22.2 → 0.23.0

data/ext/torch/device.cpp

@@ -8,7 +8,8 @@
 #include "utils.h"
 
 void init_device(Rice::Module& m) {
-  Rice::define_class_under<torch::Device>(m, "Device")
+  auto rb_cDevice = Rice::define_class_under<torch::Device>(m, "Device");
+  rb_cDevice
     .define_constructor(Rice::Constructor<torch::Device, const std::string&>())
     .define_method(
       "_index",
@@ -28,8 +29,10 @@ void init_device(Rice::Module& m) {
         return s.str();
       })
     .define_method(
-      "_str",
+      "to_s",
       [](torch::Device& self) {
         return self.str();
       });
+
+  THPDeviceClass = rb_cDevice.value();
 }

data/ext/torch/ruby_arg_parser.cpp

@@ -7,6 +7,7 @@
 
 #include "ruby_arg_parser.h"
 
+VALUE THPDeviceClass = Qnil;
 VALUE THPGeneratorClass = Qnil;
 VALUE THPVariableClass = Qnil;
 
@@ -257,7 +258,7 @@ auto FunctionParameter::check(VALUE obj, int argnum) -> bool {
     case ParameterType::LAYOUT: return SYMBOL_P(obj);
     case ParameterType::MEMORY_FORMAT: return false; // return THPMemoryFormat_Check(obj);
     case ParameterType::QSCHEME: return false; // return THPQScheme_Check(obj);
-    case ParameterType::DEVICE: return RB_TYPE_P(obj, T_STRING); // TODO check device
+    case ParameterType::DEVICE: return RB_TYPE_P(obj, T_STRING) || THPDevice_Check(obj);
     case ParameterType::STRING: return RB_TYPE_P(obj, T_STRING);
     case ParameterType::SYM_INT: return is_int_or_symint(obj);
     case ParameterType::SYM_INT_LIST: return is_int_or_symint_list(obj, size);

data/ext/torch/ruby_arg_parser.h

@@ -357,8 +357,11 @@ inline at::Device RubyArgs::device(int i) {
   if (NIL_P(args[i])) {
     return at::Device("cpu");
   }
-  const std::string &device_str = THPUtils_unpackString(args[i]);
-  return at::Device(device_str);
+  if (RB_TYPE_P(args[i], T_STRING)) {
+    const std::string &device_str = THPUtils_unpackString(args[i]);
+    return at::Device(device_str);
+  }
+  return Rice::detail::From_Ruby<at::Device>().convert(args[i]);
 }
 
 inline at::Device RubyArgs::deviceWithDefault(int i, const at::Device& default_device) {

data/ext/torch/templates.h

@@ -69,7 +69,7 @@ namespace Rice::detail {
 
     explicit From_Ruby(Arg* arg) : arg_(arg) { }
 
-    Convertible is_convertible(VALUE value) { return Convertible::Cast; }
+    double is_convertible(VALUE value) { return Convertible::Exact; }
 
     c10::complex<T> convert(VALUE x) {
       VALUE real = rb_funcall(x, rb_intern("real"), 0);
@@ -93,7 +93,7 @@ namespace Rice::detail {
 
     explicit From_Ruby(Arg* arg) : arg_(arg) { }
 
-    Convertible is_convertible(VALUE value) { return Convertible::Cast; }
+    double is_convertible(VALUE value) { return Convertible::Exact; }
 
     FanModeType convert(VALUE x) {
       auto s = String(x).str();
@@ -122,7 +122,7 @@ namespace Rice::detail {
 
     explicit From_Ruby(Arg* arg) : arg_(arg) { }
 
-    Convertible is_convertible(VALUE value) { return Convertible::Cast; }
+    double is_convertible(VALUE value) { return Convertible::Exact; }
 
     NonlinearityType convert(VALUE x) {
       auto s = String(x).str();
@@ -169,7 +169,7 @@ namespace Rice::detail {
 
     explicit From_Ruby(Arg* arg) : arg_(arg) { }
 
-    Convertible is_convertible(VALUE value) { return Convertible::Cast; }
+    double is_convertible(VALUE value) { return Convertible::Exact; }
 
     Scalar convert(VALUE x) {
       if (FIXNUM_P(x)) {

data/ext/torch/tensor.cpp

@@ -215,7 +215,7 @@ void init_tensor(Rice::Module& m, Rice::Class& c, Rice::Class& rb_cTensorOptions
         return s.str();
       })
     .define_method(
-      "_device",
+      "device",
       [](Tensor& self) {
         return self.device();
       })

data/ext/torch/utils.h

@@ -8,7 +8,7 @@
 #include <rice/stl.hpp>
 
 static_assert(
-  TORCH_VERSION_MAJOR == 2 && TORCH_VERSION_MINOR == 9,
+  TORCH_VERSION_MAJOR == 2 && TORCH_VERSION_MINOR == 10,
   "Incompatible LibTorch version"
 );
 
@@ -20,6 +20,7 @@ inline void handle_global_error(const torch::Error& ex) {
 
 // keep THP prefix for now to make it easier to compare code
 
+extern VALUE THPDeviceClass;
 extern VALUE THPGeneratorClass;
 extern VALUE THPVariableClass;
 
@@ -48,6 +49,10 @@ inline bool THPUtils_checkScalar(VALUE obj) {
   return FIXNUM_P(obj) || RB_FLOAT_TYPE_P(obj) || RB_TYPE_P(obj, T_COMPLEX);
 }
 
+inline bool THPDevice_Check(VALUE obj) {
+  return rb_obj_is_kind_of(obj, THPDeviceClass);
+}
+
 inline bool THPGenerator_Check(VALUE obj) {
   return rb_obj_is_kind_of(obj, THPGeneratorClass);
 }

data/lib/torch/device.rb

@@ -8,7 +8,6 @@ module Torch
       extra = ", index: #{index.inspect}" if index?
       "device(type: #{type.inspect}#{extra})"
     end
-    alias_method :to_s, :inspect
 
     def ==(other)
       eql?(other)

data/lib/torch/tensor.rb

@@ -115,7 +115,7 @@ module Torch
       if numel != 1
         raise Error, "only one element tensors can be converted to Ruby scalars"
       end
-      to_a.first
+      to_a.flatten.first
     end
 
     def to_i
@@ -210,10 +210,5 @@ module Torch
         raise TypeError, "#{self.class} can't be coerced into #{other.class}"
       end
     end
-
-    # TODO return Device instead of String in 0.19.0
-    def device
-      _device._str
-    end
   end
 end

data/lib/torch/version.rb

@@ -1,3 +1,3 @@
 module Torch
-  VERSION = "0.22.2"
+  VERSION = "0.23.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: torch-rb
 version: !ruby/object:Gem::Version
-  version: 0.22.2
+  version: 0.23.0
 platform: ruby
 authors:
 - Andrew Kane
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '4.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '4.8'
 email: andrew@ankane.org
 executables: []
 extensions:
@@ -241,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Deep learning for Ruby, powered by LibTorch
 test_files: []