torch-rb 0.21.0 → 0.22.1

data/ext/torch/ext.cpp

@@ -16,10 +16,14 @@ void init_generator(Rice::Module& m, Rice::Class& rb_cGenerator);
 void init_ivalue(Rice::Module& m, Rice::Class& rb_cIValue);
 void init_random(Rice::Module& m);
 
+VALUE rb_eTorchError = Qnil;
+
 extern "C"
 void Init_ext() {
   auto m = Rice::define_module("Torch");
 
+  rb_eTorchError = Rice::define_class_under(m, "Error", rb_eStandardError);
+
   // need to define certain classes up front to keep Rice happy
   auto rb_cIValue = Rice::define_class_under<torch::IValue>(m, "IValue")
     .define_constructor(Rice::Constructor<torch::IValue>());

data/ext/torch/ivalue.cpp

@@ -55,7 +55,7 @@ void init_ivalue(Rice::Module& m, Rice::Class& rb_cIValue) {
         Rice::Array obj;
         for (auto& elem : list) {
           auto v = torch::IValue{elem};
-          obj.push(Rice::Object(Rice::detail::To_Ruby<torch::IValue>().convert(v)));
+          obj.push(Rice::Object(Rice::detail::To_Ruby<torch::IValue>().convert(v)), false);
         }
         return obj;
       })

data/ext/torch/templates.h

@@ -31,7 +31,7 @@ using torch::nn::init::NonlinearityType;
 
 #define END_HANDLE_TH_ERRORS                                         \
   } catch (const torch::Error& ex) {                                 \
-    rb_raise(rb_eRuntimeError, "%s", ex.what_without_backtrace());   \
+    rb_raise(rb_eTorchError, "%s", ex.what_without_backtrace());   \
   } catch (const Rice::Exception& ex) {                              \
     rb_raise(ex.class_of(), "%s", ex.what());                        \
   } catch (const std::exception& ex) {                               \
@@ -50,14 +50,25 @@ namespace Rice::detail {
   template<typename T>
   class To_Ruby<c10::complex<T>> {
   public:
+    To_Ruby() = default;
+
+    explicit To_Ruby(Arg* arg) : arg_(arg) { }
+
     VALUE convert(c10::complex<T> const& x) {
       return rb_dbl_complex_new(x.real(), x.imag());
     }
+
+  private:
+    Arg* arg_ = nullptr;
   };
 
   template<typename T>
   class From_Ruby<c10::complex<T>> {
   public:
+    From_Ruby() = default;
+
+    explicit From_Ruby(Arg* arg) : arg_(arg) { }
+
     Convertible is_convertible(VALUE value) { return Convertible::Cast; }
 
     c10::complex<T> convert(VALUE x) {
@@ -65,6 +76,9 @@ namespace Rice::detail {
       VALUE imag = rb_funcall(x, rb_intern("imag"), 0);
       return c10::complex<T>(From_Ruby<T>().convert(real), From_Ruby<T>().convert(imag));
     }
+
+  private:
+    Arg* arg_ = nullptr;
   };
 
   template<>
@@ -75,6 +89,10 @@ namespace Rice::detail {
   template<>
   class From_Ruby<FanModeType> {
   public:
+    From_Ruby() = default;
+
+    explicit From_Ruby(Arg* arg) : arg_(arg) { }
+
     Convertible is_convertible(VALUE value) { return Convertible::Cast; }
 
     FanModeType convert(VALUE x) {
@@ -87,6 +105,9 @@ namespace Rice::detail {
         throw std::runtime_error("Unsupported nonlinearity type: " + s);
       }
     }
+
+  private:
+    Arg* arg_ = nullptr;
   };
 
   template<>
@@ -97,6 +118,10 @@ namespace Rice::detail {
   template<>
   class From_Ruby<NonlinearityType> {
   public:
+    From_Ruby() = default;
+
+    explicit From_Ruby(Arg* arg) : arg_(arg) { }
+
     Convertible is_convertible(VALUE value) { return Convertible::Cast; }
 
     NonlinearityType convert(VALUE x) {
@@ -127,6 +152,9 @@ namespace Rice::detail {
         throw std::runtime_error("Unsupported nonlinearity type: " + s);
       }
     }
+
+  private:
+    Arg* arg_ = nullptr;
   };
 
   template<>
@@ -137,6 +165,10 @@ namespace Rice::detail {
   template<>
   class From_Ruby<Scalar> {
   public:
+    From_Ruby() = default;
+
+    explicit From_Ruby(Arg* arg) : arg_(arg) { }
+
     Convertible is_convertible(VALUE value) { return Convertible::Cast; }
 
     Scalar convert(VALUE x) {
@@ -146,5 +178,8 @@ namespace Rice::detail {
         return torch::Scalar(From_Ruby<double>().convert(x));
       }
     }
+
+  private:
+    Arg* arg_ = nullptr;
   };
 } // namespace Rice::detail

data/ext/torch/tensor.cpp

@@ -20,7 +20,7 @@ Array flat_data(Tensor& tensor) {
 
   Array a;
   for (int i = 0; i < tensor.numel(); i++) {
-    a.push(view[i].item().to<T>());
+    a.push(view[i].item().to<T>(), false);
   }
   return a;
 }
@@ -129,7 +129,7 @@ void init_tensor(Rice::Module& m, Rice::Class& c, Rice::Class& rb_cTensorOptions
       [](Tensor& self) {
         Array a;
         for (auto &size : self.sizes()) {
-          a.push(size);
+          a.push(size, false);
         }
         return a;
       })
@@ -138,7 +138,7 @@ void init_tensor(Rice::Module& m, Rice::Class& c, Rice::Class& rb_cTensorOptions
       [](Tensor& self) {
         Array a;
         for (auto &stride : self.strides()) {
-          a.push(stride);
+          a.push(stride, false);
         }
         return a;
       })

data/ext/torch/utils.h

@@ -8,12 +8,14 @@
 #include <rice/stl.hpp>
 
 static_assert(
-  TORCH_VERSION_MAJOR == 2 && TORCH_VERSION_MINOR == 8,
+  TORCH_VERSION_MAJOR == 2 && TORCH_VERSION_MINOR == 9,
   "Incompatible LibTorch version"
 );
 
+extern VALUE rb_eTorchError;
+
 inline void handle_global_error(const torch::Error& ex) {
-  throw Rice::Exception(rb_eRuntimeError, ex.what_without_backtrace());
+  throw Rice::Exception(rb_eTorchError, ex.what_without_backtrace());
 }
 
 // keep THP prefix for now to make it easier to compare code

data/lib/torch/version.rb

@@ -1,3 +1,3 @@
 module Torch
-  VERSION = "0.21.0"
+  VERSION = "0.22.1"
 end

data/lib/torch.rb

@@ -210,7 +210,6 @@ require_relative "torch/utils/data/tensor_dataset"
 require_relative "torch/hub"
 
 module Torch
-  class Error < StandardError; end
   class NotImplementedYet < StandardError
     def message
       "This feature has not been implemented yet. Consider submitting a PR."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: torch-rb
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.1
 platform: ruby
 authors:
 - Andrew Kane
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '4.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.5'
+        version: '4.7'
 email: andrew@ankane.org
 executables: []
 extensions: