torch-rb 0.10.0 → 0.11.0

data/ext/torch/extconf.rb

@@ -7,21 +7,9 @@ $CXXFLAGS += " -D_GLIBCXX_USE_CXX11_ABI=1"
 
 apple_clang = RbConfig::CONFIG["CC_VERSION_MESSAGE"] =~ /apple clang/i
 
-# check omp first
-if have_library("omp") || have_library("gomp")
-  $CXXFLAGS += " -Xclang" if apple_clang
-  $CXXFLAGS += " -fopenmp"
-end
-
 if apple_clang
-  # silence rice warnings
-  $CXXFLAGS += " -Wno-deprecated-declarations"
-
-  # silence ruby/intern.h warning
-  $CXXFLAGS += " -Wno-deprecated-register"
-
   # silence torch warnings
-  $CXXFLAGS += " -Wno-shorten-64-to-32 -Wno-missing-noreturn"
+  $CXXFLAGS += " -Wno-deprecated-declarations"
 else
   # silence rice warnings
   $CXXFLAGS += " -Wno-noexcept-type"

data/ext/torch/ruby_arg_parser.h

@@ -83,23 +83,23 @@ struct RubyArgs {
   template<int N>
   inline std::array<at::Tensor, N> tensorlist_n(int i);
   inline std::vector<int64_t> intlist(int i);
-  // inline c10::OptionalArray<int64_t> intlistOptional(int i);
-  // inline std::vector<int64_t> intlistWithDefault(int i, std::vector<int64_t> default_intlist);
+  inline c10::OptionalArray<int64_t> intlistOptional(int i);
+  inline std::vector<int64_t> intlistWithDefault(int i, std::vector<int64_t> default_intlist);
   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);
@@ -166,8 +166,11 @@ inline std::array<at::Tensor, N> RubyArgs::tensorlist_n(int i) {
 }
 
 inline std::vector<int64_t> RubyArgs::intlist(int i) {
-  if (NIL_P(args[i])) return signature.params[i].default_intlist;
+  return intlistWithDefault(i, signature.params[i].default_intlist);
+}
 
+inline std::vector<int64_t> RubyArgs::intlistWithDefault(int i, std::vector<int64_t> default_intlist) {
+  if (NIL_P(args[i])) return default_intlist;
   VALUE arg = args[i];
   auto size = signature.params[i].size;
   if (size > 0 && FIXNUM_P(arg)) {
@@ -189,6 +192,11 @@ inline std::vector<int64_t> RubyArgs::intlist(int i) {
   return res;
 }
 
+inline c10::OptionalArray<int64_t> RubyArgs::intlistOptional(int i) {
+  if (NIL_P(args[i])) return {};
+  return intlist(i);
+}
+
 inline c10::optional<at::Generator> RubyArgs::generator(int i) {
   if (NIL_P(args[i])) return c10::nullopt;
   throw std::runtime_error("generator not supported yet");
@@ -240,6 +248,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 +297,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 +311,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 +329,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 == 12,
+  "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/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.10.0"
+  VERSION = "0.11.0"
 end

data/lib/torch.rb

@@ -249,6 +249,7 @@ module Torch
     complex_float: 9,
     complex64: 9,
     complex_double: 10,
+    cdouble: 10,
     complex128: 10,
     bool: 11,
     qint8: 12,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torch-rb
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-13 00:00:00.000000000 Z
+date: 2022-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -222,7 +222,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="