numo-narray-alt 0.9.4 → 0.9.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (43) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +9 -3
  3. data/Rakefile +8 -0
  4. data/ext/numo/narray/SFMT-params19937.h +16 -12
  5. data/ext/numo/narray/SFMT.c +12 -5
  6. data/ext/numo/narray/array.c +25 -19
  7. data/ext/numo/narray/data.c +74 -70
  8. data/ext/numo/narray/extconf.rb +1 -0
  9. data/ext/numo/narray/index.c +49 -26
  10. data/ext/numo/narray/kwargs.c +11 -9
  11. data/ext/numo/narray/math.c +4 -2
  12. data/ext/numo/narray/narray.c +17 -10
  13. data/ext/numo/narray/ndloop.c +52 -63
  14. data/ext/numo/narray/numo/intern.h +9 -3
  15. data/ext/numo/narray/numo/narray.h +20 -20
  16. data/ext/numo/narray/numo/ndloop.h +1 -1
  17. data/ext/numo/narray/numo/template.h +85 -81
  18. data/ext/numo/narray/numo/types/complex.h +7 -3
  19. data/ext/numo/narray/numo/types/complex_macro.h +27 -25
  20. data/ext/numo/narray/numo/types/float_macro.h +20 -17
  21. data/ext/numo/narray/numo/types/real_accum.h +22 -22
  22. data/ext/numo/narray/numo/types/robj_macro.h +19 -12
  23. data/ext/numo/narray/numo/types/xint_macro.h +9 -8
  24. data/ext/numo/narray/src/t_bit.c +97 -88
  25. data/ext/numo/narray/src/t_dcomplex.c +336 -307
  26. data/ext/numo/narray/src/t_dfloat.c +522 -456
  27. data/ext/numo/narray/src/t_int16.c +351 -308
  28. data/ext/numo/narray/src/t_int32.c +351 -308
  29. data/ext/numo/narray/src/t_int64.c +351 -308
  30. data/ext/numo/narray/src/t_int8.c +309 -288
  31. data/ext/numo/narray/src/t_mean.c +105 -0
  32. data/ext/numo/narray/src/t_robject.c +323 -296
  33. data/ext/numo/narray/src/t_scomplex.c +327 -302
  34. data/ext/numo/narray/src/t_sfloat.c +515 -451
  35. data/ext/numo/narray/src/t_uint16.c +351 -308
  36. data/ext/numo/narray/src/t_uint32.c +351 -308
  37. data/ext/numo/narray/src/t_uint64.c +351 -308
  38. data/ext/numo/narray/src/t_uint8.c +311 -288
  39. data/ext/numo/narray/step.c +7 -2
  40. data/ext/numo/narray/struct.c +24 -22
  41. data/lib/numo/narray/extra.rb +66 -25
  42. data/numo-narray-alt.gemspec +38 -0
  43. metadata +7 -1
data/ext/numo/narray/numo/template.h CHANGED
@@ -6,7 +6,7 @@
6
6
  #ifndef TEMPLATE_H
7
7
  #define TEMPLATE_H
8
8
 
9
- #define INIT_COUNTER(lp, c) \
9
+ #define INIT_COUNTER(lp, c) \
10
10
  { c = (lp)->n[0]; }
11
11
 
12
12
  #define NDL_CNT(lp) ((lp)->n[0])
@@ -16,111 +16,113 @@
16
16
  #define NDL_ESZ(lp, i) ((lp)->args[i].elmsz)
17
17
  #define NDL_SHAPE(lp, i) ((lp)->args[i].shape)
18
18
 
