ndtypes 0.2.0dev5 → 0.2.0dev6

data/ext/ruby_ndtypes/ndtypes/libndtypes/serialize/serialize.c

@@ -231,17 +231,35 @@ static int64_t
 write_var_dim(char * const ptr, int64_t offset, const ndt_t * const t,
               bool *overflow)
 {
-    const int32_t noffsets = t->Concrete.VarDim.noffsets;
+    const ndt_offsets_t *offsets = t->Concrete.VarDim.offsets;
+    const int32_t noffsets = offsets ? offsets->n : 0;
+    const int32_t *offset_array = offsets ? offsets->v : NULL;
     const int32_t nslices = t->Concrete.VarDim.nslices;
 
     offset = write_int64(ptr, offset, t->Concrete.VarDim.itemsize, overflow);
     offset = write_int32(ptr, offset, noffsets, overflow);
     offset = write_int32(ptr, offset, t->Concrete.VarDim.nslices, overflow);
-    offset = write_int32_array(ptr, offset, t->Concrete.VarDim.offsets, noffsets, overflow);
+    offset = write_int32_array(ptr, offset, offset_array, noffsets, overflow);
     offset = write_ndt_slice_array(ptr, offset, t->Concrete.VarDim.slices, nslices, overflow);
     return write_type(ptr, offset, t->VarDim.type, overflow);
 }
 
+static int64_t
+write_var_dim_elem(char * const ptr, int64_t offset, const ndt_t * const t,
+                   bool *overflow)
+{
+    offset = write_int64(ptr, offset, t->VarDimElem.index, overflow);
+    return write_var_dim(ptr, offset, t, overflow);
+}
+
+static int64_t
+write_array(char * const ptr, int64_t offset, const ndt_t * const t,
+            bool *overflow)
+{
+    offset = write_int64(ptr, offset, t->Array.itemsize, overflow);
+    return write_type(ptr, offset, t->Array.type, overflow);
+}
+
 static int64_t
 write_tuple(char * const ptr, int64_t offset, const ndt_t * const t,
             bool *overflow)
@@ -291,6 +309,27 @@ write_record(char * const ptr, int64_t offset, const ndt_t * const t,
     return offset;
 }
 
+static int64_t
+write_union(char * const ptr, int64_t offset, const ndt_t * const t,
+            bool *overflow)
+{
+    const int64_t ntags = t->Union.ntags;
+    int64_t metaoffset;
+
+    offset = write_int64(ptr, offset, ntags, overflow);
+    offset = write_string_array(ptr, offset, t->Union.tags, ntags, overflow);
+
+    metaoffset = offset;
+    offset = alloc_int64_array(offset, ntags, overflow);
+
+    for (int64_t i = 0; i < ntags; i++) {
+        metaoffset = write_int64(ptr, metaoffset, offset, overflow); 
+        offset = write_type(ptr, offset, t->Union.types[i], overflow);
+    }
+
+    return offset;
+}
+
 static int64_t
 write_ref(char * const ptr, int64_t offset, const ndt_t * const t,
           bool *overflow)
