numpy 0.1.0 → 0.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 05f6865f2a7c4ef94b5bdf981a36305418b54492
-  data.tar.gz: 9ec963ca157264a8fd3d01275534db3a4a4fa1b3
+SHA256:
+  metadata.gz: 5e7d2063cc44796bd4b50a0b45c7374e2edc6c963cb9f47a2b0f550af5982a9b
+  data.tar.gz: 1f9141a62ef7ac7360a6bc745107da1bb76853ccfcabfeab2486ef58001054c7
 SHA512:
-  metadata.gz: 48124607ab6a3655d0c710fd86633a8178624e32b0e3d3b912badf8aab28d5fb79cb2f80574fd1171e61c7f67d9b199f8a2cdf64dd7e01dc7827fd0843ff7c6f
-  data.tar.gz: 1c8350190e9b6f7d7818628a012831802b1ef2d6d8115c267252f09d9802aedb367c04202bbf0a319910057c94d5f0ff6bcf7d089af31c70b307a6ddc5252054
+  metadata.gz: 6dc0004877b66df9683820a86bc9cdcf6272d974bf1ce6bcbb8d8e9be10ab03f6995b5456d32496df9819521c986453befd355265f0d88b56c9cf3606b8d201d
+  data.tar.gz: c90649d97a5e8c394fa298442eb48056c807cefba49556042227e7aac692b2ac03e5a3764dd57079572c34a1c00bec634210c706b6ac9cccf7cc539f36c8ecf9

data/CHANGES.md

@@ -0,0 +1,7 @@
+# 0.2.0
+
+* Support scalar type conversion
+
+# 0.1.0
+
+* First release

data/example/Gemfile

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+gem 'pycall', '>= 1.0.1'
+gem 'numpy'
+gem 'matplotlib'
+gem 'pandas'
+gem 'iruby'
+gem 'cztop'
+gem 'pry'
+gem 'numo-narray'
+gem 'numo-linalg'

data/example/benchmarking.ipynb

@@ -0,0 +1,121 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": 1,
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "\"4\""
+      ]
+     },
+     "execution_count": 1,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "require 'benchmark'\n",
+    "\n",
+    "require 'numo/narray'\n",
+    "require \"numo/linalg/linalg\"\n",
+    "Numo::Linalg::Blas.dlopen(\"/opt/brew/opt/openblas/lib/libopenblas.dylib\")\n",
+    "Numo::Linalg::Lapack.dlopen(\"/opt/brew/opt/openblas/lib/libopenblas.dylib\")\n",
+    "\n",
+    "require 'pycall'\n",
+    "require 'numpy'\n",
+    "scipy_blas = PyCall.import_module('scipy.linalg.blas')\n",
+    "\n",
+    "ENV['OMP_NUM_THREADS'] = '4'"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 4,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "[1500, 1500]\n",
+      "[1500, 1500]\n",
+      "(1500, 1500)\n",
+      "(1500, 1500)\n"
+     ]
+    }
+   ],
+   "source": [
+    "a = Numo::DFloat.new(1500,1500).seq\n",
+    "b = Numo::DFloat.new(1500,1500).seq\n",
+    "c = Numpy.arange(1500*1500, dtype: :float64).reshape(1500, 1500)\n",
+    "d = Numpy.arange(1500*1500, dtype: :float64).reshape(1500, 1500)\n",
+    "\n",
+    "p a.shape\n",
+    "p b.shape\n",
+    "p c.shape\n",
+    "p d.shape\n",
+    "nil"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 10,
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "numo-linalg      33.400000   1.460000  34.860000 (  5.738896)\n",
+      "numpy-linalg     34.210000   1.440000  35.650000 (  9.099735)\n"
+     ]
+    }
+   ],
+   "source": [
+    "n = 100\n",
+    "Benchmark.benchmark('', 15) do |x|\n",
+    "  x.report('numo-linalg')  { n.times{ Numo::Linalg::Blas.dgemm(a,b) } }\n",
+    "  x.report('numpy-linalg') { n.times{ scipy_blas.dgemm(1.0, c, d) } }\n",
+    "end\n",
+    "nil"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {
+    "collapsed": true
+   },
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Ruby 2.4.1",
+   "language": "ruby",
+   "name": "ruby"
+  },
+  "language_info": {
+   "file_extension": ".rb",
+   "mimetype": "application/x-ruby",
+   "name": "ruby",
+   "version": "2.4.1"
+  },
+  "toc": {
+   "nav_menu": {},
+   "number_sections": true,
+   "sideBar": true,
+   "skip_h1_title": false,
+   "toc_cell": false,
+   "toc_position": {},
+   "toc_section_display": "block",
+   "toc_window_display": false
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 2
+}

data/lib/numpy.rb

@@ -35,4 +35,5 @@ module Numpy
   end
 end
 
+require 'numpy/conversion'
 require 'numpy/ndarray'

data/lib/numpy/conversion.rb

@@ -0,0 +1,36 @@
+module Numpy
+  module Conversion
+    module_function
+
+    def to_ruby(val)
+      case val
+      when Numpy.integer
+        PyCall.builtins.int.(val)
+      when Numpy.floating
+        PyCall.builtins.float.(val)
+      when Numpy.complexfloating
+        val = PyCall.builtins.complex.(val)
+        Complex(val.real.to_f, val.imag.to_f)
+      when Numpy.bool_
+        PyCall.builtins.bool.(val)
+      else
+        val
+      end
+    end
+  end
+
+  Bool_ = Numpy.bool_
+  Integer = Numpy.integer
+  Floating = Numpy.floating
+  ComplexFloating = Numpy.complexfloating
+
+  [ Bool_, Integer, Floating, ComplexFloating ].each do |klass|
+    klass.class_eval do
+      register_python_type_mapping
+
+      def self.wrap_pyptr(pyptr)
+        Conversion.to_ruby(pyptr)
+      end
+    end
+  end
+end

data/lib/numpy/ndarray.rb

@@ -4,24 +4,7 @@ module Numpy
     register_python_type_mapping
 
     def [](*index)
-      to_ruby(super)
-    end
-
-    private
-
-    def to_ruby(val)
-      case val
-      when Numpy.integer
-        val.to_i
-      when Numpy.floating
-        val.to_f
-      when Numpy.complexfloating
-        Complex(val.real.to_f, val.imag.to_f)
-      when Numpy.bool_
-        val.to_i == 1
-      else
-        val
-      end
+      Conversion.to_ruby(super)
     end
   end
 end

data/lib/numpy/version.rb

@@ -1,3 +1,3 @@
 module Numpy
-  VERSION = "0.1.0"
+  VERSION = "0.2.0.beta1"
 end

data/numpy.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "pycall", ">= 1.0.1"
+  spec.add_dependency "pycall", ">= 1.2.0.beta1"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: numpy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0.beta1
 platform: ruby
 authors:
 - Kenta Murata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pycall
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.0.beta1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -76,13 +76,17 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGES.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
+- example/Gemfile
+- example/benchmarking.ipynb
 - lib/numpy.rb
+- lib/numpy/conversion.rb
 - lib/numpy/ndarray.rb
 - lib/numpy/version.rb
 - numpy.gemspec
@@ -101,12 +105,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Numpy wrapper for Ruby