npy 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e81a0b6a617c8f05e1e62f88c05996891328ef154cd4c60d49d233b41b99748
-  data.tar.gz: 4f8c8cc599e2bae978b1cc6dabcadb2dd6aab1dec96c1f5f3e07a8a4303f1a24
+  metadata.gz: 3d65145c08fd1a4b752d272bfdd1a68495637eabb29092b1adb090f77d32abb2
+  data.tar.gz: bd7fd9b4bb57ad565dc3a368e1fdeeb23481196838ed5deb84a2dd153f303998
 SHA512:
-  metadata.gz: 82babeb75230ec73cb0870b42716589bc2bf9a460ff9943606792b9fe3dfa941f5892c4de1ba7b719afe2fa0e3726b2f5ca5ca268224afe2273c5c66af881cba
-  data.tar.gz: 700466088d563a0a8f4ccebce9506d91675b41bc1f47525756637b49218c533bfeef5364f3dea5b71328d690589643947273db00b44b7af8f86a77acdaf59ce3
+  metadata.gz: fd14323a074d5aef907ebc3c8457ff5301cd8b612f362901676d2e114668cb2d998e84fa17896a444590ba397337adfc5d761883c82c4a850ac479f1efde8801
+  data.tar.gz: 61eedeea139e6e0d086f18777becb33b0f0d5272655d401e46241fa215ac9b9f6dacf943e477273b72c9a812415f13fb35727f7bc26cc95508bc2d823aad7070

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.1.2
+
+- Added support for saving and loading IO objects
+- Added `load_npz_string`
+- Fixed bug with 1 dimensional arrays
+
 ## 0.1.1
 
 - Added support for saving files

data/README.md

@@ -2,7 +2,7 @@
 
 Save and load NumPy `npy` and `npz` files in Ruby - no Python required
 