@@ -376,8 +415,11 @@ write_type(char * const ptr, int64_t offset, const ndt_t * const t,
     case SymbolicDim: return write_symbolic_dim(ptr, offset, t, overflow);
     case EllipsisDim: return write_ellipsis_dim(ptr, offset, t, overflow);
     case VarDim: return write_var_dim(ptr, offset, t, overflow);
+    case VarDimElem: return write_var_dim_elem(ptr, offset, t, overflow);
+    case Array: return write_array(ptr, offset, t, overflow);
     case Tuple: return write_tuple(ptr, offset, t, overflow);
     case Record: return write_record(ptr, offset, t, overflow);
+    case Union: return write_union(ptr, offset, t, overflow);
     case Ref: return write_ref(ptr, offset, t, overflow);
     case Constr: return write_constr(ptr, offset, t, overflow);
     case Nominal: return write_nominal(ptr, offset, t, overflow);
@@ -391,8 +433,8 @@ write_type(char * const ptr, int64_t offset, const ndt_t * const t,
     case Bool:
     case Int8: case Int16: case Int32: case Int64:
     case Uint8: case Uint16: case Uint32: case Uint64:
-    case Float16: case Float32: case Float64:
-    case Complex32: case Complex64: case Complex128:
+    case BFloat16: case Float16: case Float32: case Float64:
+    case BComplex32: case Complex32: case Complex64: case Complex128:
     case String:
 
     case AnyKind:

data/ext/ruby_ndtypes/ndtypes/libndtypes/substitute.c

@@ -44,11 +44,11 @@
 #include "substitute.h"
 
 
-static ndt_t *
+static const ndt_t *
 substitute_named_ellipsis(const ndt_t *t, const symtable_t *tbl, ndt_context_t *ctx)
 {
     symtable_entry_t v;
-    ndt_t *u;
+    const ndt_t *u;
     int i;
 
     assert(t->tag == EllipsisDim && t->EllipsisDim.name != NULL);
@@ -67,7 +67,8 @@ substitute_named_ellipsis(const ndt_t *t, const symtable_t *tbl, ndt_context_t *
             assert(ndt_is_concrete(w));
             assert(w->tag == FixedDim);
 
-            u = ndt_fixed_dim(u, w->FixedDim.shape, INT64_MAX, ctx);
+            const ndt_t *x = ndt_fixed_dim(u, w->FixedDim.shape, INT64_MAX, ctx);
+            ndt_move(&u, x);
             if (u == NULL) {
                 return NULL;
             }
@@ -81,25 +82,44 @@ substitute_named_ellipsis(const ndt_t *t, const symtable_t *tbl, ndt_context_t *
         }
         else {
             const ndt_t *w = v.VarSeq.dims[0];
-            return ndt_copy_contiguous_dtype(w, u, ctx);
+            const ndt_t *x = ndt_copy_contiguous_dtype(w, u, v.VarSeq.linear_index, ctx);
+            ndt_decref(u);
+            return x;
         }
     }
+    case ArraySeq: {
+        for (i = v.ArraySeq.size-1; i >= 0; i--) {
+            const ndt_t *w = v.ArraySeq.dims[i];
+            assert(ndt_is_concrete(w));
+            assert(w->tag == Array);
+
+            const ndt_t *x = ndt_array(u, false, ctx);
+            ndt_move(&u, x);
+            if (u == NULL) {
+                return NULL;
+            }
+        }
+
+        return u;
+    }
     default:
         ndt_err_format(ctx, NDT_ValueError,
             "variable not found or has incorrect type");
-        ndt_del(u);
+        ndt_decref(u);
         return NULL;
     }
 }
 
-ndt_t *
+const ndt_t *
 ndt_substitute(const ndt_t *t, const symtable_t *tbl, const bool req_concrete,
                ndt_context_t *ctx)
 {
-    ndt_t *u;
+    bool opt = ndt_is_optional(t);
+    const ndt_t *u, *w;
 
     if (ndt_is_concrete(t)) {
-        return ndt_copy(t, ctx);
+        ndt_incref(t);
+        return t;
     }
 
     switch (t->tag) {
@@ -109,8 +129,10 @@ ndt_substitute(const ndt_t *t, const symtable_t *tbl, const bool req_concrete,
             return NULL;
         }
 
-        return ndt_fixed_dim(u, t->FixedDim.shape, t->Concrete.FixedDim.step,
-                             ctx);
+        w = ndt_fixed_dim(u, t->FixedDim.shape, t->Concrete.FixedDim.step,
+                          ctx);
+        ndt_decref(u);
+        return w;
     }
 
     case VarDim: {
@@ -119,7 +141,9 @@ ndt_substitute(const ndt_t *t, const symtable_t *tbl, const bool req_concrete,
             return NULL;
         }
 
-        return ndt_copy_abstract_var_dtype(t, u, ctx);
+        w = ndt_copy_abstract_var_dtype(t, u, ctx);
+        ndt_decref(u);
+        return w;
     }
 
     case SymbolicDim: {
@@ -131,21 +155,25 @@ ndt_substitute(const ndt_t *t, const symtable_t *tbl, const bool req_concrete,
         const int64_t shape = symtable_find_shape(tbl, t->SymbolicDim.name, ctx);
         if (shape < 0) {
             if (req_concrete) {
-                ndt_del(u);
+                ndt_decref(u);
                 return NULL;
             }
             else {
                 ndt_err_clear(ctx);
                 char *name = ndt_strdup(t->SymbolicDim.name, ctx);
                 if (name == NULL) {
-                    ndt_del(u);
+                    ndt_decref(u);
                     return NULL;
                 }
-                return ndt_symbolic_dim(name, u, ctx);
+                w = ndt_symbolic_dim(name, u, ctx);
+                ndt_decref(u);
+                return w;
             }
         }
 
-        return ndt_fixed_dim(u, shape, INT64_MAX, ctx);
+        w = ndt_fixed_dim(u, shape, INT64_MAX, ctx);
+        ndt_decref(u);
+        return w;
     }
 
     case EllipsisDim: {
@@ -188,7 +216,9 @@ ndt_substitute(const ndt_t *t, const symtable_t *tbl, const bool req_concrete,
             return NULL;
         }
 
-        return ndt_constr(name, u, ctx);
+        w = ndt_constr(name, u, opt, ctx);
+        ndt_decref(u);
+        return w;
     }
 
     case Nominal: {
@@ -203,31 +233,32 @@ ndt_substitute(const ndt_t *t, const symtable_t *tbl, const bool req_concrete,
             return NULL;
         }
 
-        return ndt_nominal(name, u, ctx);
+        w = ndt_nominal(name, u, opt, ctx);
+        ndt_decref(u);
+        return w;
     }
 
-    case Ref:
+    case Ref: {
         u = ndt_substitute(t->Ref.type, tbl, req_concrete, ctx);
         if (u == NULL) {
             return NULL;
         }
 
-        return ndt_ref(u, ctx);
+        w = ndt_ref(u, opt, ctx);
+        ndt_decref(u);
+        return w;
+    }
 
     case Bool:
     case Int8: case Int16: case Int32: case Int64:
     case Uint8: case Uint16: case Uint32: case Uint64:
-    case Float16: case Float32: case Float64:
-    case Complex32: case Complex64: case Complex128:
+    case BFloat16: case Float16: case Float32: case Float64:
+    case BComplex32: case Complex32: case Complex64: case Complex128:
     case FixedString: case FixedBytes:
     case String: case Bytes:
     case Char: {
-        u = ndt_new(t->tag, ctx);
-        if (u == NULL) {
-            return NULL;
-        }
-        *u = *t;
-        return u;
+        ndt_incref(t);
+        return t;
     }
 
     default:

data/ext/ruby_ndtypes/ndtypes/libndtypes/substitute.h

@@ -41,7 +41,7 @@
 /* LOCAL SCOPE */
 NDT_PRAGMA(NDT_HIDE_SYMBOLS_START)
 
-ndt_t *ndt_substitute(const ndt_t *t, const symtable_t *tbl, const bool req_concrete, ndt_context_t *ctx);
+const ndt_t *ndt_substitute(const ndt_t *t, const symtable_t *tbl, const bool req_concrete, ndt_context_t *ctx);
 
 /* END LOCAL SCOPE */
 NDT_PRAGMA(NDT_HIDE_SYMBOLS_END)

data/ext/ruby_ndtypes/ndtypes/libndtypes/symtable.c

@@ -106,7 +106,7 @@ typedef_trie_del(typedef_trie_t *t)
         return;
     }
 
-    ndt_del((ndt_t *)t->def.type);
+    ndt_decref(t->def.type);
 
     for (i = 0; i < ALPHABET_LEN; i++) {
         typedef_trie_del(t->next[i]);
@@ -116,7 +116,7 @@ typedef_trie_del(typedef_trie_t *t)
 }
 
 int
-ndt_typedef_add(const char *key, ndt_t *type, const ndt_methods_t *m, ndt_context_t *ctx)
+ndt_typedef_add(const char *key, const ndt_t *type, const ndt_methods_t *m, ndt_context_t *ctx)
 {
     typedef_trie_t *t = typedef_map;
     const unsigned char *cp;
@@ -127,14 +127,12 @@ ndt_typedef_add(const char *key, ndt_t *type, const ndt_methods_t *m, ndt_contex
         if (i == UCHAR_MAX) {
             ndt_err_format(ctx, NDT_ValueError,
                            "invalid character in typedef: '%c'", *cp);
-            ndt_del(type);
             return -1;
         }
 
         if (t->next[i] == NULL) {
             typedef_trie_t *u = typedef_trie_new(ctx);
             if (u == NULL) {
-                ndt_del(type);
                 return -1;
             }
             t->next[i] = u;
@@ -147,10 +145,10 @@ ndt_typedef_add(const char *key, ndt_t *type, const ndt_methods_t *m, ndt_contex
 
     if (t->def.type) {
         ndt_err_format(ctx, NDT_ValueError, "duplicate typedef '%s'", key);
-        ndt_del(type);
         return -1;
     }
 
+    ndt_incref(type);
     t->def.type = type;
 
     if (m != NULL) {

data/ext/ruby_ndtypes/ndtypes/libndtypes/symtable.h

@@ -46,13 +46,20 @@ enum symtable_entry {
   Type,
   BroadcastSeq,
   FixedSeq,
-  VarSeq
+  VarSeq,
+  ArraySeq
 };
 
 typedef struct {
     int size;
     const ndt_t *dims[NDT_MAX_DIM];
-} dim_list_t;
+} fixed_list_t;
+
+typedef struct {
+    int size;
+    int64_t linear_index;
+    const ndt_t *dims[NDT_MAX_DIM];
+} var_list_t;
 
 typedef struct {
     int size;
@@ -66,8 +73,9 @@ typedef struct {
     const char *Symbol;
     const ndt_t *Type;
     broadcast_list_t BroadcastSeq;
-    dim_list_t FixedSeq;
-    dim_list_t VarSeq;
+    fixed_list_t FixedSeq;
+    var_list_t VarSeq;
+    fixed_list_t ArraySeq;
   };
 } symtable_entry_t;
 

data/ext/ruby_ndtypes/ndtypes/libndtypes/tests/Makefile

@@ -0,0 +1,55 @@
+
+SRCDIR = ..
+
+CC = gcc
+
+LIBSTATIC = libndtypes.a
+LIBSHARED = libndtypes.so.0.2.0dev3
+
+CONFIGURE_CFLAGS = -I.. -Wall -Wextra -std=c11 -pedantic -O2 -g
+NDT_CFLAGS = $(strip $(CONFIGURE_CFLAGS) $(CFLAGS))
+
+CONFIGURE_COV_CFLAGS = -I.. -Wall -Wextra -std=c11 -pedantic -O0 -g -fno-inline -fprofile-arcs -ftest-coverage
+CONFIGURE_COV_LDFLAGS = -shared -Wl,-soname,libndtypes.so.0 -fprofile-arcs
+ifeq ($(MAKECMDGOALS), coverage)
+  NDT_CFLAGS = $(strip $(CONFIGURE_COV_CFLAGS) $(CFLAGS))
+  NDT_LDFLAGS = $(strip $(CONFIGURE_COV_LDFLAGS) $(LDFLAGS))
+endif
+
+
+default: runtest runtest_shared
+
+coverage: runtest runtest_shared
+
+
+runtest:\
+Makefile runtest.c alloc_fail.c test_parse.c test_parse_error.c test_parse_roundtrip.c \
+test_indent.c test_typecheck.c test_numba.c test_typedef.c test_match.c test_unify.c \
+test_record.c test_buffer.c test.h alloc_fail.h \
+$(SRCDIR)/ndtypes.h $(SRCDIR)/$(LIBSTATIC)
+	$(CC) -DTEST_ALLOC $(NDT_CFLAGS) -o runtest runtest.c \
+            alloc_fail.c test_parse.c test_parse_error.c test_parse_roundtrip.c \
+            test_indent.c test_typedef.c test_match.c test_unify.c test_typecheck.c \
+            test_numba.c test_record.c test_array.c test_buffer.c $(SRCDIR)/$(LIBSTATIC)
+
+runtest_shared:\
+Makefile runtest.c alloc_fail.c test_parse.c test_parse_error.c test_parse_roundtrip.c \
+test_indent.c test_typecheck.c test_numba.c test_typedef.c test_match.c test_unify.c \
+test_record.c test_buffer.c test.h alloc_fail.h \
+$(SRCDIR)/ndtypes.h $(SRCDIR)/$(LIBSHARED)
+	$(CC) -L$(SRCDIR) -DTEST_ALLOC $(NDT_CFLAGS) -o runtest_shared runtest.c \
+            alloc_fail.c test_parse.c test_parse_error.c test_parse_roundtrip.c \
+            test_indent.c test_typedef.c test_match.c test_unify.c test_typecheck.c \
+            test_numba.c test_record.c test_array.c test_buffer.c -lndtypes
+
+
+FORCE:
+
+clean: FORCE
+	rm -f *.o *.gch *.gcda *.gcno *.gcov *.dyn *.dpi *.lock
+	rm -f runtest runtest_shared
+
+distclean: clean
+	rm -rf Makefile
+
+

data/ext/ruby_ndtypes/ndtypes/libndtypes/tests/Makefile.in

@@ -24,23 +24,23 @@ coverage: runtest runtest_shared
 
 runtest:\
 Makefile runtest.c alloc_fail.c test_parse.c test_parse_error.c test_parse_roundtrip.c \
-test_indent.c test_typecheck.c test_numba.c test_typedef.c test_match.c test_record.c \
-test_buffer.c test.h alloc_fail.h \
+test_indent.c test_typecheck.c test_numba.c test_typedef.c test_match.c test_unify.c \
+test_record.c test_buffer.c test.h alloc_fail.h \
 $(SRCDIR)/ndtypes.h $(SRCDIR)/$(LIBSTATIC)
 	$(CC) -DTEST_ALLOC $(NDT_CFLAGS) -o runtest runtest.c \
             alloc_fail.c test_parse.c test_parse_error.c test_parse_roundtrip.c \
-            test_indent.c test_typedef.c test_match.c test_typecheck.c test_numba.c \
-            test_record.c test_array.c test_buffer.c $(SRCDIR)/$(LIBSTATIC)
+            test_indent.c test_typedef.c test_match.c test_unify.c test_typecheck.c \
+            test_numba.c test_record.c test_array.c test_buffer.c $(SRCDIR)/$(LIBSTATIC)
 
 runtest_shared:\
 Makefile runtest.c alloc_fail.c test_parse.c test_parse_error.c test_parse_roundtrip.c \
-test_indent.c test_typecheck.c test_numba.c test_typedef.c test_match.c test_record.c \
-test_buffer.c test.h alloc_fail.h \
+test_indent.c test_typecheck.c test_numba.c test_typedef.c test_match.c test_unify.c \
+test_record.c test_buffer.c test.h alloc_fail.h \
 $(SRCDIR)/ndtypes.h $(SRCDIR)/$(LIBSHARED)
 	$(CC) -L$(SRCDIR) -DTEST_ALLOC $(NDT_CFLAGS) -o runtest_shared runtest.c \
             alloc_fail.c test_parse.c test_parse_error.c test_parse_roundtrip.c \
-            test_indent.c test_typedef.c test_match.c test_typecheck.c test_numba.c \
-            test_record.c test_array.c test_buffer.c -lndtypes
+            test_indent.c test_typedef.c test_match.c test_unify.c test_typecheck.c \
+            test_numba.c test_record.c test_array.c test_buffer.c -lndtypes
 
 
 FORCE: