torch-rb 0.11.0 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2f88c938144476a772fd7c606751e0a6e67a338cb1c37ede9c2011db7fc4579
-  data.tar.gz: f4408457e3bf8c7bf9b42863459248aa592c70e8e3924cdbe72863a979e65106
+  metadata.gz: 618b3c09305777402177e8bc3d536053434b1c94e5294035a8b4a78e645b3873
+  data.tar.gz: 910ac373619cb43887826d6277bc075b88311abd5dcc2be92bc6e9e15a35971d
 SHA512:
-  metadata.gz: 90ebc506942809b02331f7accce6e93e714a57b5d2f58b06ad0d3c60204b947eba61fe0bf43431a19e27890f5c764cb348ccb1785a2ffccfba7969f4726b6f1f
-  data.tar.gz: 410af7b4934f79aaae94f6c1bde1d17ee8b043f02354b4ea9f139271575f43abb90afeba162badfa01a3ec406612ae6cdcb4a2adfb1067b1634982a590d10cc9
+  metadata.gz: af100f347769a268f7b45779fd9531f631e341bb0af4c999b1fba075b5d1aedae2d736eff048d9926c005b56e1ae35582a946b71db0cba5e62d83e938c315814
+  data.tar.gz: 67803295ac4642c4cd32e66e9f3fcdeaaa33a37ae675693236c0561c4dfb4d6d405db6277ab156b0f31415058333ecd2aa06b3788f895a7836fc277b4d3fc084

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.11.2 (2022-09-25)
+
+- Improved LibTorch detection for Homebrew on Mac ARM and Linux
+
+## 0.11.1 (2022-07-06)
+
+- Fixed error with `stft` method
+
 ## 0.11.0 (2022-07-06)
 
 - Updated LibTorch to 1.12.0

data/README.md

@@ -428,20 +428,6 @@ You can also use Homebrew.
 brew install libtorch
 ```
 
-For Mac ARM, run:
-
-```sh
-bundle config build.torch-rb --with-torch-dir=/opt/homebrew
-```
-
-And for Linux, run:
-
-```sh
-bundle config build.torch-rb --with-torch-dir=/home/linuxbrew/.linuxbrew
-```
-
-Then install the gem.
-
 ## Performance
 
 Deep learning is significantly faster on a GPU. With Linux, install [CUDA](https://developer.nvidia.com/cuda-downloads) and [cuDNN](https://developer.nvidia.com/cudnn) and reinstall the gem.

data/codegen/generate_functions.rb

@@ -128,8 +128,11 @@ def write_body(type, method_defs, attach_defs)
 end
 
 def write_file(name, contents)
-  path = File.expand_path("../ext/torch", __dir__)
-  File.write(File.join(path, name), contents)
+  path = File.join(File.expand_path("../ext/torch", __dir__), name)
+  # only write if changed to improve compile times in development
+  if !File.exist?(path) || File.read(path) != contents
+    File.write(path, contents)
+  end
 end
 
 def generate_attach_def(name, type, def_method)
@@ -142,14 +145,14 @@ def generate_attach_def(name, type, def_method)
       name
     end
 
-  ruby_name = "_#{ruby_name}" if ["size", "stride", "random!", "stft"].include?(ruby_name)
+  ruby_name = "_#{ruby_name}" if ["size", "stride", "random!"].include?(ruby_name)
   ruby_name = ruby_name.sub(/\Afft_/, "") if type == "fft"
   ruby_name = ruby_name.sub(/\Alinalg_/, "") if type == "linalg"
   ruby_name = ruby_name.sub(/\Aspecial_/, "") if type == "special"
   ruby_name = ruby_name.sub(/\Asparse_/, "") if type == "sparse"
   ruby_name = name if name.start_with?("__")
 
-  # cast for Ruby < 2.7 https://github.com/thisMagpie/fftw/issues/22#issuecomment-49508900
+  # cast for Ruby < 3.0 https://github.com/thisMagpie/fftw/issues/22#issuecomment-49508900
   cast = RUBY_VERSION.to_f > 2.7 ? "" : "(VALUE (*)(...)) "
 
   "rb_#{def_method}(m, \"#{ruby_name}\", #{cast}#{full_name(name, type)}, -1);"

data/ext/torch/extconf.rb

@@ -18,9 +18,19 @@ else
   $CXXFLAGS += " -Wno-duplicated-cond -Wno-suggest-attribute=noreturn"
 end
 
+paths = [
+  "/usr/local",
+  "/opt/homebrew",
+  "/home/linuxbrew/.linuxbrew"
+]
+
 inc, lib = dir_config("torch")
-inc ||= "/usr/local/include"
-lib ||= "/usr/local/lib"
+inc ||= paths.map { |v| "#{v}/include" }.find { |v| Dir.exist?("#{v}/torch") }
+lib ||= paths.map { |v| "#{v}/lib" }.find { |v| Dir["#{v}/*torch_cpu*"].any? }
+
+unless inc && lib
+  abort "LibTorch not found"
+end
 
 cuda_inc, cuda_lib = dir_config("cuda")
 cuda_inc ||= "/usr/local/cuda/include"

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;
@@ -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);
@@ -345,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/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

data/lib/torch/version.rb

@@ -1,3 +1,3 @@
 module Torch
-  VERSION = "0.11.0"
+  VERSION = "0.11.2"
 end

data/lib/torch.rb

@@ -422,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.11.0
+  version: 0.11.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-06 00:00:00.000000000 Z
+date: 2022-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice