ndav-numo-narray 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: beb01a99fd5dc21a663a24670645f31481edd507106bed7737f31223c1e666a8
-  data.tar.gz: 7c3f16c422223a95c7fe0ed71e377dce9ee497cb72460ea15406b8150dc555ff
+  metadata.gz: 027ca1006dbe7107f356ed21e6e5f0e2ea2c1c4388a96707b00ae0fe02c3b113
+  data.tar.gz: b13b224ddde18cc20dc0b28086575b4208004fecc6e81d7658e66a66c5473de4
 SHA512:
-  metadata.gz: 72f42d4ac0170bc12d69d68b2c4d7ce8674419f39a24321b90696b38af8faf1f901cdaaf6ef3880a4003137b0bc61e1571f03e9d56b0fdc91516834c2df82a80
-  data.tar.gz: 03ba05a8b1fd7757f2e5fbbad4f201c92cf95a42bff75f2b13cdc998e85b5b07b766d3893402256122439d2d87dcf43e3c279ed7a689ff165acac65b238658f6
+  metadata.gz: 3b13d07e24b6f66d7f65a88f7f019147527fc11bb6b1bdf7d04cc8a8b0f6347ecdaa25cf21534d909e3b9a7c78e3ba4f018ea99872206a95500d2ad12c564527
+  data.tar.gz: f9d15da6cc2a660508d266015211735a7498c1926b75936132b8bb2e19ae0c5fa44f48822a79dcb0d142986ac577ec4f1993c2745fea3c5e8843e87ec42e38c1

data/lib/ndav/numo/narray.rb

@@ -19,23 +19,7 @@ class NDAV
         ::Numo::DFloat => "d"
       }
 
-      FORMAT_TO_CLASS = CLASS_TO_FORMAT.invert
-      case IO::Buffer::HOST_ENDIAN
-      when IO::Buffer::LITTLE_ENDIAN
-        FORMAT_TO_CLASS.update({
-          "v" => ::Numo::UInt16,
-          "V" => ::Numo::UInt32,
-          "e" => ::Numo::SFloat,
-          "E" => ::Numo::DFloat
-        })
-      when IO::Buffer::BIG_ENDIAN
-        FORMAT_TO_CLASS.update({
-          "n" => ::Numo::UInt16,
-          "N" => ::Numo::UInt32,
-          "g" => ::Numo::SFloat,
-          "G" => ::Numo::DFloat
-        })
-      end
+      FORMAT_TO_CLASS = Hash.new {|classes, format| classes[format] = class_from_format(format)}
 
       class << self
         def na_get_pointer_for_read(numo)
@@ -61,6 +45,47 @@ class NDAV
           ptr.size = numo.byte_size
           ptr
         end
+
+        FORMAT_TO_CLASS = CLASS_TO_FORMAT.invert
+        def class_from_format(format)
+          item_desc = ITEM_DESCS[format]
+          return unless item_desc.length == 1
+
+          component = item_desc[0]
+          return unless component.repeat == 1
+
+          klass = FORMAT_TO_CLASS[component.format]
+          return klass if klass
+
+          prefix = case component.format
+                   when "i", "j" then "Int"
+                   when "I", "J" then "UInt"
+                   end
+          return ::Numo.const_get("#{prefix}#{component.size * 8}") if prefix
+
+          case IO::Buffer::HOST_ENDIAN
+          in IO::Buffer::LITTLE_ENDIAN
+            return unless component.little_endian?
+
+            klass = case component.format
+                    when "v" then ::Numo::UInt16
+                    when "V" then ::Numo::UInt32
+                    when "e" then ::Numo::SFloat
+                    when "E" then ::Numo::DFloat
+                    end
+            return klass if klass
+          in IO::Buffer::BIG_ENDIAN
+            return if component.little_endian?
+
+            klass = case component.format
+                    when "n" then ::Numo::UInt16
+                    when "N" then ::Numo::UInt32
+                    when "g" then ::Numo::SFloat
+                    when "G" then ::Numo::DFloat
+                    end
+            return klass if klass
+          end
+        end
       end
 
       module FFI
@@ -78,7 +103,7 @@ class NDAV
         def from_ndav(ndav)
           format = ndav.format
           cls = FORMAT_TO_CLASS[format]
-          raise ArgumentError, "unsupported format: #{format}, currently supported: #{FORMAT_TO_CLASS.keys}" unless cls
+          raise ArgumentError, "unsupported format: #{format}" unless cls
 
           shape = ndav.shape
           if ndav.row_major_contiguous?
@@ -93,7 +118,7 @@ class NDAV
       end
 
       module MemoryViewable
-        def ndav_descriptor(writable: false, column_major: false, **)
+        def ndav_descriptor(writable:, column_major:, **)
           format = CLASS_TO_FORMAT[self.class]
           unless format
             warn "unsupported class: #{self.class}, currently supported: #{CLASS_TO_FORMAT.keys}"

data/ndav-numo-narray.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "ndav-numo-narray"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
   s.authors = ["Kitaiti Makoto"]
   s.summary = "N-Dimensional Array View for Numo::NArray"
   s.licenses = ["BSD-3-Clause"]
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.files = Dir.chdir(__dir__) {`git ls-files -z`.split("\x0")}
   s.extensions << "ext/extconf.rb"
 
-  s.add_runtime_dependency "ndav", ">= 0.0.6"
+  s.add_runtime_dependency "ndav", ">= 0.0.7"
   s.add_runtime_dependency "numo-narray-alt"
 
   s.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ndav-numo-narray
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Kitaiti Makoto
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: numo-narray-alt
   requirement: !ruby/object:Gem::Requirement