torch-rb 0.10.1 → 0.11.1

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.cpp

@@ -253,6 +253,68 @@ static inline std::vector<int64_t> parse_intlist_args(const std::string& s, int6
   return args;
 }
 
+// Parse a string literal to remove quotes and escape sequences
+static std::string parse_string_literal(c10::string_view str) {
+  TORCH_CHECK(str.length() >= 2, "String defaults must be quoted");
+
+  if (str.front() == '"') {
+    TORCH_CHECK(
+        str.back() == '"', "Mismatched quotes in string default: ", str);
+  } else {
+    TORCH_CHECK(
+        str.front() == '\'' && str.back() == '\'',
+        "Invalid quotes in string default: ",
+        str)
+  }
+
+  std::string parsed;
+  parsed.reserve(str.size());
+  for (size_t i = 1; i < str.size() - 1;) {
+    if (str[i] != '\\') {
+      parsed.push_back(str[i]);
+      ++i;
+      continue;
+    }
+
+    // Handle escape sequences
+    TORCH_CHECK(
+        i < str.size() - 2, "String ends with escaped final quote: ", str)
+    char c = str[i + 1];
+    switch (c) {
+      case '\\':
+      case '\'':
+      case '\"':
+        break;
+      case 'a':
+        c = '\a';
+        break;
+      case 'b':
+        c = '\b';
+        break;
+      case 'f':
+        c = '\f';
+        break;
+      case 'n':
+        c = '\n';
+        break;
+      case 'v':
+        c = '\v';
+        break;
+      case 't':
+        c = '\t';
+        break;
+      default:
+        TORCH_CHECK(
+            false,
+            "Unsupported escape sequence in string default: \\",
+            str[i + 1]);
+    }
+    parsed.push_back(c);
+    i += 2;
+  }
+  return parsed;
+}
+
 void FunctionParameter::set_default_str(const std::string& str) {
   if (str == "None") {
     allow_none = true;
@@ -308,8 +370,8 @@ void FunctionParameter::set_default_str(const std::string& str) {
       throw std::runtime_error("invalid device: " + str);
     }
   } else if (type_ == ParameterType::STRING) {
-    if (str != "None" && str != "") {
-      throw std::runtime_error("invalid default string: " + str);
+    if (str != "None") {
+      default_string = parse_string_literal(str);
     }
   }
 }

data/ext/torch/ruby_arg_parser.h

@@ -35,6 +35,7 @@ struct FunctionParameter {
   at::SmallVector<VALUE, 5> numpy_python_names;
   at::Scalar default_scalar;
   std::vector<int64_t> default_intlist;
+  std::string default_string;
   union {
     bool default_bool;
     int64_t default_int;
@@ -83,8 +84,8 @@ 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);
@@ -108,6 +109,7 @@ struct RubyArgs {
   inline c10::optional<at::MemoryFormat> memoryformatOptional(int i);
   // inline at::QScheme toQScheme(int i);
   inline std::string string(int i);
+  inline std::string stringWithDefault(int i, const std::string& default_str);
   inline c10::optional<std::string> stringOptional(int i);
   inline c10::string_view stringView(int i);
   // inline c10::string_view stringViewWithDefault(int i, const c10::string_view default_str);
@@ -166,8 +168,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 +194,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");
@@ -337,6 +347,11 @@ inline c10::optional<at::MemoryFormat> RubyArgs::memoryformatOptional(int i) {
 }
 
 inline std::string RubyArgs::string(int i) {
+  return stringWithDefault(i, signature.params[i].default_string);
+}
+
+inline std::string RubyArgs::stringWithDefault(int i, const std::string& default_str) {
+  if (!args[i]) return default_str;
   return Rice::detail::From_Ruby<std::string>().convert(args[i]);
 }
 

data/ext/torch/utils.h

@@ -6,7 +6,7 @@
 #include <rice/stl.hpp>
 
 static_assert(
-  TORCH_VERSION_MAJOR == 1 && TORCH_VERSION_MINOR == 11,
+  TORCH_VERSION_MAJOR == 1 && TORCH_VERSION_MINOR == 12,
   "Incompatible LibTorch version"
 );
 

data/lib/torch/tensor.rb

@@ -177,11 +177,6 @@ module Torch
       _random!(*args)
     end
 
-    # center option
-    def stft(*args)
-      Torch.stft(*args)
-    end
-
     def dup
       Torch.no_grad do
         clone
@@ -199,5 +194,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.1"
+  VERSION = "0.11.1"
 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,
@@ -421,18 +422,6 @@ module Torch
       _tensor(data, size, tensor_options(**options))
     end
 
-    # center option
-    def stft(input, n_fft, hop_length: nil, win_length: nil, window: nil, center: true, pad_mode: "reflect", normalized: false, onesided: true, return_complex: nil)
-      if center
-        signal_dim = input.dim
-        extended_shape = [1] * (3 - signal_dim) + input.size
-        pad = n_fft.div(2).to_i
-        input = NN::F.pad(input.view(extended_shape), [pad, pad], mode: pad_mode)
-        input = input.view(input.shape[-signal_dim..-1])
-      end
-      _stft(input, n_fft, hop_length, win_length, window, normalized, onesided, return_complex)
-    end
-
     private
 
     def to_ivalue(obj)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torch-rb
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-12 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:
   - - ">="