19
- #define INIT_PTR(lp, i, pt, st) \
20
- { \
21
- pt = ((lp)->args[i]).ptr + ((lp)->args[i].iter[0]).pos; \
22
- st = ((lp)->args[i].iter[0]).step; \
19
+ #define INIT_PTR(lp, i, pt, st) \
20
+ { \
21
+ pt = ((lp)->args[i]).ptr + ((lp)->args[i].iter[0]).pos; \
22
+ st = ((lp)->args[i].iter[0]).step; \
23
23
  }
24
24
 
25
- #define INIT_PTR_IDX(lp, i, pt, st, id) \
26
- { \
27
- pt = ((lp)->args[i]).ptr + ((lp)->args[i].iter[0]).pos; \
28
- st = ((lp)->args[i].iter[0]).step; \
29
- id = ((lp)->args[i].iter[0]).idx; \
25
+ #define INIT_PTR_IDX(lp, i, pt, st, id) \
26
+ { \
27
+ pt = ((lp)->args[i]).ptr + ((lp)->args[i].iter[0]).pos; \
28
+ st = ((lp)->args[i].iter[0]).step; \
29
+ id = ((lp)->args[i].iter[0]).idx; \
30
30
  }
31
31
 
32
- #define INIT_ELMSIZE(lp, i, es) \
32
+ #define INIT_ELMSIZE(lp, i, es) \
33
33
  { es = ((lp)->args[i]).elmsz; }
34
34
 
35
- #define INIT_PTR_BIT(lp, i, ad, ps, st) \
36
- { \
37
- ps = ((lp)->args[i].iter[0]).pos; \
38
- ad = (BIT_DIGIT*)(((lp)->args[i]).ptr); \
39
- st = ((lp)->args[i].iter[0]).step; \
35
+ #define INIT_PTR_BIT(lp, i, ad, ps, st) \
36
+ { \
37
+ ps = ((lp)->args[i].iter[0]).pos; \
38
+ ad = (BIT_DIGIT*)(((lp)->args[i]).ptr); \
39
+ st = ((lp)->args[i].iter[0]).step; \
40
40
  }
41
41
 
42
- #define INIT_PTR_BIT_IDX(lp, i, ad, ps, st, id) \
43
- { \
44
- ps = ((lp)->args[i].iter[0]).pos; \
45
- ad = (BIT_DIGIT*)(((lp)->args[i]).ptr); \
46
- st = ((lp)->args[i].iter[0]).step; \
47
- id = ((lp)->args[i].iter[0]).idx; \
42
+ #define INIT_PTR_BIT_IDX(lp, i, ad, ps, st, id) \
43
+ { \
44
+ ps = ((lp)->args[i].iter[0]).pos; \
45
+ ad = (BIT_DIGIT*)(((lp)->args[i]).ptr); \
46
+ st = ((lp)->args[i].iter[0]).step; \
47
+ id = ((lp)->args[i].iter[0]).idx; \
48
48
  }
49
49
 
50
- #define GET_DATA(ptr, type, val) \
50
+ #define GET_DATA(ptr, type, val) \
51
51
  { val = *(type*)(ptr); }
52
52
 
53
- #define SET_DATA(ptr, type, val) \
53
+ #define SET_DATA(ptr, type, val) \
54
54
  { *(type*)(ptr) = val; }
55
55
 
56
- #define GET_DATA_STRIDE(ptr, step, type, val) \
57
- { \
58
- val = *(type*)(ptr); \
59
- ptr += step; \
56
+ #define GET_DATA_STRIDE(ptr, step, type, val) \
57
+ { \
58
+ val = *(type*)(ptr); \
59
+ ptr += step; \
60
60
  }
61
61
 
62
- #define GET_DATA_INDEX(ptr, idx, type, val) \
63
- { \
64
- val = *(type*)(ptr + *idx); \
65
- idx++; \
62
+ #define GET_DATA_INDEX(ptr, idx, type, val) \
63
+ { \
64
+ val = *(type*)(ptr + *idx); \
65
+ idx++; \
66
66
  }
67
67
 
68
- #define SET_DATA_STRIDE(ptr, step, type, val) \
69
- { \
70
- *(type*)(ptr) = val; \
71
- ptr += step; \
68
+ #define SET_DATA_STRIDE(ptr, step, type, val) \
69
+ { \
70
+ *(type*)(ptr) = val; \
71
+ ptr += step; \
72
72
  }
73
73
 
74
- #define SET_DATA_INDEX(ptr, idx, type, val) \
75
- { \
76
- *(type*)(ptr + *idx) = val; \
77
- idx++; \
74
+ #define SET_DATA_INDEX(ptr, idx, type, val) \
75
+ { \
76
+ *(type*)(ptr + *idx) = val; \
77
+ idx++; \
78
78
  }
79
79
 
80
- #define LOAD_BIT(adr, pos, val) \
81
- { \
82
- size_t dig = (pos) / NB; \
83
- int bit = (pos) % NB; \
84
- val = (((BIT_DIGIT*)(adr))[dig] >> (bit)) & 1u; \
80
+ #define LOAD_BIT(adr, pos, val) \
81
+ { \
82
+ size_t dig = (pos) / NB; \
83
+ int bit = (pos) % NB; \
84
+ val = (((BIT_DIGIT*)(adr))[dig] >> (bit)) & 1u; \
85
85
  }
86
86
 
87
- #define LOAD_BIT_STEP(adr, pos, step, idx, val) \
88
- { \
89
- size_t dig; \
90
- int bit; \
91
- if (idx) { \
92
- dig = ((pos) + *(idx)) / NB; \
93
- bit = ((pos) + *(idx)) % NB; \
94
- idx++; \
95
- } else { \
96
- dig = (pos) / NB; \
97
- bit = (pos) % NB; \
98
- pos += step; \
99
- } \
100
- val = (((BIT_DIGIT*)(adr))[dig] >> bit) & 1u; \
87
+ #define LOAD_BIT_STEP(adr, pos, step, idx, val) \
88
+ { \
89
+ size_t dig; \
90
+ int bit; \
91
+ if (idx) { \
92
+ dig = ((pos) + *(idx)) / NB; \
93
+ bit = ((pos) + *(idx)) % NB; \
94
+ idx++; \
95
+ } else { \
96
+ dig = (pos) / NB; \
97
+ bit = (pos) % NB; \
98
+ pos += step; \
99
+ } \
100
+ val = (((BIT_DIGIT*)(adr))[dig] >> bit) & 1u; \
101
101
  }
102
102
 
103
- #define STORE_BIT(adr, pos, val) \
104
- { \
105
- size_t dig = (pos) / NB; \
106
- int bit = (pos) % NB; \
107
- ((BIT_DIGIT*)(adr))[dig] = (((BIT_DIGIT*)(adr))[dig] & ~(1u << (bit))) | (((val) & 1u) << (bit)); \
103
+ #define STORE_BIT(adr, pos, val) \
104
+ { \
105
+ size_t dig = (pos) / NB; \
106
+ int bit = (pos) % NB; \
107
+ ((BIT_DIGIT*)(adr))[dig] = \
108
+ (((BIT_DIGIT*)(adr))[dig] & ~(1u << (bit))) | (((val) & 1u) << (bit)); \
108
109
  }
109
110
 
110
- #define STORE_BIT_STEP(adr, pos, step, idx, val) \
111
- { \
112
- size_t dig; \
113
- int bit; \
114
- if (idx) { \
115
- dig = ((pos) + *(idx)) / NB; \
116
- bit = ((pos) + *(idx)) % NB; \
117
- idx++; \
118
- } else { \
119
- dig = (pos) / NB; \
120
- bit = (pos) % NB; \
121
- pos += step; \
122
- } \
123
- ((BIT_DIGIT*)(adr))[dig] = (((BIT_DIGIT*)(adr))[dig] & ~(1u << (bit))) | (((val) & 1u) << (bit)); \
111
+ #define STORE_BIT_STEP(adr, pos, step, idx, val) \
112
+ { \
113
+ size_t dig; \
114
+ int bit; \
115
+ if (idx) { \
116
+ dig = ((pos) + *(idx)) / NB; \
117
+ bit = ((pos) + *(idx)) % NB; \
118
+ idx++; \
119
+ } else { \
120
+ dig = (pos) / NB; \
121
+ bit = (pos) % NB; \
122
+ pos += step; \
123
+ } \
124
+ ((BIT_DIGIT*)(adr))[dig] = \
125
+ (((BIT_DIGIT*)(adr))[dig] & ~(1u << (bit))) | (((val) & 1u) << (bit)); \
124
126
  }
125
127
 
126
128
  static inline int is_aligned(const void* ptr, const size_t alignment) {
@@ -131,8 +133,9 @@ static inline int is_aligned_step(const ssize_t step, const size_t alignment) {
131
133
  return ((step) & ((alignment)-1)) == 0;
132
134
  }
133
135
 
134
- static inline int get_count_of_elements_not_aligned_to_simd_size(const void* ptr, const size_t alignment,
135
- const size_t element_size) {
136
+ static inline int get_count_of_elements_not_aligned_to_simd_size(
137
+ const void* ptr, const size_t alignment, const size_t element_size
138
+ ) {
136
139
  size_t cnt = (size_t)(ptr) & ((alignment)-1);
137
140
  return (int)(cnt == 0 ? 0 : (alignment - cnt) / element_size);
138
141
  }
@@ -141,7 +144,8 @@ static inline int is_same_aligned2(const void* ptr1, const void* ptr2, const siz
141
144
  return ((size_t)(ptr1) & ((alignment)-1)) == ((size_t)(ptr2) & ((alignment)-1));
142
145
  }
143
146
 
144
- static inline int is_same_aligned3(const void* ptr1, const void* ptr2, const void* ptr3, const size_t alignment) {
147
+ static inline int
148
+ is_same_aligned3(const void* ptr1, const void* ptr2, const void* ptr3, const size_t alignment) {
145
149
  return (((size_t)(ptr1) & ((alignment)-1)) == ((size_t)(ptr2) & ((alignment)-1))) &&
146
150
  (((size_t)(ptr1) & ((alignment)-1)) == ((size_t)(ptr3) & ((alignment)-1)));
147
151
  }
data/ext/numo/narray/numo/types/complex.h CHANGED
@@ -23,7 +23,9 @@ static inline dtype c_set_imag(dtype x, rtype i) {
23
23
 
24
24
  static inline VALUE COMP2NUM(dtype x) {
25
25
  VALUE v;
26
- v = rb_funcall(rb_intern("Kernel"), rb_intern("Complex"), 2, rb_float_new(REAL(x)), rb_float_new(IMAG(x)));
26
+ v = rb_funcall(
27
+ rb_intern("Kernel"), rb_intern("Complex"), 2, rb_float_new(REAL(x)), rb_float_new(IMAG(x))
28
+ );
27
29
  return v;
28
30
  }
29
31
 
@@ -39,8 +41,10 @@ static inline dtype NUM2COMP(VALUE v) {
39
41
  #define c_ne(x, y) (REAL(x) != REAL(y) || IMAG(x) != IMAG(y))
40
42
  #define c_isnan(x) (isnan(REAL(x)) || isnan(IMAG(x)))
41
43
  #define c_isinf(x) (isinf(REAL(x)) || isinf(IMAG(x)))
42
- #define c_isposinf(x) ((isinf(REAL(x)) && signbit(REAL(x)) == 0) || (isinf(IMAG(x)) && signbit(IMAG(x)) == 0))
43
- #define c_isneginf(x) ((isinf(REAL(x)) && signbit(REAL(x))) || (isinf(IMAG(x)) && signbit(IMAG(x))))
44
+ #define c_isposinf(x) \
45
+ ((isinf(REAL(x)) && signbit(REAL(x)) == 0) || (isinf(IMAG(x)) && signbit(IMAG(x)) == 0))
46
+ #define c_isneginf(x) \
47
+ ((isinf(REAL(x)) && signbit(REAL(x))) || (isinf(IMAG(x)) && signbit(IMAG(x))))
44
48
  #define c_isfinite(x) (isfinite(REAL(x)) && isfinite(IMAG(x)))
45
49
 
46
50
  static inline dtype c_zero(void) {
data/ext/numo/narray/numo/types/complex_macro.h CHANGED
@@ -75,9 +75,11 @@ static inline dtype c_from_dcomplex(dcomplex x) {
75
75
  #define m_ceil(x) c_new(ceil(REAL(x)), ceil(IMAG(x)))
76
76
  #define m_trunc(x) c_new(trunc(REAL(x)), trunc(IMAG(x)))
77
77
  #define m_rint(x) c_new(rint(REAL(x)), rint(IMAG(x)))
78
- #define m_sign(x) \
79
- c_new(((REAL(x) == 0) ? 0.0 : ((REAL(x) > 0) ? 1.0 : ((REAL(x) < 0) ? -1.0 : REAL(x)))), \
80
- ((IMAG(x) == 0) ? 0.0 : ((IMAG(x) > 0) ? 1.0 : ((IMAG(x) < 0) ? -1.0 : IMAG(x)))))
78
+ #define m_sign(x) \
79
+ c_new( \
80
+ ((REAL(x) == 0) ? 0.0 : ((REAL(x) > 0) ? 1.0 : ((REAL(x) < 0) ? -1.0 : REAL(x)))), \
81
+ ((IMAG(x) == 0) ? 0.0 : ((IMAG(x) > 0) ? 1.0 : ((IMAG(x) < 0) ? -1.0 : IMAG(x)))) \
82
+ )
81
83
  #define m_copysign(x, y) c_new(copysign(REAL(x), REAL(y)), copysign(IMAG(x), IMAG(y)))
82
84
 
83
85
  #define m_im(x) c_im(x)
@@ -124,35 +126,35 @@ static inline dtype c_from_dcomplex(dcomplex x) {
124
126
 
125
127
  #define not_nan(x) (REAL(x) == REAL(x) && IMAG(x) == IMAG(x))
126
128
 
127
- #define m_mulsum(x, y, z) \
129
+ #define m_mulsum(x, y, z) \
128
130
  { z = m_add(m_mul(x, y), z); }
129
- #define m_mulsum_nan(x, y, z) \
130
- { \
131
- if (not_nan(x) && not_nan(y)) { \
132
- z = m_add(m_mul(x, y), z); \
133
- } \
131
+ #define m_mulsum_nan(x, y, z) \
132
+ { \
133
+ if (not_nan(x) && not_nan(y)) { \
134
+ z = m_add(m_mul(x, y), z); \
135
+ } \
134
136
  }
135
137
 
136
- #define m_cumsum(x, y) \
138
+ #define m_cumsum(x, y) \
137
139
  { (x) = m_add(x, y); }
138
- #define m_cumsum_nan(x, y) \
139
- { \
140
- if (!not_nan(x)) { \
141
- (x) = (y); \
142
- } else if (not_nan(y)) { \
143
- (x) = m_add(x, y); \
144
- } \
140
+ #define m_cumsum_nan(x, y) \
141
+ { \
142
+ if (!not_nan(x)) { \
143
+ (x) = (y); \
144
+ } else if (not_nan(y)) { \
145
+ (x) = m_add(x, y); \
146
+ } \
145
147
  }
146
148
 
147
- #define m_cumprod(x, y) \
149
+ #define m_cumprod(x, y) \
148
150
  { (x) = m_mul(x, y); }
149
- #define m_cumprod_nan(x, y) \
150
- { \
151
- if (!not_nan(x)) { \
152
- (x) = (y); \
153
- } else if (not_nan(y)) { \
154
- (x) = m_mul(x, y); \
155
- } \
151
+ #define m_cumprod_nan(x, y) \
152
+ { \
153
+ if (!not_nan(x)) { \
154
+ (x) = (y); \
155
+ } else if (not_nan(y)) { \
156
+ (x) = m_mul(x, y); \
157
+ } \
156
158
  }
157
159
 
158
160
  static inline dtype f_sum(size_t n, char* p, ssize_t stride) {
data/ext/numo/narray/numo/types/float_macro.h CHANGED
@@ -29,10 +29,10 @@ extern double pow(double, double);
29
29
  #define m_div(x, y) ((x) / (y))
30
30
  #define m_div_check(x, y) ((y) == 0)
31
31
  #define m_mod(x, y) fmod(x, y)
32
- #define m_divmod(x, y, a, b) \
33
- { \
34
- a = (x) / (y); \
35
- b = m_mod(x, y); \
32
+ #define m_divmod(x, y, a, b) \
33
+ { \
34
+ a = (x) / (y); \
35
+ b = m_mod(x, y); \
36
36
  }
37
37
  #define m_pow(x, y) pow(x, y)
38
38
  #define m_pow_int(x, y) pow_int(x, y)
@@ -49,11 +49,11 @@ extern double pow(double, double);
49
49
  #define m_sign(x) (((x) == 0) ? 0.0 : (((x) > 0) ? 1.0 : (((x) < 0) ? -1.0 : (x))))
50
50
  #define m_copysign(x, y) copysign(x, y)
51
51
  #define m_signbit(x) signbit(x)
52
- #define m_modf(x, y, z) \
53
- { \
54
- double d; \
55
- y = modf(x, &d); \
56
- z = d; \
52
+ #define m_modf(x, y, z) \
53
+ { \
54
+ double d; \
55
+ y = modf(x, &d); \
56
+ z = d; \
57
57
  }
58
58
 
59
59
  #define m_eq(x, y) ((x) == (y))
@@ -73,18 +73,21 @@ extern double pow(double, double);
73
73
 
74
74
  #define m_sprintf(s, x) sprintf(s, "%g", x)
75
75
 
76
- #define cmp_prnan(a, b) ((qsort_cast(a) == qsort_cast(b)) ? 0 : (qsort_cast(a) > qsort_cast(b)) ? 1 : -1)
76
+ #define cmp_prnan(a, b) \
77
+ ((qsort_cast(a) == qsort_cast(b)) ? 0 : (qsort_cast(a) > qsort_cast(b)) ? 1 : -1)
77
78
 
78
- #define cmp_ignan(a, b) \
79
- (m_isnan(qsort_cast(a)) ? (m_isnan(qsort_cast(b)) ? 0 : 1) \
80
- : (m_isnan(qsort_cast(b)) ? -1 \
81
- : ((qsort_cast(a) == qsort_cast(b)) ? 0 \
82
- : (qsort_cast(a) > qsort_cast(b)) ? 1 \
83
- : -1)))
79
+ #define cmp_ignan(a, b) \
80
+ (m_isnan(qsort_cast(a)) \
81
+ ? (m_isnan(qsort_cast(b)) ? 0 : 1) \
82
+ : (m_isnan(qsort_cast(b)) ? -1 \
83
+ : ((qsort_cast(a) == qsort_cast(b)) ? 0 \
84
+ : (qsort_cast(a) > qsort_cast(b)) ? 1 \
85
+ : -1)))
84
86
 
85
87
  #define cmpgt_prnan(a, b) (qsort_cast(a) > qsort_cast(b))
86
88
 
87
- #define cmpgt_ignan(a, b) ((m_isnan(qsort_cast(a)) && !m_isnan(qsort_cast(b))) || (qsort_cast(a) > qsort_cast(b)))
89
+ #define cmpgt_ignan(a, b) \
90
+ ((m_isnan(qsort_cast(a)) && !m_isnan(qsort_cast(b))) || (qsort_cast(a) > qsort_cast(b)))
88
91
 
89
92
  #define m_sqrt(x) sqrt(x)
90
93
  #define m_cbrt(x) cbrt(x)
data/ext/numo/narray/numo/types/real_accum.h CHANGED
@@ -1,34 +1,34 @@
1
1
  #define not_nan(x) ((x) == (x))
2
2
 
3
- #define m_mulsum(x, y, z) \
3
+ #define m_mulsum(x, y, z) \
4
4
  { z = m_add(m_mul(x, y), z); }
5
- #define m_mulsum_nan(x, y, z) \
6
- { \
7
- if (not_nan(x) && not_nan(y)) { \
8
- z = m_add(m_mul(x, y), z); \
9
- } \
5
+ #define m_mulsum_nan(x, y, z) \
6
+ { \
7
+ if (not_nan(x) && not_nan(y)) { \
8
+ z = m_add(m_mul(x, y), z); \
9
+ } \
10
10
  }
11
11
 
12
- #define m_cumsum(x, y) \
12
+ #define m_cumsum(x, y) \
13
13
  { (x) = m_add(x, y); }
14
- #define m_cumsum_nan(x, y) \
15
- { \
16
- if (!not_nan(x)) { \
17
- (x) = (y); \
18
- } else if (not_nan(y)) { \
19
- (x) = m_add(x, y); \
20
- } \
14
+ #define m_cumsum_nan(x, y) \
15
+ { \
16
+ if (!not_nan(x)) { \
17
+ (x) = (y); \
18
+ } else if (not_nan(y)) { \
19
+ (x) = m_add(x, y); \
20
+ } \
21
21
  }
22
22
 
23
- #define m_cumprod(x, y) \
23
+ #define m_cumprod(x, y) \
24
24
  { (x) = m_mul(x, y); }
25
- #define m_cumprod_nan(x, y) \
26
- { \
27
- if (!not_nan(x)) { \
28
- (x) = (y); \
29
- } else if (not_nan(y)) { \
30
- (x) = m_mul(x, y); \
31
- } \
25
+ #define m_cumprod_nan(x, y) \
26
+ { \
27
+ if (!not_nan(x)) { \
28
+ (x) = (y); \
29
+ } else if (not_nan(y)) { \
30
+ (x) = m_mul(x, y); \
31
+ } \
32
32
  }
33
33
 
34
34
  static inline dtype f_sum(size_t n, char* p, ssize_t stride) {
data/ext/numo/narray/numo/types/robj_macro.h CHANGED
@@ -17,11 +17,11 @@
17
17
  #define m_mul(x, y) rb_funcall(x, '*', 1, y)
18
18
  #define m_div(x, y) rb_funcall(x, '/', 1, y)
19
19
  #define m_mod(x, y) rb_funcall(x, '%', 1, y)
20
- #define m_divmod(x, y, a, b) \
21
- { \
22
- x = rb_funcall(x, id_divmod, 1, y); \
23
- a = RARRAY_PTR(x)[0]; \
24
- b = RARRAY_PTR(x)[0]; \
20
+ #define m_divmod(x, y, a, b) \
21
+ { \
22
+ x = rb_funcall(x, id_divmod, 1, y); \
23
+ a = RARRAY_PTR(x)[0]; \
24
+ b = RARRAY_PTR(x)[0]; \
25
25
  }
26
26
  #define m_pow(x, y) rb_funcall(x, id_pow, 1, y)
27
27
  #define m_pow_int(x, y) rb_funcall(x, id_pow, 1, y)
@@ -52,12 +52,18 @@
52
52
  #define m_right_shift(x, y) rb_funcall(x, id_right_shift, 1, y)
53
53
 
54
54
  #define m_isnan(x) ((rb_respond_to(x, id_nan_p)) ? RTEST(rb_funcall(x, id_nan_p, 0)) : 0)
55
- #define m_isinf(x) ((rb_respond_to(x, id_infinite_p)) ? RTEST(rb_funcall(x, id_infinite_p, 0)) : 0)
56
- #define m_isposinf(x) \
57
- ((rb_respond_to(x, id_infinite_p)) ? ((RTEST(rb_funcall(x, id_infinite_p, 0))) ? m_gt(x, INT2FIX(0)) : 0) : 0)
58
- #define m_isneginf(x) \
59
- ((rb_respond_to(x, id_infinite_p)) ? ((RTEST(rb_funcall(x, id_infinite_p, 0))) ? m_lt(x, INT2FIX(0)) : 0) : 0)
60
- #define m_isfinite(x) ((rb_respond_to(x, id_finite_p)) ? RTEST(rb_funcall(x, id_finite_p, 0)) : 0)
55
+ #define m_isinf(x) \
56
+ ((rb_respond_to(x, id_infinite_p)) ? RTEST(rb_funcall(x, id_infinite_p, 0)) : 0)
57
+ #define m_isposinf(x) \
58
+ ((rb_respond_to(x, id_infinite_p)) \
59
+ ? ((RTEST(rb_funcall(x, id_infinite_p, 0))) ? m_gt(x, INT2FIX(0)) : 0) \
60
+ : 0)
61
+ #define m_isneginf(x) \
62
+ ((rb_respond_to(x, id_infinite_p)) \
63
+ ? ((RTEST(rb_funcall(x, id_infinite_p, 0))) ? m_lt(x, INT2FIX(0)) : 0) \
64
+ : 0)
65
+ #define m_isfinite(x) \
66
+ ((rb_respond_to(x, id_finite_p)) ? RTEST(rb_funcall(x, id_finite_p, 0)) : 0)
61
67
 
62
68
  #define m_mulsum_init INT2FIX(0)
63
69
 
@@ -68,7 +74,8 @@ static inline int robj_sprintf(char* s, VALUE x) {
68
74
  return sprintf(s, "%s", StringValuePtr(v));
69
75
  }
70
76
 
71
- #define m_sqrt(x) rb_funcall(rb_const_get(rb_mKernel, rb_intern("Math")), rb_intern("sqrt"), 1, x);
77
+ #define m_sqrt(x) \
78
+ rb_funcall(rb_const_get(rb_mKernel, rb_intern("Math")), rb_intern("sqrt"), 1, x);
72
79
 
73
80
  static inline dtype f_seq(dtype x, dtype y, size_t c) {
74
81
  y = m_mul(y, SIZET2NUM(c));
data/ext/numo/narray/numo/types/xint_macro.h CHANGED
@@ -17,10 +17,10 @@
17
17
  #define m_mul(x, y) ((x) * (y))
18
18
  #define m_div(x, y) ((x) / (y))
19
19
  #define m_mod(x, y) ((x) % (y))
20
- #define m_divmod(x, y, a, b) \
21
- { \
22
- a = (x) / (y); \
23
- b = m_mod(x, y); \
20
+ #define m_divmod(x, y, a, b) \
21
+ { \
22
+ a = (x) / (y); \
23
+ b = m_mod(x, y); \
24
24
  }
25
25
  #define m_pow(x, y) pow_int(x, y)
26
26
  #define m_pow_int(x, y) pow_int(x, y)
@@ -45,15 +45,16 @@
45
45
 
46
46
  #define m_isnan(x) 0
47
47
 
48
- #define m_mulsum(x, y, z) \
48
+ #define m_mulsum(x, y, z) \
49
49
  { z += x * y; }
50
50
  #define m_mulsum_init INT2FIX(0)
51
- #define m_cumsum(x, y) \
51
+ #define m_cumsum(x, y) \
52
52
  { x += y; }
53
- #define m_cumprod(x, y) \
53
+ #define m_cumprod(x, y) \
54
54
  { x *= y; }
55
55
 
56
- #define cmp(a, b) ((qsort_cast(a) == qsort_cast(b)) ? 0 : (qsort_cast(a) > qsort_cast(b)) ? 1 : -1)
56
+ #define cmp(a, b) \
57
+ ((qsort_cast(a) == qsort_cast(b)) ? 0 : (qsort_cast(a) > qsort_cast(b)) ? 1 : -1)
57
58
  #define cmpgt(a, b) (qsort_cast(a) > qsort_cast(b))
58
59
 
59
60
  static inline dtype f_min(size_t n, char* p, ssize_t stride) {