pycall 0.1.0.alpha.20170711 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a62b597bfd316247a0a32c28b46fb219f7271a6a
-  data.tar.gz: a7356ff5c08cf2d519519908d77341e07d90ecfe
+  metadata.gz: 3989138be85724905ddd029fb3f74a7168070c02
+  data.tar.gz: 8ab3173bf2d1c2f92deec6b98241cc28d9768a03
 SHA512:
-  metadata.gz: d56553cb58f507bf421074aff630f0204361013b1700f0b30a3238db1ca9f0c12ed0e883438f33b616b156d95dbe93a3f116c7465090073ae198edaebb337b9f
-  data.tar.gz: 5b5b5693f3f82724d78549a1d1aa645bf155c2c7e7d6e834c6efb5644fe8854a5c6fddc2b3847b7b2ad6891fa4b99b2ce1c0078c11bf65e947700e668f000f19
+  metadata.gz: 574f866b421b1010e907ff83ca9ce45725cd642af94004a1ab979a2b24f1605dfdeaa29c6090a159a6ac713d97cb9be4f20dc343e8edc21156e143b3845e8b95
+  data.tar.gz: fb03c20e8e60bc674c484f871848106ffe2ab5722ac1ba2331ea6f77075743320eef7d0bc9d320744486b1698a00a9c801182b4442d0e2f85905822d5f83818f

data/.gitignore

@@ -8,3 +8,6 @@
 /spec/reports/
 /tmp/
 __pycache__
+*.bundle
+*.so
+*.o

data/.travis.yml

@@ -9,9 +9,12 @@ rvm:
   - 2.1.10
 
 env:
+  global:
+  - PYCALL_DEBUG_FIND_LIBPYTHON=1
+  matrix:
   - PYTHON=python
   - PYTHON=python3 LIBPYTHON=wrong_value
-  - LIBPYTHON=/usr/lib/libpython3.2mu.so.1
+  - LIBPYTHON=/opt/python/3.5.3/lib/libpython3.5m.so
 
 addons:
   apt:
@@ -19,11 +22,20 @@ addons:
       - python3
       - python3-dev
       - python3-all
+      - python3-all-dev
 
 before_install:
   - gem update --system
   - gem update bundler
 
 before_script:
+  - bundle exec rake clobber compile
   - echo === python investigator.py ===
   - python lib/pycall/python/investigator.py
+  - python3 lib/pycall/python/investigator.py
+  - pip install numpy
+  - pip3 install numpy
+
+matrix:
+  allow_failures:
+  - env: PYTHON=python  # Ignore failed on python 2.7

data/CHANGES.md

@@ -0,0 +1,35 @@
+# The change history of PyCall
+
+## 1.0.0
+
+* `#[]` and `#[]=` accept a `Range` and an `Enumerable`, which is genated by
+  `Range#step`, as a slice.
+
+* Rewrite almost all fundamental parts of PyCall as C extension.
+
+* PyCall now calls `Py_DecRef` in the finalizer of `PyCall::PyPtr`.
+
+* Change the system of object mapping between Python and Ruby, drastically.
+  Now PyCall does not have `PyObject` class for wrapper objects.
+  Instead, PyCall generally makes `Object` instances and extends them by
+  `PyObjectWrapper` module.
+  But for Python module objects, PyCall makes anonymous `Module` instances 
+  that are extended by `PyObjectWrapper` module.
+  Moreover for Python type objects, PyCall makes `Class` instances and extends
+  them by `PyTypeObjectWrapper` module.
+
+* Change `PyCall.eval` to be a wrapper of `__builtins__.eval` in Python.
+  This means that `filename:` and `input_type:` parameters are dropped.
+  Instead, two new parameters `globals:` and `locals:` are introduced.
+  `globals:` is used for specifying a dictionary that is the global
+  namespace referred by the evaluated expression.
+  `locals:` is used for specifying a mapping object that is the local
+  namespace referred by the evaluated expression.
+
+* Add `PyCall.exec` for the replacement of the former `PyCall.eval`
+  with `input_type: :file`.
+  It has `globals:` and `locals:` parameters for the same meaning as
+  the new `PyCall.eval` described above.
+
+* Drop `PyCall.wrap_ruby_callable` and `PyCall.wrap_ruby_object` always
+  craetes a callable Python object taht has an ID of the given Ruby object.

data/Gemfile

@@ -2,8 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in pycall.gemspec
 gemspec
-
-group :development do
-  gem 'guard-rspec', require: false
-  gem 'terminal-notifier-guard', require: false
-end

data/README.md

