npy 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d65145c08fd1a4b752d272bfdd1a68495637eabb29092b1adb090f77d32abb2
-  data.tar.gz: bd7fd9b4bb57ad565dc3a368e1fdeeb23481196838ed5deb84a2dd153f303998
+  metadata.gz: 220dfbefca45a554d1a0f673385f832f11539ad1bc3113f285ae91144defe035
+  data.tar.gz: 923f706a1ea48ec546c0b94b19fbe0db4ef0351538555f1d20c6ea707b381122
 SHA512:
-  metadata.gz: fd14323a074d5aef907ebc3c8457ff5301cd8b612f362901676d2e114668cb2d998e84fa17896a444590ba397337adfc5d761883c82c4a850ac479f1efde8801
-  data.tar.gz: 61eedeea139e6e0d086f18777becb33b0f0d5272655d401e46241fa215ac9b9f6dacf943e477273b72c9a812415f13fb35727f7bc26cc95508bc2d823aad7070
+  metadata.gz: 4ca365c5f2acc98aedeed97d435c6c2e792a90c944affa2c448a2e19eea052a36165b16858e0e4b4314d2f9bf108ece56f8788931a62b31b140c4934dcca4cc3
+  data.tar.gz: ec7528bfa28dbb45d22275856e87c362d1a814bfdbb45a8fe41b86e960fafcf5d19af0cebf19dab518c642d32a7bf2c6ed27c8cf62d2d673793f3b75947f264e

data/CHANGELOG.md

@@ -1,8 +1,13 @@
+## 0.2.0
+
+- Added support for loading `bool` type (as `uint8` for now)
+- Return `NArray` object for rank-0 arrays
+
 ## 0.1.2
 
 - Added support for saving and loading IO objects
 - Added `load_npz_string`
-- Fixed bug with 1 dimensional arrays
+- Fixed bug with rank-1 arrays
 
 ## 0.1.1
 

data/lib/npy.rb

@@ -27,7 +27,10 @@ module Npy
     "<f4" => Numo::SFloat,
     "<f8" => Numo::DFloat,
     "<c8" => Numo::SComplex,
-    "<c16" => Numo::DComplex
+    "<c16" => Numo::DComplex,
+    # must come last
+    # as save uses first match
+    "|b1" => Numo::UInt8
   }
 
   class << self
@@ -85,18 +88,17 @@ module Npy
       descr, fortran_order, shape = parse_header(header)
       raise Error, "Fortran order not supported" if fortran_order
 
-      # numo can't handle empty shapes
-      empty_shape = shape.empty?
-      shape = [1] if empty_shape
-
       klass = TYPE_MAP[descr]
       raise Error, "Type not supported: #{descr}" unless klass
 
       # use from_string instead of from_binary for max compatibility
       # from_binary introduced in 0.9.0.4
-      result = klass.from_string(io.read, shape)
-      result = result[0] if empty_shape
-      result
+      # numo from_string can't handle rank0
+      if shape.empty?
+        klass.cast(klass.from_string(io.read, [1])[0])
+      else
+        klass.from_string(io.read, shape)
+      end
     end
 
     # TODO make private
@@ -145,9 +147,13 @@ module Npy
     end
 
     def save_io(f, arr)
-      empty_shape = arr.is_a?(Numeric)
-      arr = Numo::NArray.cast([arr]) if empty_shape
-      arr = Numo::NArray.cast(arr) if arr.is_a?(Array)
+      unless arr.is_a?(Numo::NArray)
+        begin
+          arr = Numo::NArray.cast(arr)
+        rescue TypeError
+          # do nothing
+        end
+      end
 
       # desc
       descr = TYPE_MAP.find { |_, v| arr.is_a?(v) }
@@ -155,7 +161,6 @@ module Npy
 
       # shape
       shape = arr.shape
-      shape = [] if empty_shape
 
       # header
       header = "{'descr': '#{descr[0]}', 'fortran_order': False, 'shape': (#{shape.join(", ")}#{shape.size == 1 ? "," : nil}), }".b

data/lib/npy/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: npy
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-16 00:00:00.000000000 Z
+date: 2019-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray