torch-rb 0.14.0 → 0.15.0

data/ext/torch/extconf.rb

@@ -52,6 +52,9 @@ $INCFLAGS += " -I#{inc}"
 $INCFLAGS += " -I#{inc}/torch/csrc/api/include"
 
 $LDFLAGS += " -Wl,-rpath,#{lib}"
+if RbConfig::CONFIG["host_os"] =~ /darwin/i && RbConfig::CONFIG["host_cpu"] =~ /arm|aarch64/i && Dir.exist?("/opt/homebrew/opt/libomp/lib")
+  $LDFLAGS += ",-rpath,/opt/homebrew/opt/libomp/lib"
+end
 $LDFLAGS += ":#{cuda_lib}/stubs:#{cuda_lib}" if with_cuda
 
 # https://github.com/pytorch/pytorch/blob/v1.5.0/torch/utils/cpp_extension.py#L1232-L1238

data/ext/torch/ruby_arg_parser.cpp

@@ -401,7 +401,7 @@ void FunctionParameter::set_default_str(const std::string& str) {
     if (str != "None") {
       throw std::runtime_error("default value for Tensor must be none, got: " + str);
     }
-  } else if (type_ == ParameterType::INT64) {
+  } else if (type_ == ParameterType::INT64 || type_ == ParameterType::SYM_INT) {
     default_int = atol(str.c_str());
   } else if (type_ == ParameterType::BOOL) {
     default_bool = (str == "True" || str == "true");
@@ -417,7 +417,7 @@ void FunctionParameter::set_default_str(const std::string& str) {
       default_scalar = as_integer.has_value() ? at::Scalar(as_integer.value()) :
                                                 at::Scalar(atof(str.c_str()));
     }
-  } else if (type_ == ParameterType::INT_LIST) {
+  } else if (type_ == ParameterType::INT_LIST || type_ == ParameterType::SYM_INT_LIST) {
     if (str != "None") {
       default_intlist = parse_intlist_args(str, size);
     }
@@ -452,6 +452,31 @@ void FunctionParameter::set_default_str(const std::string& str) {
       default_string = parse_string_literal(str);
     }
   }
+  // These types weren't handled here before. Adding a default error
+  // led to a lot of test failures so adding this skip for now.
+  // We should correctly handle these though because it might be causing
+  // silent failures.
+  else if (type_ == ParameterType::TENSOR_LIST) {
+    // throw std::runtime_error("Invalid Tensor List");
+  } else if (type_ == ParameterType::GENERATOR) {
+    // throw std::runtime_error("ParameterType::GENERATOR");
+  } else if (type_ == ParameterType::PYOBJECT) {
+    // throw std::runtime_error("ParameterType::PYOBJECT");
+  } else if (type_ == ParameterType::MEMORY_FORMAT) {
+    // throw std::runtime_error("ParameterType::MEMORY_FORMAT");
+  } else if (type_ == ParameterType::DIMNAME) {
+    // throw std::runtime_error("ParameterType::DIMNAME");
+  } else if (type_ == ParameterType::DIMNAME_LIST) {
+    // throw std::runtime_error("ParameterType::DIMNAME_LIST");
+  } else if (type_ == ParameterType::SCALAR_LIST) {
+    // throw std::runtime_error("ParameterType::SCALAR_LIST");
+  } else if (type_ == ParameterType::STORAGE) {
+    // throw std::runtime_error("ParameterType::STORAGE");
+  } else if (type_ == ParameterType::QSCHEME) {
+    // throw std::runtime_error("ParameterType::QSCHEME");
+  } else {
+    throw std::runtime_error("unknown parameter type");
+  }
 }
 
 FunctionSignature::FunctionSignature(const std::string& fmt, int index)

data/ext/torch/templates.h

@@ -169,27 +169,4 @@ namespace Rice::detail
       }
     }
   };
-
-  template<typename T>
-  struct Type<torch::optional<T>>
-  {
-    static bool verify()
-    {
-      return true;
-    }
-  };
-
-  template<typename T>
-  class From_Ruby<torch::optional<T>>
-  {
-  public:
-    torch::optional<T> convert(VALUE x)
-    {
-      if (NIL_P(x)) {
-        return torch::nullopt;
-      } else {
-        return torch::optional<T>{From_Ruby<T>().convert(x)};
-      }
-    }
-  };
 }

data/ext/torch/tensor.cpp

@@ -103,6 +103,7 @@ void init_tensor(Rice::Module& m, Rice::Class& c, Rice::Class& rb_cTensorOptions
 
   rb_cTensor
     .define_method("cuda?", [](Tensor& self) { return self.is_cuda(); })
+    .define_method("mps?", [](Tensor& self) { return self.is_mps(); })
     .define_method("sparse?", [](Tensor& self) { return self.is_sparse(); })
     .define_method("quantized?", [](Tensor& self) { return self.is_quantized(); })
     .define_method("dim", [](Tensor& self) { return self.dim(); })

data/ext/torch/utils.h

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

data/lib/torch/inspector.rb

@@ -31,9 +31,9 @@ module Torch
           return if nonzero_finite_vals.numel == 0
 
           # Convert to double for easy calculation. HalfTensor overflows with 1e8, and there's no div() on CPU.
-          nonzero_finite_abs = nonzero_finite_vals.abs.double
-          nonzero_finite_min = nonzero_finite_abs.min.double
-          nonzero_finite_max = nonzero_finite_abs.max.double
+          nonzero_finite_abs = tensor_totype(nonzero_finite_vals.abs)
+          nonzero_finite_min = tensor_totype(nonzero_finite_abs.min)
+          nonzero_finite_max = tensor_totype(nonzero_finite_abs.max)
 
           nonzero_finite_vals.each do |value|
             if value.item != value.item.ceil
@@ -107,6 +107,11 @@ module Torch
         # Ruby throws error when negative, Python doesn't
         " " * [@max_width - ret.size, 0].max + ret
       end
+
+      def tensor_totype(t)
+        dtype = t.mps? ? :float : :double
+        t.to(dtype: dtype)
+      end
     end
 
     def inspect

data/lib/torch/version.rb

@@ -1,3 +1,3 @@
 module Torch
-  VERSION = "0.14.0"
+  VERSION = "0.15.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torch-rb
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-09 00:00:00.000000000 Z
+date: 2024-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -237,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Deep learning for Ruby, powered by LibTorch