@@ -3,7 +3,10 @@
 [![Build Status](https://travis-ci.org/mrkn/pycall.svg?branch=master)](https://travis-ci.org/mrkn/pycall)
 [![Build status](https://ci.appveyor.com/api/projects/status/071is0f4iu0vy8lp/branch/master?svg=true)](https://ci.appveyor.com/project/mrkn/pycall/branch/master)
 
-This library provides the features to directly call and partially interoperate with Python from the Ruby language.  You can import arbitrary Python modules into Ruby modules, call Python functions with automatic type conversion from Ruby to Python.
+This library provides the features to directly call and partially interoperate
+with Python from the Ruby language.  You can import arbitrary Python modules
+into Ruby modules, call Python functions with automatic type conversion from
+Ruby to Python.
 
 ## Installation
 
@@ -23,77 +26,66 @@ Or install it yourself as:
 
 ## Usage
 
-Here is a simple example to call Python's `math.sin` function and compare it to the `Math.sin` in Ruby:
+Here is a simple example to call Python's `math.sin` function and compare it to
+the `Math.sin` in Ruby:
 
     require 'pycall/import'
     include PyCall::Import
     pyimport :math
-    math.sin.(math.pi / 4) - Math.sin(Math::PI / 4)   # => 0.0
-    #       ^ This period is necessary
+    math.sin(math.pi / 4) - Math.sin(Math::PI / 4)   # => 0.0
 
-Type conversions from Ruby to Python are automatically performed for numeric, boolean, string, arrays, and hashes.
+Type conversions from Ruby to Python are automatically performed for numeric,
+boolean, string, arrays, and hashes.
 
-### Python function call
+## PyCall object system
 
-In this version of pycall, the all of functions and methods in Python is wrapped as callable objects in Ruby.  It means we need to put a priod between the name of function and `(` like `math.sin.(...)` in the above example.
+PyCall wraps pointers of Python objects in `PyCall::PyPtr` objects.
+`PyCall::PyPtr` class has two subclasses, `PyCall::PyTypePtr` and
+`PyCall::PyRubyPtr`.  `PyCall::PyTypePtr` is specialized for type (and classobj
+in 2.7) objects, and `PyCall::PyRubyPtr` is for the objects that wraps pointers
+of Ruby objects.
 
-This unnatural notation is a temporary specification, so we should be able to write `math.sin(...)` in the future.
+These `PyCall::PyPtr` objects are used mainly in PyCall infrastructure.
+Instead, we usually treats the instances of `Object`, `Class`, `Module`, or
+other classes that are extended by `PyCall::PyObjectWrapper` module.
 
-## Wrapping Python classes
-
-**NOTE: Currently I'm trying to rewrite class wrapping system, so the content of this section will be changed.**
-
-Using `PyCall::PyObjectWrapper` module, we can create incarnation classes for Python classes in Ruby language.  For example, the following script defines a incarnation class for `numpy.ndarray` class.
-
-```ruby
-require 'pycall'
-
-class Ndarray
-  import PyCall::PyObjectWrapper
-  wrap_class PyCall.import_module('numpy').ndarray
-end
-```
-
-Defineing incarnation classes using `wrap_class` registeres automatic type conversion, so it changes the class of wrapper object.  For example:
-
-    require 'pycall/import'
-    include PyCall::Import
-    pyimport :numpy, as: :np
-    x1 = np.array(PyCall.tuple(10))
-    x1.class   # => PyCall::PyObject
-
-    class Ndarray
-      import PyCall::PyObjectWrapper
-      wrap_class PyCall.import_module('numpy').ndarray
-      # NOTE: From here, numpy.ndarray objects are converted to Ndarray objects
-    end
-
-    x2 = np.array(PyCall.tuple(10))
-    x2.class   # => Ndarray
-
-
-**NOTE: I will write an efficient wrapper for numpy by RubyKaigi 2017.**
+`PyCall::PyObjectWrapper` is a mix-in module for objects that wraps Python
+objects.  A wrapper object should have `PyCall::PyPtr` object in its instance
+variable `@__pyptr__`.  `PyCall::PyObjectWrapper` assumes the existance of
+`@__pyptr__`, and provides general translation mechanisms between Ruby object
+system and Python object system.  For example, `PyCall::PyObjectWrapper`
+translates Ruby's coerce system into Python's swapped operation protocol.
 
 ### Specifying the Python version
 
-If you want to use a specific version of Python instead of the default, you can change the Python version by setting the `PYTHON` environment variable to the path of the `python` executable.
+If you want to use a specific version of Python instead of the default,
+you can change the Python version by setting the `PYTHON` environment variable
+to the path of the `python` executable.
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies.
+Then, run `rake spec` to run the tests. You can also run `bin/console`
+for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`.
+To release a new version, update the version number in `version.rb`,
+and then run `bundle exec rake release`, which will create a git tag for the
+version, push git commits and tags, and push the `.gem` file to
+[rubygems.org](https://rubygems.org).
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/mrkn/pycall.
+Bug reports and pull requests are welcome on GitHub at
+https://github.com/mrkn/pycall.
 
 
 ## Acknowledgement
 
-[PyCall.jl](https://github.com/JuliaPy/PyCall.jl) is referred too many times to implement this library.
+[PyCall.jl](https://github.com/JuliaPy/PyCall.jl) is referred too many times
+to implement this library.
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-
+The gem is available as open source under the terms of the
+[MIT License](http://opensource.org/licenses/MIT).

data/Rakefile

@@ -1,8 +1,29 @@
-require "bundler/gem_tasks"
+require "bundler"
+Bundler::GemHelper.install_tasks
+
+require "rake"
+require "rake/extensiontask"
 require "rspec/core/rake_task"
 
 Dir[File.expand_path('../tasks/**/*.rake', __FILE__)].each {|f| load f }
 
+gem_spec = eval(File.read('pycall.gemspec'))
+Rake::ExtensionTask.new('pycall', gem_spec) do |ext|
+  ext.lib_dir = File.join(*['lib', ENV['FAT_DIR']].compact)
+  ext.cross_compile = true
+  ext.cross_platform = %w[x86-mingw32 x64-mingw32]
+  ext.cross_compiling do |s|
+    s.files.concat %w[lib/2.2/pycall.so lib/2.3/pycall.so lib/2.4/pycall.so]
+  end
+end
+
+desc "Compile binaries for mingw platform using rake-compiler-dock"
+task 'build:mingw' do
+  require 'rake_compiler_dock'
+  RakeCompilerDock.sh "bundle && rake cross native gem RUBY_CC_VERSION=2.1.6:2.2.2:2.3.0:2.4.0"
+end
+
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+task spec: :compile

data/appveyor.yml

@@ -6,10 +6,6 @@ environment:
     PYTHONDIR: "C:\\Python27"
     PYTHON: "C:\\Python27\\python.exe"
 
-  - ruby_version: "21"
-    PYTHONDIR: "C:\\Python33"
-    PYTHON: "C:\\Python33\\python.exe"
-
   - ruby_version: "21"
     PYTHONDIR: "C:\\Python34"
     PYTHON: "C:\\Python34\\python.exe"
@@ -27,10 +23,6 @@ environment:
     PYTHONDIR: "C:\\Python27-x64"
     PYTHON: "C:\\Python27-x64\\python.exe"
 
-  - ruby_version: "21-x64"
-    PYTHONDIR: "C:\\Python33-x64"
-    PYTHON: "C:\\Python33-x64\\python.exe"
-
   - ruby_version: "21-x64"
     PYTHONDIR: "C:\\Python34-x64"
     PYTHON: "C:\\Python34-x64\\python.exe"
@@ -48,10 +40,6 @@ environment:
     PYTHONDIR: "C:\\Python27"
     PYTHON: "C:\\Python27\\python.exe"
 
-  - ruby_version: "22"
-    PYTHONDIR: "C:\\Python33"
-    PYTHON: "C:\\Python33\\python.exe"
-
   - ruby_version: "22"
     PYTHONDIR: "C:\\Python34"
     PYTHON: "C:\\Python34\\python.exe"
@@ -69,10 +57,6 @@ environment:
     PYTHONDIR: "C:\\Python27-x64"
     PYTHON: "C:\\Python27-x64\\python.exe"
 
-  - ruby_version: "22-x64"
-    PYTHONDIR: "C:\\Python33-x64"
-    PYTHON: "C:\\Python33-x64\\python.exe"
-
   - ruby_version: "22-x64"
     PYTHONDIR: "C:\\Python34-x64"
     PYTHON: "C:\\Python34-x64\\python.exe"
@@ -90,10 +74,6 @@ environment:
     PYTHONDIR: "C:\\Python27"
     PYTHON: "C:\\Python27\\python.exe"
 
-  - ruby_version: "23"
-    PYTHONDIR: "C:\\Python33"
-    PYTHON: "C:\\Python33\\python.exe"
-
   - ruby_version: "23"
     PYTHONDIR: "C:\\Python34"
     PYTHON: "C:\\Python34\\python.exe"
@@ -111,10 +91,6 @@ environment:
     PYTHONDIR: "C:\\Python27-x64"
     PYTHON: "C:\\Python27-x64\\python.exe"
 
-  - ruby_version: "23-x64"
-    PYTHONDIR: "C:\\Python33-x64"
-    PYTHON: "C:\\Python33-x64\\python.exe"
-
   - ruby_version: "23-x64"
     PYTHONDIR: "C:\\Python34-x64"
     PYTHON: "C:\\Python34-x64\\python.exe"
@@ -144,12 +120,19 @@ build: off
 install:
   - "SET PATH=%PYTHONDIR%;%PYTHONDIR%\\Scripts;%PATH%"
   - "SET PATH=C:\\Ruby%ruby_version%\\bin;%PATH%"
-  - bundle install
+  - "bundle install"
+  - "pip install numpy"
 
 before_test:
+  - "bundle exec rake -rdevkit clobber compile"
   - ECHO "=== python investigator.py ==="
   - "python lib\\pycall\\python\\investigator.py"
 
 test_script:
-  - "SET DEBUG_FIND_LIBPYTHON=1"
+  - "SET PYCALL_DEBUG_FIND_LIBPYTHON=1"
   - rake
+
+matrix:
+  allow_failures:
+  - PYTHONDIR: "C:\\Python27"
+  - PYTHONDIR: "C:\\Python27-x64"

data/examples/classifier_comparison.rb

@@ -34,18 +34,18 @@ names = [
 ]
 
 classifiers = [
-  KNeighborsClassifier.(3),
-  SVC.(kernel: 'linear', C: 0.025),
-  SVC.(gamma: 2, C: 1),
-  DecisionTreeClassifier.(max_depth: 5),
-  RandomForestClassifier.(max_depth: 5, n_estimators: 10, max_features: 1),
-  AdaBoostClassifier.(),
-  GaussianNB.(),
-  LinearDiscriminantAnalysis.(),
-  QuadraticDiscriminantAnalysis.()
+  KNeighborsClassifier.new(3),
+  SVC.new(kernel: 'linear', C: 0.025),
+  SVC.new(gamma: 2, C: 1),
+  DecisionTreeClassifier.new(max_depth: 5),
+  RandomForestClassifier.new(max_depth: 5, n_estimators: 10, max_features: 1),
+  AdaBoostClassifier.new(),
+  GaussianNB.new(),
+  LinearDiscriminantAnalysis.new(),
+  QuadraticDiscriminantAnalysis.new()
 ]
 
-x, y = make_classification.(
+x, y = *make_classification(
   n_features: 2,
   n_redundant: 0,
   n_informative: 2,
@@ -53,83 +53,83 @@ x, y = make_classification.(
   n_clusters_per_class: 1
 )
 
-np.random.seed.(42)
-x += 2 * np.random.random_sample.(x.shape)
-linearly_separable = PyCall.tuple(x, y)
+np.random.seed(42)
+x += 2 * np.random.random_sample(x.shape)
+linearly_separable = PyCall.tuple([x, y]) # FIXME: allow PyCall.tuple(x, y)
 
 datasets = [
-  make_moons.(noise: 0.3, random_state: 0),
-  make_circles.(noise: 0.2, factor: 0.5, random_state: 1),
+  make_moons(noise: 0.3, random_state: 0),
+  make_circles(noise: 0.2, factor: 0.5, random_state: 1),
   linearly_separable
 ]
 
-fig = plt.figure.(figsize: PyCall.tuple(27, 9))
+fig = plt.figure(figsize: [27, 9])
 i = 1
-all = PyCall.slice(nil)
+all = 0..-1
 datasets.each do |ds|
-  x, y = ds
-  x = StandardScaler.().fit_transform.(x)
-  x_train, x_test, y_train, y_test = train_test_split.(x, y, test_size: 0.4)
+  x, y = *ds
+  x = StandardScaler.new.fit_transform(x)
+  x_train, x_test, y_train, y_test = train_test_split(x, y, test_size: 0.4)
 
-  x_min, x_max = np.min.(x[all, 0]) - 0.5, np.max.(x[all, 0]) + 0.5
-  y_min, y_max = np.min.(x[all, 1]) - 0.5, np.max.(x[all, 1]) + 0.5
+  x_min, x_max = np.min(x[all, 0]) - 0.5, np.max(x[all, 0]) + 0.5
+  y_min, y_max = np.min(x[all, 1]) - 0.5, np.max(x[all, 1]) + 0.5
 
-  xx, yy = np.meshgrid.(
-    np.linspace.(x_min, x_max, ((x_max - x_min)/h).round),
-    np.linspace.(y_min, y_max, ((y_max - y_min)/h).round),
+  xx, yy = np.meshgrid(
+    np.linspace(x_min, x_max, ((x_max - x_min)/h).round),
+    np.linspace(y_min, y_max, ((y_max - y_min)/h).round),
   )
-  mesh_points = np.dstack.(PyCall.tuple(xx.ravel.(), yy.ravel.()))[0, all, all]
+  mesh_points = np.dstack(PyCall.tuple([xx.ravel(), yy.ravel()]))[0, all, all]
 
   # just plot the dataset first
-  cm = plt.cm.RdBu
-  cm_bright = mplc.ListedColormap.(["#FF0000", "#0000FF"])
-  ax = plt.subplot.(datasets.length, classifiers.length + 1, i)
+  cm = plt.cm.__dict__[:RdBu]
+  cm_bright = mplc.ListedColormap.new(["#FF0000", "#0000FF"])
+  ax = plt.subplot(datasets.length, classifiers.length + 1, i)
   # plot the training points
-  ax.scatter.(x_train[all, 0], x_train[all, 1], c: y_train, cmap: cm_bright)
+  ax.scatter(x_train[all, 0], x_train[all, 1], c: y_train, cmap: cm_bright)
   # and testing points
-  ax.scatter.(x_test[all, 0], x_test[all, 1], c: y_test, cmap: cm_bright, alpha: 0.6)
+  ax.scatter(x_test[all, 0], x_test[all, 1], c: y_test, cmap: cm_bright, alpha: 0.6)
 
-  ax.set_xlim.(np.min.(xx), np.max.(xx))
-  ax.set_ylim.(np.min.(yy), np.max.(yy))
-  ax.set_xticks.(PyCall.tuple())
-  ax.set_yticks.(PyCall.tuple())
+  ax.set_xlim(np.min(xx), np.max(xx))
+  ax.set_ylim(np.min(yy), np.max(yy))
+  ax.set_xticks(PyCall.tuple())
+  ax.set_yticks(PyCall.tuple())
   i += 1
 
   # iterate over classifiers
   names.zip(classifiers).each do |name, clf|
-    ax = plt.subplot.(datasets.length, classifiers.length + 1, i)
-    clf.fit.(x_train, y_train)
-    scor = clf.score.(x_test, y_test)
+    ax = plt.subplot(datasets.length, classifiers.length + 1, i)
+    clf.fit(x_train, y_train)
+    scor = clf.score(x_test, y_test)
 
     # Plot the decision boundary.  For that, we will assign a color to each
     # point in the mesh [x_min, x_max]x[y_min, y_max]
     begin
       # not implemented for some
-      z = clf.decision_function.(mesh_points)
+      z = clf.decision_function(mesh_points)
     rescue
-      z = clf.predict_proba.(mesh_points)[all, 1]
+      z = clf.predict_proba(mesh_points)[all, 1]
     end
 
     # Put the result into a color plot
-    z = z.reshape.(xx.shape)
-    ax.contourf.(xx, yy, z, cmap: cm, alpha: 0.8)
+    z = z.reshape(xx.shape)
+    ax.contourf(xx, yy, z, cmap: cm, alpha: 0.8)
 
     # Plot also the training points
-    ax.scatter.(x_train[all, 0], x_train[all, 1], c: y_train, cmap: cm_bright)
+    ax.scatter(x_train[all, 0], x_train[all, 1], c: y_train, cmap: cm_bright)
     # and testing points
-    ax.scatter.(x_test[all, 0], x_test[all, 1], c: y_test, cmap: cm_bright, alpha: 0.6)
+    ax.scatter(x_test[all, 0], x_test[all, 1], c: y_test, cmap: cm_bright, alpha: 0.6)
 
-    ax.set_xlim.(np.min.(xx), np.max.(xx))
-    ax.set_ylim.(np.min.(yy), np.max.(yy))
-    ax.set_xticks.(PyCall.tuple())
-    ax.set_yticks.(PyCall.tuple())
-    ax.set_title.(name)
+    ax.set_xlim(np.min(xx), np.max(xx))
+    ax.set_ylim(np.min(yy), np.max(yy))
+    ax.set_xticks(PyCall.tuple())
+    ax.set_yticks(PyCall.tuple())
+    ax.set_title(name)
 
-    ax.text.(np.max.(xx) - 0.3, np.min.(yy) + 0.3, "%.2f" % scor, size: 15, horizontalalignment: 'right')
+    ax.text(np.max(xx) - 0.3, np.min(yy) + 0.3, "%.2f" % scor, size: 15, horizontalalignment: 'right')
 
     i += 1
   end
 end
 
-fig.subplots_adjust.(left: 0.02, right: 0.98)
-plt.show.()
+fig.subplots_adjust(left: 0.02, right: 0.98)
+plt.show()