gumath 0.2.0dev5 → 0.2.0dev8

data/ext/ruby_gumath/ruby_gumath.h

@@ -33,8 +33,11 @@
 #define RUBY_GUMATH_H
 
 /* Classes */
-VALUE cGumath;
+extern VALUE cGumath;
 
+/* C API call for adding functions from a gumath kernel table to a Ruby module.
+ * Only adds CPU functions.
+ */
 int rb_gumath_add_functions(VALUE module, const gm_tbl_t *tbl);
 #define GUMATH_FUNCTION_HASH rb_intern("@gumath_functions")
 

data/ext/ruby_gumath/ruby_gumath_internal.h

@@ -42,4 +42,29 @@
 #include "ruby_gumath.h"
 #include "util.h"
 
+#ifdef _MSC_VER
+  #ifndef UNUSED
+    #define UNUSED
+  #endif
+  #include <float.h>
+  #include <fenv.h>
+  #pragma fenv_access(on)
+#else
+  #if defined(__GNUC__) && !defined(__INTEL_COMPILER)
+    #define UNUSED __attribute__((unused))
+  #else
+    #define UNUSED
+  #endif
+  #include <fenv.h>
+  #if 0 /* Not supported by gcc and clang. */
+    #pragma STDC FENV_ACCESS ON
+  #endif
+#endif
+
+
+void Init_gumath_functions(void);
+void Init_gumath_examples(void);
+
+VALUE seterr(ndt_context_t *ctx);
+
 #endif  /* RUBY_GUMATH_INTERNAL_H */

data/ext/ruby_gumath/util.c

@@ -66,3 +66,37 @@ raise_error(void)
   rb_set_errinfo(Qnil);
   rb_exc_raise(exeception);
 }
+
+/* Checks whether a given Ruby object is of a type using is_a? */
+int
+rb_is_a(VALUE obj, VALUE klass)
+{
+  return RTEST(rb_funcall(obj, rb_intern("is_a?"), 1, klass));
+}
+
+int
+rb_klass_has_ancestor(VALUE klass, VALUE ancestor)
+{
+  return RTEST(
+               rb_funcall(
+                          rb_funcall(klass, rb_intern("ancestors"),0,NULL),
+                          rb_intern("include?"),
+                          1,
+                          ancestor));
+}
+
+int
+rb_ary_size(VALUE array)
+{
+  Check_Type(array, T_ARRAY);
+  return FIX2INT(rb_funcall(array, rb_intern("size"), 0, NULL));
+}
+
+void
+rb_puts(VALUE v) {
+  ID sym_puts = rb_intern("puts");
+  ID sym_inspect = rb_intern("inspect");
+  rb_funcall(rb_mKernel, sym_puts, 1,
+             rb_funcall(v, sym_inspect, 0));
+}
+

data/ext/ruby_gumath/util.h

@@ -45,4 +45,13 @@ int ndt_exists(void);
 /* Raise an error stored in $!. Clears it before raising. */
 void raise_error(void);
 
+int rb_is_a(VALUE obj, VALUE klass);
+
+int rb_klass_has_ancestor(VALUE klass, VALUE ancestor);
+
+int rb_ary_size(VALUE array);
+
+void rb_puts(VALUE v);
+
+
 #endif  /* GUMATH_UTIL_H */

data/gumath.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   spec.license       = 'BSD-3 Clause'
 
   spec.files         = files
+  spec.extensions    = "ext/ruby_gumath/extconf.rb"
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
@@ -42,6 +43,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'pry-byebug'
 
-  spec.add_runtime_dependency 'ndtypes', '>= 0.2.0dev5'
-  spec.add_runtime_dependency 'xnd', '>= 0.2.0dev5'
+  spec.add_runtime_dependency 'ndtypes', '>= 0.2.0dev8'
+  spec.add_runtime_dependency 'xnd', '>= 0.2.0dev8'
 end

data/lib/gumath.rb

@@ -3,5 +3,59 @@ require 'xnd'
 
 require 'etc'
 
-require 'ruby_gumath.so'
+begin
+  require 'ruby_gumath.so'
+rescue LoadError
+  require 'ruby_gumath/ruby_gumath.so'
+end
 require 'gumath/version'
+
+class Gumath
+  MAXCAST = {
+    NDT.new("int8")  => NDT.new("int64"),
+    NDT.new("int16") => NDT.new("int64"),
+    NDT.new("int32") => NDT.new("int64"),
+    NDT.new("int64") => NDT.new("int64"),
+    NDT.new("uint8") => NDT.new("uint64"),
+    NDT.new("uint16") => NDT.new("uint64"),
+    NDT.new("uint32") => NDT.new("uint64"),
+    NDT.new("uint64") => NDT.new("uint64"),
+    NDT.new("bfloat16")=> NDT.new("float64"),
+    NDT.new("float16") => NDT.new("float64"),
+    NDT.new("float32") => NDT.new("float64"),
+    NDT.new("float64") => NDT.new("float64"),
+    NDT.new("complex32") => NDT.new("complex128"),
+    NDT.new("complex64") => NDT.new("complex128"),
+    NDT.new("complex128")=> NDT.new("complex128"),
+
+    NDT.new("?int8") => NDT.new("?int64"),
+    NDT.new("?int16")=> NDT.new("?int64"),
+    NDT.new("?int32")=> NDT.new("?int64"),
+    NDT.new("?int64")=> NDT.new("?int64"),
+    NDT.new("?uint8")=> NDT.new("?uint64"),
+    NDT.new("?uint16")=> NDT.new("?uint64"),
+    NDT.new("?uint32")=> NDT.new("?uint64"),
+    NDT.new("?uint64")=> NDT.new("?uint64"),
+    NDT.new("?bfloat16") => NDT.new("?float64"),
+    NDT.new("?float16")  => NDT.new("?float64"),
+    NDT.new("?float32")  => NDT.new("?float64"),
+    NDT.new("?float64")  => NDT.new("?float64"),
+    NDT.new("?complex32")=> NDT.new("?complex128"),
+    NDT.new("?complex64")=> NDT.new("?complex128"),
+    NDT.new("?complex128")=> NDT.new("?complex128"),
+  }
+  
+  class << self
+    def reduce mod, meth, x, axes=0, dtype=nil
+      if dtype.nil?
+        dtype = MAXCAST[x.dtype]
+      end
+
+      reduce_cpu(mod, meth, x, axes, dtype)
+    end
+
+    def reduce_cpu mod, meth, x, axes, dtype
+      
+    end
+  end
+end

data/lib/gumath/version.rb

@@ -1,5 +1,5 @@
 class Gumath
-  VERSION = "0.2.0dev5"
+  VERSION = "0.2.0dev8"
 
-  COMMIT = '5725aa2bda2d9a9581e7adedda00e9f1dcaa881a'
+  COMMIT="360ed454105ac5615a7cb7d216ad25bc4181b876"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gumath
 version: !ruby/object:Gem::Version
-  version: 0.2.0dev5
+  version: 0.2.0dev8
 platform: ruby
 authors:
 - Sameer Deshmukh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-26 00:00:00.000000000 Z
+date: 2019-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -72,35 +72,36 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0dev5
+        version: 0.2.0dev8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0dev5
+        version: 0.2.0dev8
 - !ruby/object:Gem::Dependency
   name: xnd
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0dev5
+        version: 0.2.0dev8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0dev5
+        version: 0.2.0dev8
 description: 'Gumath is library for function dispatch to XND containers.
 
 '
 email:
 - sameer.deshmukh93@gmail.com
 executables: []
-extensions: []
+extensions:
+- ext/ruby_gumath/extconf.rb
 extra_rdoc_files: []
 files:
 - CONTRIBUTING.md
@@ -108,6 +109,9 @@ files:
 - History.md
 - README.md
 - Rakefile
+- ext/ruby_gumath/GPATH
+- ext/ruby_gumath/GRTAGS
+- ext/ruby_gumath/GTAGS
 - ext/ruby_gumath/examples.c
 - ext/ruby_gumath/extconf.rb
 - ext/ruby_gumath/functions.c
@@ -117,10 +121,14 @@ files:
 - ext/ruby_gumath/gumath/INSTALL.txt
 - ext/ruby_gumath/gumath/LICENSE.txt
 - ext/ruby_gumath/gumath/MANIFEST.in
+- ext/ruby_gumath/gumath/Makefile
 - ext/ruby_gumath/gumath/Makefile.in
 - ext/ruby_gumath/gumath/README.rst
 - ext/ruby_gumath/gumath/config.guess
+- ext/ruby_gumath/gumath/config.h
 - ext/ruby_gumath/gumath/config.h.in
+- ext/ruby_gumath/gumath/config.log
+- ext/ruby_gumath/gumath/config.status
 - ext/ruby_gumath/gumath/config.sub
 - ext/ruby_gumath/gumath/configure
 - ext/ruby_gumath/gumath/configure.ac
@@ -135,30 +143,75 @@ files:
 - ext/ruby_gumath/gumath/doc/libgumath/kernels.rst
 - ext/ruby_gumath/gumath/doc/releases/index.rst
 - ext/ruby_gumath/gumath/install-sh
+- ext/ruby_gumath/gumath/libgumath/Makefile
 - ext/ruby_gumath/gumath/libgumath/Makefile.in
 - ext/ruby_gumath/gumath/libgumath/Makefile.vc
 - ext/ruby_gumath/gumath/libgumath/apply.c
-- ext/ruby_gumath/gumath/libgumath/extending/bfloat16.c
+- ext/ruby_gumath/gumath/libgumath/apply.o
+- ext/ruby_gumath/gumath/libgumath/common.o
+- ext/ruby_gumath/gumath/libgumath/cpu_device_binary.o
+- ext/ruby_gumath/gumath/libgumath/cpu_device_unary.o
+- ext/ruby_gumath/gumath/libgumath/cpu_host_binary.o
+- ext/ruby_gumath/gumath/libgumath/cpu_host_unary.o
+- ext/ruby_gumath/gumath/libgumath/examples.o
 - ext/ruby_gumath/gumath/libgumath/extending/examples.c
 - ext/ruby_gumath/gumath/libgumath/extending/graph.c
 - ext/ruby_gumath/gumath/libgumath/extending/pdist.c
 - ext/ruby_gumath/gumath/libgumath/extending/quaternion.c
 - ext/ruby_gumath/gumath/libgumath/func.c
+- ext/ruby_gumath/gumath/libgumath/func.o
+- ext/ruby_gumath/gumath/libgumath/graph.o
 - ext/ruby_gumath/gumath/libgumath/gumath.h
-- ext/ruby_gumath/gumath/libgumath/kernels/binary.c
-- ext/ruby_gumath/gumath/libgumath/kernels/unary.c
+- ext/ruby_gumath/gumath/libgumath/kernels/common.c
+- ext/ruby_gumath/gumath/libgumath/kernels/common.h
+- ext/ruby_gumath/gumath/libgumath/kernels/contrib/bfloat16.h
+- ext/ruby_gumath/gumath/libgumath/kernels/cpu_device_binary.cc
+- ext/ruby_gumath/gumath/libgumath/kernels/cpu_device_binary.h
+- ext/ruby_gumath/gumath/libgumath/kernels/cpu_device_msvc.cc
+- ext/ruby_gumath/gumath/libgumath/kernels/cpu_device_unary.cc
+- ext/ruby_gumath/gumath/libgumath/kernels/cpu_device_unary.h
+- ext/ruby_gumath/gumath/libgumath/kernels/cpu_host_binary.c
+- ext/ruby_gumath/gumath/libgumath/kernels/cpu_host_unary.c
+- ext/ruby_gumath/gumath/libgumath/kernels/cuda_device_binary.cu
+- ext/ruby_gumath/gumath/libgumath/kernels/cuda_device_binary.h
+- ext/ruby_gumath/gumath/libgumath/kernels/cuda_device_unary.cu
+- ext/ruby_gumath/gumath/libgumath/kernels/cuda_device_unary.h
+- ext/ruby_gumath/gumath/libgumath/kernels/cuda_host_binary.c
+- ext/ruby_gumath/gumath/libgumath/kernels/cuda_host_unary.c
+- ext/ruby_gumath/gumath/libgumath/kernels/device.hh
+- ext/ruby_gumath/gumath/libgumath/libgumath.a
+- ext/ruby_gumath/gumath/libgumath/libgumath.so
+- ext/ruby_gumath/gumath/libgumath/libgumath.so.0
+- ext/ruby_gumath/gumath/libgumath/libgumath.so.0.2.0dev3
 - ext/ruby_gumath/gumath/libgumath/nploops.c
+- ext/ruby_gumath/gumath/libgumath/nploops.o
+- ext/ruby_gumath/gumath/libgumath/pdist.o
+- ext/ruby_gumath/gumath/libgumath/quaternion.o
 - ext/ruby_gumath/gumath/libgumath/tbl.c
+- ext/ruby_gumath/gumath/libgumath/tbl.o
 - ext/ruby_gumath/gumath/libgumath/thread.c
+- ext/ruby_gumath/gumath/libgumath/thread.o
 - ext/ruby_gumath/gumath/libgumath/xndloops.c
+- ext/ruby_gumath/gumath/libgumath/xndloops.o
 - ext/ruby_gumath/gumath/python/extending.py
 - ext/ruby_gumath/gumath/python/gumath/__init__.py
 - ext/ruby_gumath/gumath/python/gumath/_gumath.c
+- ext/ruby_gumath/gumath/python/gumath/cuda.c
 - ext/ruby_gumath/gumath/python/gumath/examples.c
 - ext/ruby_gumath/gumath/python/gumath/functions.c
+- ext/ruby_gumath/gumath/python/gumath/gumath.h
+- ext/ruby_gumath/gumath/python/gumath/libgumath.a
+- ext/ruby_gumath/gumath/python/gumath/libgumath.so
+- ext/ruby_gumath/gumath/python/gumath/libgumath.so.0
+- ext/ruby_gumath/gumath/python/gumath/libgumath.so.0.2.0dev3
 - ext/ruby_gumath/gumath/python/gumath/pygumath.h
+- ext/ruby_gumath/gumath/python/gumath_aux.py
+- ext/ruby_gumath/gumath/python/randdec.py
+- ext/ruby_gumath/gumath/python/randfloat.py
 - ext/ruby_gumath/gumath/python/test_gumath.py
+- ext/ruby_gumath/gumath/python/test_xndarray.py
 - ext/ruby_gumath/gumath/setup.py
+- ext/ruby_gumath/gumath/tools/detect_cuda_arch.cc
 - ext/ruby_gumath/gumath/vcbuild/INSTALL.txt
 - ext/ruby_gumath/gumath/vcbuild/vcbuild32.bat
 - ext/ruby_gumath/gumath/vcbuild/vcbuild64.bat

data/ext/ruby_gumath/gumath/libgumath/extending/bfloat16.c

@@ -1,130 +0,0 @@
-/*
-* BSD 3-Clause License
-*
-* Copyright (c) 2017-2018, plures
-* All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*
-* 1. Redistributions of source code must retain the above copyright notice,
-*    this list of conditions and the following disclaimer.
-*
-* 2. Redistributions in binary form must reproduce the above copyright notice,
-*    this list of conditions and the following disclaimer in the documentation
-*    and/or other materials provided with the distribution.
-*
-* 3. Neither the name of the copyright holder nor the names of its
-*    contributors may be used to endorse or promote products derived from
-*    this software without specific prior written permission.
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <math.h>
-#include <complex.h>
-#include <inttypes.h>
-#include "ndtypes.h"
-#include "xnd.h"
-#include "gumath.h"
-
-
-/* Avoid Python.h dependency. */
-struct _object;
-double PyFloat_AsDouble(const struct _object *);
-struct _object *PyFloat_FromDouble (double v);
-struct _object *PyErr_Occurred(void);
-
-
-/*****************************************************************************/
-/*                Initialize a single bfloat16 from a PyObject               */
-/*****************************************************************************/
-
-/* XXX Maybe rename "init", "repr" to "from_object", "to_object". */
-static bool
-bfloat16_init(void *dest, const void *src, ndt_context_t *ctx)
-{
-    const struct _object *v = (const struct _object *)src;
-    xnd_t *x = (xnd_t *)dest;
-    const ndt_t *t = x->type;
-    float f;
-    (void)ctx;
-
-    f = (float)PyFloat_AsDouble(v);
-    if (f == -1 && PyErr_Occurred()) {
-        return 0;
-    }
-
-    const char *cp = ndt_is_big_endian(t) ? (char *)&f : ((char *)&f)+2;
-    memcpy(x->ptr, cp, sizeof(uint16_t));
-    return 1;
-}
-
-static void *
-bfloat16_repr(const void *src, ndt_context_t *ctx)
-{
-    const xnd_t *x = (const xnd_t *)src;
-    const ndt_t *t = x->type;
-    float f = 0;
-    (void)ctx;
-
-    char *cp = ndt_is_big_endian(t) ? (char *)&f : ((char *)&f)+2;
-    memcpy(cp, x->ptr, sizeof(uint16_t));
-
-    return PyFloat_FromDouble(f);
-}
-
-
-static const ndt_methods_t bfloat16_methods = {
-  .init = bfloat16_init,
-  .constraint = NULL,
-  .repr = bfloat16_repr,
-};
-
-static const gm_typedef_init_t typedefs[] = {
-  { .name = "bfloat16", .type = "uint16", .meth=&bfloat16_methods },
-  { .name = NULL, .type = NULL, .meth=NULL }
-};
-
-static const gm_kernel_init_t kernels[] = {
-  { .name = NULL, .sig = NULL }
-};
-
-
-/****************************************************************************/
-/*                       Initialize kernel table                            */
-/****************************************************************************/
-
-int
-gm_init_bfloat16_kernels(gm_tbl_t *tbl, ndt_context_t *ctx)
-{
-    const gm_typedef_init_t *t;
-    const gm_kernel_init_t *k;
-
-    for (t = typedefs; t->name != NULL; t++) {
-        if (ndt_typedef_from_string(t->name, t->type, t->meth, ctx) < 0) {
-            return -1;
-        }
-    }
-
-    for (k = kernels; k->name != NULL; k++) {
-        if (gm_add_kernel(tbl, k, ctx) < 0) {
-            return -1;
-        }
-    }
-
-    return 0;
-}