-:fire: Uses [Numo::NArray](https://github.com/ruby-numo/numo-narray) for blazing performance
+:fire: Uses [Numo](https://github.com/ruby-numo/numo-narray) for blazing performance
 
 [![Build Status](https://travis-ci.org/ankane/npy.svg?branch=master)](https://travis-ci.org/ankane/npy)
 
@@ -23,21 +23,21 @@ gem 'npy'
 Save an array
 
 ```ruby
-arr = Numo::Int32[0...10]
-Npy.save("x.npy", arr)
+x = Numo::Int32[0..9]
+Npy.save("x.npy", x)
 ```
 
 Load an `npy` file
 
 ```ruby
-arr = Npy.load("x.npy")
+x = Npy.load("x.npy")
 ```
 
 Load an `npy` string
 
 ```ruby
 byte_str = File.binread("x.npy")
-arr = Npy.load_string(byte_str)
+x = Npy.load_string(byte_str)
 ```
 
 ### npz
@@ -47,27 +47,27 @@ arr = Npy.load_string(byte_str)
 Save multiple arrays
 
 ```ruby
-x =  Numo::Int32[0...10]
+x =  Numo::Int32[0..9]
 y = x * 2
-Npy.save_npz("mnist.npz", x: x, y: y)
+Npy.save_npz("data.npz", x: x, y: y)
 ```
 
 Load an `npz` file
 
 ```ruby
-arrs = Npy.load_npz("mnist.npz")
+data = Npy.load_npz("data.npz")
 ```
 
 Get keys
 
 ```ruby
-arrs.keys
+data.keys
 ```
 
 Get an array
 
 ```ruby
-arrs["x"]
+data["x"]
 ```
 
 Arrays are lazy loaded for performance

data/lib/npy.rb

@@ -2,6 +2,10 @@
 require "numo/narray"
 require "zip"
 
+# stdlib
+require "stringio"
+require "tempfile"
+
 # modules
 require "npy/file"
 require "npy/version"
@@ -28,14 +32,20 @@ module Npy
 
   class << self
     def load(path)
-      with_file(path) do |f|
-        load_io(f)
+      case path
+      when IO, StringIO
+        load_io(path)
+      else
+        load_file(path)
       end
     end
 
     def load_npz(path)
-      with_file(path) do |f|
-        load_npz_io(f)
+      case path
+      when IO, StringIO
+        load_npz_io(path)
+      else
+        load_npz_file(path)
       end
     end
 
@@ -43,11 +53,19 @@ module Npy
       load_io(StringIO.new(byte_str))
     end
 
-    # rubyzip not playing nicely with StringIO
-    # def load_npz_string(byte_str)
-    #   load_npz_io(StringIO.new(byte_str))
-    # end
+    def load_npz_string(byte_str)
+      # not playing nicely with StringIO
+      file = Tempfile.new("npy")
+      begin
+        file.write(byte_str)
+        load_npz_io(file)
+      ensure
+        file.close
+        file.unlink
+      end
+    end
 
+    # TODO make private
     def load_io(io)
       magic = io.read(6)
       raise Error, "Invalid npy format" unless magic&.b == MAGIC_STR
@@ -81,50 +99,66 @@ module Npy
       result
     end
 
+    # TODO make private
     def load_npz_io(io)
       File.new(io)
     end
 
     def save(path, arr)
-      ::File.open(path, "wb") do |f|
-        save_io(f, arr)
+      case path
+      when IO, StringIO
+        save_io(path, arr)
+      else
+        save_file(path, arr)
       end
       true
     end
 
-    def save_npz(path, **arrs)
-      # use File.open instead passing path to zip file
-      # so it overrides instead of appends
-      ::File.open(path, "wb") do |f|
-        Zip::File.open(f, Zip::File::CREATE) do |zipfile|
-          arrs.each do |k, v|
-            zipfile.get_output_stream("#{k}.npy") do |f2|
-              save_io(f2, v)
-            end
-          end
-        end
+    def save_npz(path, arrs)
+      case path
+      when IO, StringIO
+        save_npz_io(path, arrs)
+      else
+        save_npz_file(path, arrs)
       end
       true
     end
 
     private
 
+    def load_file(path)
+      with_file(path, "rb") do |f|
+        load_io(f)
+      end
+    end
+
+    def load_npz_file(path)
+      with_file(path, "rb") do |f|
+        load_npz_io(f)
+      end
+    end
+
+    def save_file(path, arr)
+      with_file(path, "wb") do |f|
+        save_io(f, arr)
+      end
+    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)
 
       # desc
-      descr = TYPE_MAP.find { |k, v| arr.is_a?(v) }
+      descr = TYPE_MAP.find { |_, v| arr.is_a?(v) }
       raise Error, "Unsupported type: #{arr.class.name}" unless descr
 
       # shape
       shape = arr.shape
-      shape << "" if shape.size == 1
       shape = [] if empty_shape
 
       # header
-      header = "{'descr': '#{descr[0]}', 'fortran_order': False, 'shape': (#{shape.join(", ")}), }".b
+      header = "{'descr': '#{descr[0]}', 'fortran_order': False, 'shape': (#{shape.join(", ")}#{shape.size == 1 ? "," : nil}), }".b
       padding_len = 64 - (11 + header.length) % 64
       padding = "\x20".b * padding_len
       header = "#{header}#{padding}\n"
@@ -136,8 +170,24 @@ module Npy
       f.write(arr.to_string)
     end
 
-    def with_file(path)
-      ::File.open(path, "rb") do |f|
+    def save_npz_file(path, arrs)
+      with_file(path, "wb") do |f|
+        save_npz_io(f, arrs)
+      end
+    end
+
+    def save_npz_io(f, arrs)
+      Zip::File.open(f, Zip::File::CREATE) do |zipfile|
+        arrs.each do |k, v|
+          zipfile.get_output_stream("#{k}.npy") do |f2|
+            save_io(f2, v)
+          end
+        end
+      end
+    end
+
+    def with_file(path, mode)
+      ::File.open(path, mode) do |f|
         yield f
       end
     end
@@ -158,7 +208,7 @@ module Npy
       # shape
       m = /'shape': *\(([^)]*)\)/.match(header)
       # no space in split for max compatibility
-      shape = m[1].split(",").map(&:to_i)
+      shape = m[1].strip.split(",").map(&:to_i)
 
       [descr, fortran_order, shape]
     end

data/lib/npy/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: npy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-14 00:00:00.000000000 Z
+date: 2019-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: benchmark-ips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: andrew@chartkick.com
 executables: []