ndav-torch-tensor 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36132b58b87a1b47538fb26518f86d24142210e817050ab50a26a2de8d7e1ef9
-  data.tar.gz: f628b3933bbda77e839df1631565c6158243a9cb6e7cbbc0bc343de0e19fd758
+  metadata.gz: 033bbf192b1235b16c2b5fe0f69ca5505764e1473c9c5b4abdf18d81d4b9ec94
+  data.tar.gz: 02bca7f664f5a1fa8ec84a93202ef117f887a62b172305101c4278fc8c6cfd08
 SHA512:
-  metadata.gz: d703a4c0eae1e1f1452571f62efe455e79bbf429ab430f51c13346bf9a5dafcec65c47d7421890d78a36b012e3771f620b61d20bb82d08060ca380f022f2c391
-  data.tar.gz: 1ad44e898483c80964c2458b8680ab58b7a031f049d2b8b9fed5c61d2bda81b27649b44c6c07bb9525ddbb4245c577b37bf4c4c6865a8328143d0f599c7e8146
+  metadata.gz: 1b9360bf3dd2fce2780775dcb03d19554a7f4a67960555bec1b8e88aa3300453ea515dd827efeaf292d63f703f46b692fa6ae381ac2fb7236fc18aab2f01f7a0
+  data.tar.gz: b88c727b786f43319043d874689f8882cbabd4737292d3e663405b1161a1b7b6b904d89b229543f103cad1786310d2ade8a78b930e50c16e82c262e0070ec07b

data/.gitignore

@@ -1,2 +1,3 @@
 Gemfile.lock
 .bundle/
+pkg/

data/lib/ndav/torch/tensor.rb

@@ -4,6 +4,19 @@ require "torch"
 
 class NDAV
   module Torch
+    module FromNDAV
+      def from_ndav(ndav)
+        dtype = Tensor::FORMAT_TO_TYPE[ndav.format]
+        raise ArgumentError, "unsupported format: #{input.format}, currently supported: #{Tensor::TYPE_TO_FORMAT.values}" unless dtype
+
+        opts = tensor_options(dtype:)
+        tensor = _from_blob_ref(ndav.to_s, [ndav.byte_size / ndav.item_size], opts)
+                   .reshape(ndav.shape)
+        tensor.instance_variable_set(:@ndav, ndav) # keep reference to NDAV to prevent GC
+        tensor
+      end
+    end
+
     module Tensor
       TYPE_TO_FORMAT = {
         int8: "c",
@@ -33,19 +46,6 @@ class NDAV
 
       TYPE_SIZES = TYPE_TO_FORMAT.transform_values {|format| ITEM_SIZES[format]}
 
-      module FromNDAV
-        def from_ndav(ndav)
-          dtype = FORMAT_TO_TYPE[ndav.format]
-          raise ArgumentError, "unsupported format: #{input.format}, currently supported: #{TYPE_TO_FORMAT.values}" unless dtype
-
-          opts = tensor_options(dtype:)
-          tensor = _from_blob_ref(ndav.to_s, [ndav.byte_size / ndav.item_size], opts)
-                     .reshape(ndav.shape)
-          tensor.instance_variable_set(:@ndav, ndav) # keep reference to NDAV to prevent GC
-          tensor
-        end
-      end
-
       module ToNDAV
         def to_ndav
           format = TYPE_TO_FORMAT[dtype]
@@ -56,53 +56,23 @@ class NDAV
         end
       end
 
-      module FromTorchTensor
-        def from_torch_tensor(tensor)
-          tensor.to_ndav
-        end
-      end
-
-      module ToTorchTensor
-        def to_torch_tensor
-          ::Torch.from_ndav(self)
-        end
-      end
-
       module Converter
-        if defined? ::NDAV::Converter::TorchTensor
-          def TorchTensor(array, *, **)
-            if array.kind_of? ::NDAV
-              array.to_torch_tensor
-            elsif array.respond_to? :to_torch_tensor
-              array.to_torch_tensor
-            elsif array.respond_to? :to_ndav
-              array.to_ndav(*, **).to_torch_tensor
-            else
-              super
-            end
-          end
-        else
-          def TorchTensor(array, *, **)
-            if array.kind_of? ::NDAV
-              array.to_torch_tensor
-            elsif array.respond_to? :to_torch_tensor
-              array.to_torch_tensor
-            elsif array.respond_to? :to_ndav
-              array.to_ndav(*, **).to_torch_tensor
-            else
-              ::NDAV.new(array, *, **).to_torch_tensor
-            end
+        def TorchTensor(array, *, **)
+          if array.kind_of? ::NDAV
+            array.to_torch_tensor
+          elsif array.respond_to? :to_torch_tensor
+            array.to_torch_tensor
+          elsif array.respond_to? :to_ndav
+            array.to_ndav(*, **).to_torch_tensor
+          else
+            ::NDAV.new(array, *, **).to_torch_tensor
           end
         end
       end
-
-      ::Torch.extend FromNDAV
-      ::Torch::Tensor.include ToNDAV
-      ::NDAV.extend FromTorchTensor
-      ::NDAV.include ToTorchTensor
-      ::NDAV::Converter.singleton_class.prepend Converter
-      ::NDAV::Converter.prepend Converter
     end
   end
+
+  register ::Torch, Torch, name: :torch_tensor
+  register ::Torch::Tensor, Torch::Tensor, name: :torch_tensor
 end
 

data/ndav-torch-tensor.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "ndav-torch-tensor"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
   s.authors = ["Kitaiti Makoto"]
   s.summary = "N-Dimensional Array View for Torch::Tensors"
   s.licenses = ["MIT"]
@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir.chdir(__dir__) {`git ls-files -z`.split("\x0")}
 
-  s.add_runtime_dependency "ndav"
+  s.add_runtime_dependency "ndav", ">= 0.0.3"
   s.add_runtime_dependency "torch-rb"
 
   s.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ndav-torch-tensor
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Kitaiti Makoto
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: torch-rb
   requirement: !ruby/object:Gem::Requirement