numpy 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08e0b6b70b4a54e1eeff1046f3cdb8edfb59b2e10718bcfaf739660af0dd9418'
-  data.tar.gz: 356e3fcf60046142282b71aa11c3fe0976389155a26e65390ed6401b30af6516
+  metadata.gz: e1d276c3ad0422a4d70644c598d56cfe5796bbf5afd6454732868f594eedcaef
+  data.tar.gz: da4219c7991eb69bc3be277463bd9ece4bebf2b9c1c72d9c49584f308a07b970
 SHA512:
-  metadata.gz: 603dbf1b5d7a89a649f4ac074735c4d12ad4af1a565dd7c6ce4e82fa4c927c9059e18b102aaa6e44e2c49a59918c079a894aaf9fc463b521ed4f3a1b6c239eae
-  data.tar.gz: 9d723c03c0012ea111569b84f8f3d9af4b4a5ebffe09c98e5eec036935d2849140b661112a876f8366a2168267a0690d09fdd00ca09a8db34e24145084240ef2
+  metadata.gz: 26702a4ed9e3700743cb64623df90b05f5df6996182fc5bfece2af94532efe339407f6486d52054a750ea75ecd435cc79e01064648e869966b30becadff5ba5c
+  data.tar.gz: 5d3ec29e3afb2043fa686806a816d117a1cc266826d949563924850efa5bc0521c728ac7f315933e982c5858c62ed3a6bc48a291a3f06b9a2535e35282cfa028

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 0.4.0
+
+* Add `Numpy::NDArray#to_narray`
+
 # 0.3.0
 
 * Add `Numpy::NDArray#to_a`

data/lib/numpy/ndarray.rb

@@ -21,5 +21,53 @@ module Numpy
         end
       }
     end
+
+    def to_narray
+      load_numo_narray
+
+      # Suppress warning from PyCall
+      begin
+        save, $VERBOSE = $VERBOSE, nil
+        dtype = self.dtype
+      ensure
+        $VERBOSE = save
+      end
+
+      _, narray_klass = self.class.narray_class_map.find { |dt, kl| dtype == dt }
+      unless narray_klass
+        raise TypeError,
+              "Unable to convert numpy's %p array to Numo::NArray" % dtype
+      end
+
+      # TODO: Use MemoryView feature
+      narray_klass[*to_a]
+    end
+
+    def self.narray_class_map
+      @narray_class_map ||= [
+        [ Numpy.int64   , Numo::Int64 ],
+        [ Numpy.int32   , Numo::Int32 ],
+        [ Numpy.int16   , Numo::Int16 ],
+        [ Numpy.int8    , Numo::Int8 ],
+        [ Numpy.uint64  , Numo::Int64 ],
+        [ Numpy.uint32  , Numo::Int32 ],
+        [ Numpy.uint16  , Numo::Int16 ],
+        [ Numpy.uint8   , Numo::Int8 ],
+        [ Numpy.bool8   , Numo::UInt8 ],
+        [ Numpy.float32 , Numo::SFloat ],
+        [ Numpy.float64 , Numo::DFloat ],
+        [ Numpy.object  , Numo::RObject ]
+      ].freeze
+    end
+
+    private def load_numo_narray
+      begin
+        require "numo/narray"
+      rescue LoadError
+        raise RuntimeError,
+              "Unable to load numo/narray library; " +
+              "please do gem install numo-narray before use to_narray method"
+      end
+    end
   end
 end

data/lib/numpy/version.rb

@@ -1,3 +1,3 @@
 module Numpy
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/numpy.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "test-unit"
+  spec.add_development_dependency "numo-narray"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numpy
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Kenta Murata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-29 00:00:00.000000000 Z
+date: 2021-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pycall
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: numo-narray
+  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: Numpy wrapper for Ruby
 email:
 - mrkn@mrkn.jp