kmat 0.0.3 → 0.1.0

data/ext/kmat/arith/math.c

@@ -21,7 +21,7 @@ kmm_MATH_log1p(VALUE self, VALUE x)
 VALUE
 kmm_float_sign(VALUE self)
 {
-	double x = NUM2DBL(self);
+	const double x = NUM2DBL(self);
 	if ( x == 0.0 ) {
 		return INT2NUM(0);
 	} else if ( x > 0.0 ) {

data/ext/kmat/arith/statistics.c

@@ -71,61 +71,61 @@ km_sum_all_v(VALUE *ent, void *data)
 	*ret = rb_funcall(*ret, id_op_plus, 1, *ent);
 }
 void
-km_sum_col_d(double *ent, int i, int j, void *data)
+km_sum_col_d(double *ent, size_t i, size_t j, void *data)
 {
 	double *r = (double *)data;
 	r[j] += *ent;
 }
 void
-km_sum_col_z(COMPLEX *ent, int i, int j, void *data)
+km_sum_col_z(COMPLEX *ent, size_t i, size_t j, void *data)
 {
 	COMPLEX *r = (COMPLEX *)data;
 	r[j] += *ent;
 }
 void
-km_sum_col_i(int *ent, int i, int j, void *data)
+km_sum_col_i(int *ent, size_t i, size_t j, void *data)
 {
 	int *r = (int *)data;
 	r[j] += *ent;
 }
 void
-km_sum_col_b(bool *ent, int i, int j, void *data)
+km_sum_col_b(bool *ent, size_t i, size_t j, void *data)
 {
 	bool *r = (bool *)data;
 	r[j] = XOR(r[j], *ent);
 }
 void
-km_sum_col_v(VALUE *ent, int i, int j, void *data)
+km_sum_col_v(VALUE *ent, size_t i, size_t j, void *data)
 {
 	VALUE *r = (VALUE *)data;
 	r[j] = rb_funcall(r[j], id_op_plus, 1, *ent);
 }
 void
-km_sum_row_d(double *ent, int i, int j, void *data)
+km_sum_row_d(double *ent, size_t i, size_t j, void *data)
 {
 	double *r = (double *)data;
 	r[i] += *ent;
 }
 void
-km_sum_row_z(COMPLEX *ent, int i, int j, void *data)
+km_sum_row_z(COMPLEX *ent, size_t i, size_t j, void *data)
 {
 	COMPLEX *r = (COMPLEX *)data;
 	r[i] += *ent;
 }
 void
-km_sum_row_i(int *ent, int i, int j, void *data)
+km_sum_row_i(int *ent, size_t i, size_t j, void *data)
 {
 	int *r = (int *)data;
 	r[i] += *ent;
 }
 void
-km_sum_row_b(bool *ent, int i, int j, void *data)
+km_sum_row_b(bool *ent, size_t i, size_t j, void *data)
 {
 	bool *r = (bool *)data;
 	r[i] = XOR(r[i], *ent);
 }
 void
-km_sum_row_v(VALUE *ent, int i, int j, void *data)
+km_sum_row_v(VALUE *ent, size_t i, size_t j, void *data)
 {
 	VALUE *r = (VALUE *)data;
 	r[i] = rb_funcall(r[i], id_op_plus, 1, *ent);
@@ -167,7 +167,7 @@ kmm_mat__sum(VALUE self, VALUE dest)
 	} else if ( SAME_SIZE(sr, sa) ) {
 		km_smat_copy(sr, sa);
 	} else {
-		rb_raise(km_eDim, "sum from size (%d, %d) to size (%d, %d) is not defined", sa->m, sa->n, sr->m, sr->n);
+		rb_raise(km_eDim, "sum from size (%zu, %zu) to size (%zu, %zu) is not defined", sa->m, sa->n, sr->m, sr->n);
 	}
 	return dest;
 }

data/ext/kmat/arith/unary.c

@@ -123,28 +123,28 @@ VALUE
 kmm_mat_trace(VALUE self)
 {
 	SMAT *smat = km_mat2smat(self);
-	int len = MIN(smat->m, smat->n);
+	const size_t len = MIN(smat->m, smat->n);
 	if ( smat->vtype == VT_DOUBLE ) {
 		double ret = 0.0;
-		for ( int i=0; i<len; i++ ) {
+		for ( size_t i=0; i<len; i++ ) {
 			ret += ENTITY(smat, d, i, i);
 		}
 		return rb_float_new(ret);
 	} else if ( smat->vtype == VT_COMPLEX ) {
 		COMPLEX ret = cpack(0.0, 0.0);
-		for ( int i=0; i<len; i++ ) {
+		for ( size_t i=0; i<len; i++ ) {
 			ret += ENTITY(smat, z, i, i);
 		}
 		return km_c2v(ret);
 	} else if ( smat->vtype == VT_INT ) {
 		int ret = 0;
-		for ( int i=0; i<len; i++ ) {
+		for ( size_t i=0; i<len; i++ ) {
 			ret += ENTITY(smat, i, i, i);
 		}
 		return INT2NUM(ret);
 	} else if ( smat->vtype == VT_BOOL ) {
 		bool ret = false;
-		for ( int i=0; i<len; i++ ) {
+		for ( size_t i=0; i<len; i++ ) {
 			bool ent = ENTITY(smat, b, i, i);
 			ret = XOR(ret, ent);
 		}
@@ -154,7 +154,7 @@ kmm_mat_trace(VALUE self)
 			return INT2NUM(0);
 		} else {
 			VALUE ret = ENTITY(smat, v, 0, 0);
-			for ( int i=1; i<len; i++ ) {
+			for ( size_t i=1; i<len; i++ ) {
 				ret = rb_funcall(ret, id_op_plus, 1, ENTITY(smat, v, i, i));
 			}
 			return ret;

data/ext/kmat/extconf.rb

@@ -48,6 +48,9 @@ File.open('./__Makefile__temp__', 'w') do |f|
 		else
 			line.sub!(/^debugflags.+/, 'debugflags =')
 		end
+		line.gsub!(/\-I\$\(hdrdir\)/, '-isystem$(hdrdir)')
+		line.gsub!(/\-I\$\(arch\_hdrdir\)/, '-isystem$(arch_hdrdir)')
+		line.gsub!(/\-I\//, '-isystem/')
 		f.puts line
 	end
 end

data/ext/kmat/km_util.h

@@ -1,9 +1,27 @@
 static inline size_t
-int2size_t(int i)
+i2s(int i)
 {
 	return (size_t)i;
 }
 
+static inline int
+s2i(size_t s)
+{
+	return (int)s;
+}
+
+static inline long
+s2l(size_t s)
+{
+	return (long)s;
+}
+
+static inline size_t
+l2s(long l)
+{
+	return (size_t)l;
+}
+
 static inline void
 km_check_frozen(VALUE obj)
 {
@@ -21,11 +39,9 @@ km_infect_frozen(VALUE src, VALUE dest)
 }
 
 static inline void
-km_check_positive(int m, int n)
+km_check_size2(size_t m, size_t n)
 {
-	if ( m < 0 || n < 0 ) {
-		rb_raise(km_eDim, "matrix size must not be negative");
-	} else if ( ((long long)m)*((long long)n) != (long long)(m*n) ) {
+	if ( ((long long)m)*((long long)n) != (long long)(m*n) ) {
 		rb_raise(km_eDim, "matrix length must be within int range");
 	}
 }
@@ -37,21 +53,26 @@ km_check_positive(int m, int n)
 #define SAME(a, b) ( (a) == (b) )
 #define XOR(p, q) ( ( (p)&&(!(q)) ) || ( (!(p))&&(q) ) )
 
-#define KALLOC(val, n) val = ruby_xcalloc(int2size_t(n), sizeof(*(val)))
+#define ZU2NUM(n) ULONG2NUM(n)
+#define NUM2ZU(x) NUM2ULONG(x)
+
+#define KALLOCs(val, n) val = ruby_xcalloc(n, sizeof(*(val)))
+#define KALLOC(val, n) val = ruby_xcalloc(i2s(n), sizeof(*(val)))
 #define KALLOCc(work, smat) work = km_alloc_and_copy(smat)
 #define KALLOCn(work, smat) km_alloc_and_copy_if_needed(smat, &(work))
 #define KALLOCz(work, smat) km_alloc_if_needed_and_0clear(smat, &(work))
 
 #define INDEX(smat, i, j) ( (smat)->trans ? ((j)+(i)*(smat)->ld) : ((i)+(j)*(smat)->ld) )
+#define INDEXi(smat, i, j) s2i( (smat)->trans ? ((j)+(i)*(smat)->ld) : ((i)+(j)*(smat)->ld) )
 #define ENTITYd0(smat, id, idx) ( ((smat)->id##body)[idx] )
 #define ENTITYr0(smat, id, idx) ( *( ((smat)->id##pbody)[idx] ) )
 #define ENTITY(smat, id, i, j) ( ( (smat)->stype==ST_RSUB ) ? ENTITYr0(smat, id, INDEX(smat, i, j)) : ENTITYd0(smat, id, INDEX(smat, i, j)) )
 
+#define LENGTHi(smat) s2i( (smat)->m*(smat)->n )
 #define LENGTH(smat) ( (smat)->m*(smat)->n )
-#define LENGTHs(smat) int2size_t( (smat)->m*(smat)->n )
 #define VECTOR_P(smat) ( (smat)->m==1 || (smat)->n==1 )
 #define SAME_SIZE(sa, sb) ( ( (sa)->m==(sb)->m ) && ( (sa)->n==(sb)->n ) )
-#define CHECK_SAME_SIZE(sa, sb) do { if ( !SAME_SIZE(sa, sb) ) { rb_raise(km_eDim, "sizes must be the same, (%d, %d) != (%d, %d)", (sa)->m, (sa)->n, (sb)->m, (sb)->n); } } while (0)
+#define CHECK_SAME_SIZE(sa, sb) do { if ( !SAME_SIZE(sa, sb) ) { rb_raise(km_eDim, "sizes must be the same, (%zu, %zu) != (%zu, %zu)", (sa)->m, (sa)->n, (sb)->m, (sb)->n); } } while (0)
 
 #define VT_SWITCH(vt_, dstate, zstate, istate, bstate, vstate) do { \
 	VTYPE __vt__ = (vt_); \
@@ -69,11 +90,11 @@ void km_smat_each_z(SMAT *smat, void (*func)(COMPLEX *, void *), void *data);
 void km_smat_each_i(SMAT *smat, void (*func)(int *, void *), void *data);
 void km_smat_each_b(SMAT *smat, void (*func)(bool *, void *), void *data);
 void km_smat_each_v(SMAT *smat, void (*func)(VALUE *, void *), void *data);
-void km_smat_each_with_index_d(SMAT *smat, void (*func)(double *, int, int, void *), void *data);
-void km_smat_each_with_index_z(SMAT *smat, void (*func)(COMPLEX *, int, int, void *), void *data);
-void km_smat_each_with_index_i(SMAT *smat, void (*func)(int *, int, int, void *), void *data);
-void km_smat_each_with_index_b(SMAT *smat, void (*func)(bool *, int, int, void *), void *data);
-void km_smat_each_with_index_v(SMAT *smat, void (*func)(VALUE *, int, int, void *), void *data);
+void km_smat_each_with_index_d(SMAT *smat, void (*func)(double *, size_t, size_t, void *), void *data);
+void km_smat_each_with_index_z(SMAT *smat, void (*func)(COMPLEX *, size_t, size_t, void *), void *data);
+void km_smat_each_with_index_i(SMAT *smat, void (*func)(int *, size_t, size_t, void *), void *data);
+void km_smat_each_with_index_b(SMAT *smat, void (*func)(bool *, size_t, size_t, void *), void *data);
+void km_smat_each_with_index_v(SMAT *smat, void (*func)(VALUE *, size_t, size_t, void *), void *data);
 void km_smat_each2_d(SMAT *sa, SMAT *sb, void (*func)(double *, double *, void *), void *data);
 void km_smat_each2_z(SMAT *sa, SMAT *sb, void (*func)(COMPLEX *, COMPLEX *, void *), void *data);
 void km_smat_each2_i(SMAT *sa, SMAT *sb, void (*func)(int *, int *, void *), void *data);

data/ext/kmat/kmat.h

@@ -12,7 +12,7 @@
 #include "lapack_headers/lapacke_utils.h"
 
 #ifndef M_PI
-  #define M_PI 3.14159265358979323846
+#  define M_PI 3.14159265358979323846
 #endif
 #define M_2PI 6.28318530717958647692
 #define COMPLEX double _Complex
@@ -57,7 +57,7 @@ typedef struct {
 		bool **bpbody;
 		VALUE **vpbody;
 	};
-	int ld, m, n;
+	size_t ld, m, n;
 	VTYPE vtype;
 	STYPE stype;
 	bool trans, may_have_sub;
@@ -79,7 +79,7 @@ typedef struct {
 		bool *b;
 		VALUE *v;
 	};
-	int ld;
+	size_t ld;
 	bool need_to_free;
 } LAWORK;