xnd 0.2.0dev6 → 0.2.0dev7

data/ext/ruby_xnd/xnd/python/xnd_randvalue.py

@@ -33,9 +33,10 @@
 # Python NDarray and functions for generating test cases.
 
 from itertools import accumulate, count, product
-from random import randrange
+from random import randrange, shuffle
 from collections import namedtuple
 from xnd_support import R
+from ndtypes import ndt
 
 
 # ======================================================================
@@ -59,6 +60,32 @@ EMPTY_TEST_CASES = [
 ]
 
 
+# ======================================================================
+#                       Max type for exact conversions 
+# ======================================================================
+
+maxtype = {
+  ndt("int8"): ndt("int64"),
+  ndt("int16"): ndt("int64"),
+  ndt("int32"): ndt("int64"),
+  ndt("int64"): ndt("int64"),
+
+  ndt("uint8"): ndt("uint64"),
+  ndt("uint16"): ndt("uint64"),
+  ndt("uint32"): ndt("uint64"),
+  ndt("uint64"): ndt("uint64"),
+
+  ndt("bfloat16"): ndt("float64"),
+  ndt("float16"): ndt("float64"),
+  ndt("float32"): ndt("float64"),
+  ndt("float64"): ndt("float64"),
+
+  ndt("complex32"): ndt("complex128"),
+  ndt("complex64"): ndt("complex128"),
+  ndt("complex128"): ndt("complex128"),
+}
+
+
 # ======================================================================
 #                             Typed values
 # ======================================================================
@@ -207,6 +234,22 @@ DTYPE_EMPTY_TEST_CASES = [
    (R['x': 0, 'y': 2 * [3 * [4 * [5 * [None]]]]], "{x: int64, y: 2 * 3 * Some(4 * 5 * ?float64)}"),
    (R['x': 0, 'y': 2 * [3 * [4 * [5 * [None]]]]], "{x: int64, y: 2 * 3 * ref(4 * 5 * ?float64)}"),
 
+   # Unions
+   (('X', 0), "[X of int64]"),
+   (('X', 0), "[X of int8 | Y of int64]"),
+   (('X', 0), "[X of int8 | Y of {a: complex128, b: string}]"),
+
+   # Optional unions
+   (None, "?[X of complex64]"),
+   (None, "?[X of int8]"),
+   (None, "?[X of int8 | Y of int64]"),
+   (None, "?[X of uint16 | Y of {z: complex64}]"),
+   (None, "?[X of uint16 | Y of {z: complex64, pack=1}]"),
+   (None, "?[X of 0 * bytes]"),
+   (None, "?[X of 0 * bytes | Y of 0 * string]"),
+   (None, "?[X of 1 * bytes | Y of {y: 2 * complex128, z: 3 * string}]"),
+   (None, "?[X of 1 * bytes | Y of 2 * {a: complex128, b: 10 * 2 * string, z: 3 * string}]"),
+
    # Primitive types
    (False, "bool"),
    (0, "bool"),
@@ -863,6 +906,13 @@ EQUAL_TEST_CASES = [
 #            Definition of generalized slicing and indexing
 # ======================================================================
 
+def have_none(lst):
+    if isinstance(lst, (list, tuple)):
+        return any(have_none(item) for item in lst)
+    if isinstance(lst, dict):
+        return any(have_none(item) for item in lst.values())
+    return lst is None
+
 def maxlevel(lst):
     """Return maximum nesting depth"""
     maxlev = 0
@@ -889,17 +939,22 @@ def getitem(lst, indices):
     if isinstance(i, int):
         return getitem(item, indices)
 
+    # Empty slice: check if all subsequent indices are in range for the
+    # full slice, raise IndexError otherwise. This is NumPy's behavior.
     if not item:
-        # Empty slice: check if all subsequent indices are in range for the
-        # full slice, raise IndexError otherwise. This is NumPy's behavior.
-        _ = [getitem(x, indices) for x in lst]
+        if lst:
+           _ = getitem(lst, (slice(None),) + indices)
+        elif any(isinstance(k, int) for k in indices):
+           raise IndexError
         return []
 
     return [getitem(x, indices) for x in item]
 
 class NDArray(list):
     """A simple wrapper for using generalized slicing/indexing on a list."""
-    def __init__(self, value):
+    def __init__(self, value, dtype=None):
+        if dtype is not None and dtype != "int64":
+            raise ValueError("the only supported dtype is 'int64'")
         list.__init__(self, value)
         self.maxlevel = maxlevel(value)
 
@@ -1006,6 +1061,14 @@ def rslice(ndim):
     step = None if randrange(5) == 4 else step
     return slice(start, stop, step)
 
+def rslice_neg(ndim):
+    start = randrange(-ndim-1, ndim+1)
+    stop = randrange(-ndim-1, ndim+1)
+    step = 0
+    while step == 0:
+        step = randrange(-ndim-1, ndim+1)
+    return slice(start, stop, step)
+
 def multislice(ndim):
     return tuple(rslice(ndim) for _ in range(randrange(1, ndim+1)))
 
@@ -1041,14 +1104,26 @@ def mixed_index(max_ndim):
     indices = []
     for i in range(1, ndim+1):
         if randrange(2):
-            indices.append(randrange(max_ndim))
+            indices.append(randrange(-max_ndim, max_ndim))
         else:
             indices.append(rslice(ndim))
     return tuple(indices)
 
+def mixed_index_neg(max_ndim):
+    ndim = randrange(1, max_ndim+1)
+    indices = []
+    for i in range(1, ndim+1):
+        if randrange(2):
+            indices.append(randrange(-max_ndim, max_ndim))
+        else:
+            indices.append(rslice_neg(ndim))
+    return tuple(indices)
+
 def mixed_indices(max_ndim):
     for i in range(5):
         yield mixed_index(max_ndim)
+    for i in range(5):
+        yield mixed_index_neg(max_ndim)
 
 def itos(indices):
     return ", ".join(str(i) if isinstance(i, int) else "%s:%s:%s" %
@@ -1099,6 +1174,7 @@ def column(i, r, q, m, ms):
                    schedule(step(i, r, q), ms)) + \
            column(i+1, r, q, m, ms)
 
+
 # ======================================================================
 #                   Split an xnd object into N subtrees
 # ======================================================================
@@ -1119,3 +1195,27 @@ def split_xnd(x, n, max_outer=None):
     return [x[i] for i in indices_list]
 
 
+# ======================================================================
+#                            Random reshape
+# ======================================================================
+
+def prod(lst):
+    p = 1
+    for v in lst:
+        p *= v
+    return p
+
+def randshape(shape):
+    if not shape:
+        return []
+    s = list(shape)
+    shuffle(s)
+    N = len(s)
+    result = []
+    while N > 0:
+        n = randrange(1, N+1)
+        t = s[:n]
+        s = s[n:]
+        result.append(prod(t))
+        N -= n
+    return result

data/ext/ruby_xnd/xnd/python/xnd_support.py

@@ -90,6 +90,10 @@ def assertEqualWithEx(self, func, x, y):
 
     if xerr is None is yerr:
         self.assertEqual(xres, yres, msg="x: %s y: %s" % (x.type, y))
+    elif xerr is TypeError and yerr is None and isinstance(y, tuple) and len(y) == 2:
+        # Tagged unions like ('Int', 0) have len() in the Python representation
+        # but are scalars in xnd.
+        pass
     else:
         self.assertEqual(xerr, yerr, msg="x: %s y: %s" % (x.type, y))
 

data/ext/ruby_xnd/xnd/setup.py

@@ -42,6 +42,7 @@ from glob import glob
 import platform
 import subprocess
 import shutil
+import argparse
 import warnings
 
 try:
@@ -82,6 +83,15 @@ Links
 
 warnings.simplefilter("ignore", UserWarning)
 
+
+# Pre-parse and remove the '-j' argument from sys.argv.
+parser = argparse.ArgumentParser()
+parser.add_argument('-j', default=None)
+values, rest = parser.parse_known_args()
+PARALLEL = values.j
+sys.argv = sys.argv[:1] + rest
+
+
 if sys.platform == "darwin":
     LIBNAME = "libxnd.dylib"
     LIBSONAME = "libxnd.0.dylib"
@@ -209,6 +219,27 @@ elif len(sys.argv) == 2:
     else:
         pass
 
+def configure(configure_includes, configure_libs):
+    os.chmod("./configure", 0x1ed) # pip removes execute permissions.
+    make = "make -j%d" % int(PARALLEL) if PARALLEL else "make"
+    os.system("./configure --with-includes='%s' --with-libs='%s' && %s" %
+              (configure_includes, configure_libs, make))
+
+def get_config_vars():
+    f = open("config.h")
+    config_vars = {}
+    for line in f:
+        if line.startswith("#define"):
+            l = line.split()
+            try:
+                config_vars[l[1]] = int(l[2])
+            except ValueError:
+                pass
+        elif line.startswith("/* #undef"):
+            l = line.split()
+            config_vars[l[2]] = 0
+    f.close()
+    return config_vars
 
 def xnd_ext():
     include_dirs = ["libxnd", "ndtypes/python/ndtypes"] + INCLUDES
@@ -235,6 +266,11 @@ def xnd_ext():
             os.chdir("..")
 
     else:
+        if BUILD_ALL:
+            configure(CONFIGURE_INCLUDES, CONFIGURE_LIBS)
+
+        config_vars = get_config_vars()
+
         extra_compile_args = ["-Wextra", "-Wno-missing-field-initializers", "-std=c11"]
         if sys.platform == "darwin":
             libraries = ["ndtypes", "xnd"]
@@ -245,10 +281,16 @@ def xnd_ext():
             extra_link_args = []
             runtime_library_dirs = ["$ORIGIN"]
 
-        if BUILD_ALL:
-            os.system(
-              "./configure --with-includes='%s' --with-libs='%s' && make" %
-              (CONFIGURE_INCLUDES, CONFIGURE_LIBS))
+        if config_vars["HAVE_CUDA"]:
+            libraries += ["cudart"]
+
+            for d in [
+                "/usr/cuda/lib",
+                "/usr/cuda/lib64",
+                "/usr/local/cuda/lib/",
+                "/usr/local/cuda/lib64"]:
+                if os.path.isdir(d):
+                    library_dirs.append(d)
 
     return Extension (
       "xnd._xnd",

data/lib/xnd.rb

@@ -87,6 +87,14 @@ class XND < RubyXND
       @data.map!(&block)
     end
 
+    def == other
+      if other.is_a?(XND::T)
+        @data == other.data
+      else
+        @data == other
+      end
+    end
+
     def [] *index
       @data[index]
     end
@@ -277,8 +285,22 @@ class XND < RubyXND
       end
     end
   end
+
+  class << self
+    def empty type, device: nil
+      if device
+        name, no = device.split ":"
+        no = (no == "managed" ? -1 : no.to_i)
+        device = [name, no]
+      end
+      
+      RubyXND.empty type, device
+    end
+  end
+
   
-  def initialize data, type: nil, dtype: nil, levels: nil, typedef: nil, dtypedef: nil
+  def initialize data, type: nil, dtype: nil, levels: nil, typedef: nil,
+      dtypedef: nil, device: nil
     if [type, dtype, levels, typedef, dtypedef].count(nil) < 2
       raise ArgumentError, "the 'type', 'dtype', 'levels' and 'typedef' arguments are "
       "mutually exclusive."
@@ -307,8 +329,22 @@ class XND < RubyXND
       data = TypeInference.convert_xnd_t_to_ruby_array data
     end
 
-    super(type, data)
+    if device
+      name, no = device.split ":"
+      no = (no == "managed" ? -1 : no.to_i)
+      device = [name, no]
+    end
+
+    super(type, data, device)
+  end
+
+  def reshape shape, order: nil
+    _reshape(shape, order)
+  end
+
+  def transpose permute: nil
+    _transpose(permute)
   end
 
   alias :to_a :value
-end
+end # class XND

data/lib/xnd/version.rb

@@ -1,6 +1,6 @@
 class RubyXND
   # VERSION number should be the version of libxnd this is built against.
-  VERSION = "0.2.0dev6"
+  VERSION = "0.2.0dev7"
   # Working commit in xnd repo
-  COMMIT = "31ec2d8501af442e1a5054d9531a5e2cefb242cb"
+  COMMIT = '6f305cd40d90b4f3fc2fe51ae144b433d186a6cc'
 end

data/xnd.gemspec

@@ -40,9 +40,10 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'minitest', '~> 5.11'
   spec.add_development_dependency 'minitest-hooks'
+  spec.add_development_dependency 'minitest-fail-fast'
   spec.add_development_dependency 'rake-compiler'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-byebug'
 
-  spec.add_runtime_dependency 'ndtypes', '>= 0.2.0dev5'
+  spec.add_runtime_dependency 'ndtypes', '>= 0.2.0dev6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xnd
 version: !ruby/object:Gem::Version
-  version: 0.2.0dev6
+  version: 0.2.0dev7
 platform: ruby
 authors:
 - Sameer Deshmukh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2019-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-fail-fast
+  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'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0dev5
+        version: 0.2.0dev6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0dev5
+        version: 0.2.0dev6
 description: 'XND is a library for typed data arrays in Ruby. It is a wrapper over
   the libxnd C library.
 
@@ -110,11 +124,21 @@ files:
 - History.md
 - README.md
 - Rakefile
+- ext/ruby_xnd/GPATH
+- ext/ruby_xnd/GRTAGS
+- ext/ruby_xnd/GTAGS
 - ext/ruby_xnd/extconf.rb
 - ext/ruby_xnd/float_pack_unpack.c
 - ext/ruby_xnd/float_pack_unpack.h
 - ext/ruby_xnd/gc_guard.c
 - ext/ruby_xnd/gc_guard.h
+- ext/ruby_xnd/include/overflow.h
+- ext/ruby_xnd/include/ruby_xnd.h
+- ext/ruby_xnd/include/xnd.h
+- ext/ruby_xnd/lib/libxnd.a
+- ext/ruby_xnd/lib/libxnd.so
+- ext/ruby_xnd/lib/libxnd.so.0
+- ext/ruby_xnd/lib/libxnd.so.0.2.0dev3
 - ext/ruby_xnd/memory_block_object.c
 - ext/ruby_xnd/memory_block_object.h
 - ext/ruby_xnd/ruby_xnd.c
@@ -126,10 +150,14 @@ files:
 - ext/ruby_xnd/xnd/INSTALL.txt
 - ext/ruby_xnd/xnd/LICENSE.txt
 - ext/ruby_xnd/xnd/MANIFEST.in
+- ext/ruby_xnd/xnd/Makefile
 - ext/ruby_xnd/xnd/Makefile.in
 - ext/ruby_xnd/xnd/README.rst
 - ext/ruby_xnd/xnd/config.guess
+- ext/ruby_xnd/xnd/config.h
 - ext/ruby_xnd/xnd/config.h.in
+- ext/ruby_xnd/xnd/config.log
+- ext/ruby_xnd/xnd/config.status
 - ext/ruby_xnd/xnd/config.sub
 - ext/ruby_xnd/xnd/configure
 - ext/ruby_xnd/xnd/configure.ac
@@ -145,17 +173,34 @@ files:
 - ext/ruby_xnd/xnd/doc/xnd/buffer-protocol.rst
 - ext/ruby_xnd/xnd/doc/xnd/index.rst
 - ext/ruby_xnd/xnd/doc/xnd/quickstart.rst
-- ext/ruby_xnd/xnd/doc/xnd/types.rst
+- ext/ruby_xnd/xnd/doc/xnd/xnd.rst
 - ext/ruby_xnd/xnd/install-sh
+- ext/ruby_xnd/xnd/libxnd/Makefile
 - ext/ruby_xnd/xnd/libxnd/Makefile.in
 - ext/ruby_xnd/xnd/libxnd/Makefile.vc
 - ext/ruby_xnd/xnd/libxnd/bitmaps.c
+- ext/ruby_xnd/xnd/libxnd/bitmaps.o
+- ext/ruby_xnd/xnd/libxnd/bounds.c
+- ext/ruby_xnd/xnd/libxnd/bounds.o
 - ext/ruby_xnd/xnd/libxnd/contrib.h
+- ext/ruby_xnd/xnd/libxnd/contrib/bfloat16.h
 - ext/ruby_xnd/xnd/libxnd/copy.c
+- ext/ruby_xnd/xnd/libxnd/copy.o
+- ext/ruby_xnd/xnd/libxnd/cuda/cuda_memory.cu
+- ext/ruby_xnd/xnd/libxnd/cuda/cuda_memory.h
 - ext/ruby_xnd/xnd/libxnd/equal.c
+- ext/ruby_xnd/xnd/libxnd/equal.o
 - ext/ruby_xnd/xnd/libxnd/inline.h
+- ext/ruby_xnd/xnd/libxnd/libxnd.a
+- ext/ruby_xnd/xnd/libxnd/libxnd.so
+- ext/ruby_xnd/xnd/libxnd/libxnd.so.0
+- ext/ruby_xnd/xnd/libxnd/libxnd.so.0.2.0dev3
 - ext/ruby_xnd/xnd/libxnd/overflow.h
+- ext/ruby_xnd/xnd/libxnd/shape.c
+- ext/ruby_xnd/xnd/libxnd/shape.o
 - ext/ruby_xnd/xnd/libxnd/split.c
+- ext/ruby_xnd/xnd/libxnd/split.o
+- ext/ruby_xnd/xnd/libxnd/tests/Makefile
 - ext/ruby_xnd/xnd/libxnd/tests/Makefile.in
 - ext/ruby_xnd/xnd/libxnd/tests/Makefile.vc
 - ext/ruby_xnd/xnd/libxnd/tests/README.txt
@@ -164,13 +209,20 @@ files:
 - ext/ruby_xnd/xnd/libxnd/tests/test_fixed.c
 - ext/ruby_xnd/xnd/libxnd/xnd.c
 - ext/ruby_xnd/xnd/libxnd/xnd.h
+- ext/ruby_xnd/xnd/libxnd/xnd.o
 - ext/ruby_xnd/xnd/python/test_xnd.py
 - ext/ruby_xnd/xnd/python/xnd/__init__.py
+- ext/ruby_xnd/xnd/python/xnd/_version.py
 - ext/ruby_xnd/xnd/python/xnd/_xnd.c
 - ext/ruby_xnd/xnd/python/xnd/contrib/pretty.py
 - ext/ruby_xnd/xnd/python/xnd/docstrings.h
+- ext/ruby_xnd/xnd/python/xnd/libxnd.a
+- ext/ruby_xnd/xnd/python/xnd/libxnd.so
+- ext/ruby_xnd/xnd/python/xnd/libxnd.so.0
+- ext/ruby_xnd/xnd/python/xnd/libxnd.so.0.2.0dev3
 - ext/ruby_xnd/xnd/python/xnd/pyxnd.h
 - ext/ruby_xnd/xnd/python/xnd/util.h
+- ext/ruby_xnd/xnd/python/xnd/xnd.h
 - ext/ruby_xnd/xnd/python/xnd_randvalue.py
 - ext/ruby_xnd/xnd/python/xnd_support.py
 - ext/ruby_xnd/xnd/setup.py
@@ -181,6 +233,7 @@ files:
 - ext/ruby_xnd/xnd/vcbuild/vcbuild64.bat
 - ext/ruby_xnd/xnd/vcbuild/vcclean.bat
 - ext/ruby_xnd/xnd/vcbuild/vcdistclean.bat
+- lib/ruby_xnd.so
 - lib/xnd.rb
 - lib/xnd/version.rb
 - xnd.gemspec