torchaudio 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b395ce300252d4d65274f0ddb9d387de1dd836721a8a4f81804c5a888fb5433
-  data.tar.gz: 9e98ca9a0e8e945e069957990671bf143edb1240f313f65bf87e97bba4e05106
+  metadata.gz: 9488128781f307b653965c253dcacbe246ebaf27bf4e6359b030d9a93bafc1b2
+  data.tar.gz: 5dc18368bdef8945ecaeb1ad2d60771df98bfdd8c356ad2fcdd2b343b8c02b51
 SHA512:
-  metadata.gz: ab922eef545e50e302f7a72f992f2d6040fb9cd1856c37ff532baed0092783442d649f8c3bc91a4cf92684729d7ce7294cd9a943a8c8a483734bb858e885845f
-  data.tar.gz: 414ea85a03b53cf21caef57289551fa88747ad2a5e0c60f0e92cb57a017cd04903b359d8d71ac37cecba50492678bc5d4327a9f340aba8f6006339d9379fed26
+  metadata.gz: ddabdfa32632e9d2af024a0f7b67f2add1b694a9a7ef9036f2a1c2f9338106069e6ec1afaea50a0c6f68a8aaa695e57c492d981fb7b3d704fd28ef420c3e2519
+  data.tar.gz: 83131487d0566bb957bab2388e888843ca9b108ec95644811fb702c57bfad628bb41a1ea2b9d1b728090230b48767175bc53af7f0601e8acf8c4d299b5a6de33

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.0 (2021-05-23)
+
+- Updated to Rice 4
+- Dropped support for Ruby < 2.6
+
 ## 0.1.2 (2021-02-06)
 
 - Added `amplitude_to_DB` and `DB_to_amplitude` methods

data/ext/torchaudio/ext.cpp

@@ -1,75 +1,33 @@
 #include <torchaudio/csrc/sox.h>
 
-#include <rice/Constructor.hpp>
-#include <rice/Module.hpp>
-
-using namespace Rice;
-
-class SignalInfo {
-  sox_signalinfo_t* value = nullptr;
-  public:
-    SignalInfo(Object o) {
-      if (!o.is_nil()) {
-        value = from_ruby<sox_signalinfo_t*>(o);
-      }
-    }
-    operator sox_signalinfo_t*() {
-      return value;
-    }
-};
-
-template<>
-inline
-SignalInfo from_ruby<SignalInfo>(Object x)
-{
-  return SignalInfo(x);
-}
-
-class EncodingInfo {
-  sox_encodinginfo_t* value = nullptr;
-  public:
-    EncodingInfo(Object o) {
-      if (!o.is_nil()) {
-        value = from_ruby<sox_encodinginfo_t*>(o);
-      }
-    }
-    operator sox_encodinginfo_t*() {
-      return value;
-    }
-};
-
-template<>
-inline
-EncodingInfo from_ruby<EncodingInfo>(Object x)
-{
-  return EncodingInfo(x);
-}
+#include <rice/rice.hpp>
+#include <rice/stl.hpp>
 
 extern "C"
 void Init_ext()
 {
-  Module rb_mTorchAudio = define_module("TorchAudio");
+  auto rb_mTorchAudio = Rice::define_module("TorchAudio");
 
-  Module rb_mExt = define_module_under(rb_mTorchAudio, "Ext")
-    .define_singleton_method(
+  auto rb_mExt = Rice::define_module_under(rb_mTorchAudio, "Ext")
+    .define_singleton_function(
       "read_audio_file",
-      *[](const std::string& file_name, at::Tensor output, bool ch_first, int64_t nframes, int64_t offset, SignalInfo si, EncodingInfo ei, const char* ft) {
+      [](const std::string& file_name, at::Tensor output, bool ch_first, int64_t nframes, int64_t offset, sox_signalinfo_t* si, sox_encodinginfo_t* ei, const char* ft) {
         return torch::audio::read_audio_file(file_name, output, ch_first, nframes, offset, si, ei, ft);
       })
-    .define_singleton_method(
+    .define_singleton_function(
       "write_audio_file",
-      *[](const std::string& file_name, const at::Tensor& tensor, SignalInfo si, EncodingInfo ei, const char* file_type) {
+      [](const std::string& file_name, const at::Tensor& tensor, sox_signalinfo_t* si, sox_encodinginfo_t* ei, const char* file_type) {
         return torch::audio::write_audio_file(file_name, tensor, si, ei, file_type);
       });
 
-  Class rb_cSignalInfo = define_class_under<sox_signalinfo_t>(rb_mExt, "SignalInfo")
-    .define_constructor(Constructor<sox_signalinfo_t>())
-    .define_method("rate", *[](sox_signalinfo_t& self) { return self.rate; })
-    .define_method("channels", *[](sox_signalinfo_t& self) { return self.channels; })
-    .define_method("precision", *[](sox_signalinfo_t& self) { return self.precision; })
-    .define_method("length", *[](sox_signalinfo_t& self) { return self.length; })
-    .define_method("rate=", *[](sox_signalinfo_t& self, sox_rate_t rate) { self.rate = rate; })
-    .define_method("channels=", *[](sox_signalinfo_t& self, unsigned channels) { self.channels = channels; })
-    .define_method("precision=", *[](sox_signalinfo_t& self, unsigned precision) { self.precision = precision; })
-    .define_method("length=", *[](sox_signalinfo_t& self, sox_uint64_t length) { self.length = length; });
+  auto rb_cSignalInfo = Rice::define_class_under<sox_signalinfo_t>(rb_mExt, "SignalInfo")
+    .define_constructor(Rice::Constructor<sox_signalinfo_t>())
+    .define_method("rate", [](sox_signalinfo_t& self) { return self.rate; })
+    .define_method("channels", [](sox_signalinfo_t& self) { return self.channels; })
+    .define_method("precision", [](sox_signalinfo_t& self) { return self.precision; })
+    .define_method("length", [](sox_signalinfo_t& self) { return self.length; })
+    .define_method("rate=", [](sox_signalinfo_t& self, sox_rate_t rate) { self.rate = rate; })
+    .define_method("channels=", [](sox_signalinfo_t& self, unsigned channels) { self.channels = channels; })
+    .define_method("precision=", [](sox_signalinfo_t& self, unsigned precision) { self.precision = precision; })
+    .define_method("length=", [](sox_signalinfo_t& self, sox_uint64_t length) { self.length = length; });
 }

data/ext/torchaudio/extconf.rb

@@ -1,8 +1,6 @@
 require "mkmf-rice"
 
-abort "Missing stdc++" unless have_library("stdc++")
-
-$CXXFLAGS += " -std=c++14"
+$CXXFLAGS += " -std=c++17 $(optflags)"
 
 abort "SoX not found" unless have_library("sox")
 

data/lib/torchaudio/version.rb

@@ -1,3 +1,3 @@
 module TorchAudio
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torchaudio
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-06 00:00:00.000000000 Z
+date: 2021-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: torch-rb
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: rice
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 4.0.2
 description:
 email: andrew@ankane.org
 executables: []
@@ -82,7 +82,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="