diff options
author | Sebastian Berg <sebastian@sipsolutions.net> | 2019-05-28 15:38:42 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-28 15:38:42 -0700 |
commit | 0190305d9bbd03f347d734356b1dfc45d9f562d8 (patch) | |
tree | 8dd8cf34137493f1fda307376fc2bae5ac7cfd8c /numpy/random/src/pcg64 | |
parent | 12cb4537ca10e8644819c904b7741717e5b32e1e (diff) | |
parent | e98a48d2d6640ca2a0add0504c3c7d266c4d4523 (diff) | |
download | numpy-0190305d9bbd03f347d734356b1dfc45d9f562d8.tar.gz |
Merge pull request #13657 from rkern/fix/c-underscores
BUG: Avoid leading underscores in C function names.
Diffstat (limited to 'numpy/random/src/pcg64')
-rw-r--r-- | numpy/random/src/pcg64/pcg64.c | 10 | ||||
-rw-r--r-- | numpy/random/src/pcg64/pcg64.h | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/numpy/random/src/pcg64/pcg64.c b/numpy/random/src/pcg64/pcg64.c index c89454029..45c11a010 100644 --- a/numpy/random/src/pcg64/pcg64.c +++ b/numpy/random/src/pcg64/pcg64.c @@ -97,17 +97,17 @@ pcg128_t pcg_advance_lcg_128(pcg128_t state, pcg128_t delta, pcg128_t cur_mult, pcg128_t acc_plus = PCG_128BIT_CONSTANT(0u, 0u); while ((delta.high > 0) || (delta.low > 0)) { if (delta.low & 1) { - acc_mult = _pcg128_mult(acc_mult, cur_mult); - acc_plus = _pcg128_add(_pcg128_mult(acc_plus, cur_mult), cur_plus); + acc_mult = pcg128_mult(acc_mult, cur_mult); + acc_plus = pcg128_add(pcg128_mult(acc_plus, cur_mult), cur_plus); } - cur_plus = _pcg128_mult(_pcg128_add(cur_mult, PCG_128BIT_CONSTANT(0u, 1u)), + cur_plus = pcg128_mult(pcg128_add(cur_mult, PCG_128BIT_CONSTANT(0u, 1u)), cur_plus); - cur_mult = _pcg128_mult(cur_mult, cur_mult); + cur_mult = pcg128_mult(cur_mult, cur_mult); delta.low >>= 1; delta.low += delta.high & 1; delta.high >>= 1; } - return _pcg128_add(_pcg128_mult(acc_mult, state), acc_plus); + return pcg128_add(pcg128_mult(acc_mult, state), acc_plus); } #endif diff --git a/numpy/random/src/pcg64/pcg64.h b/numpy/random/src/pcg64/pcg64.h index 80db3bbc9..0c263bb7b 100644 --- a/numpy/random/src/pcg64/pcg64.h +++ b/numpy/random/src/pcg64/pcg64.h @@ -109,7 +109,7 @@ static inline uint64_t pcg_rotr_64(uint64_t value, unsigned int rot) { #ifdef PCG_EMULATED_128BIT_MATH -static inline pcg128_t _pcg128_add(pcg128_t a, pcg128_t b) { +static inline pcg128_t pcg128_add(pcg128_t a, pcg128_t b) { pcg128_t result; result.low = a.low + b.low; @@ -141,7 +141,7 @@ static inline void _pcg_mult64(uint64_t x, uint64_t y, uint64_t *z1, #endif } -static inline pcg128_t _pcg128_mult(pcg128_t a, pcg128_t b) { +static inline pcg128_t pcg128_mult(pcg128_t a, pcg128_t b) { uint64_t h1; pcg128_t result; @@ -152,7 +152,7 @@ static inline pcg128_t _pcg128_mult(pcg128_t a, pcg128_t b) { } static inline void pcg_setseq_128_step_r(pcg_state_setseq_128 *rng) { - rng->state = _pcg128_add(_pcg128_mult(rng->state, PCG_DEFAULT_MULTIPLIER_128), + rng->state = pcg128_add(pcg128_mult(rng->state, PCG_DEFAULT_MULTIPLIER_128), rng->inc); } @@ -168,7 +168,7 @@ static inline void pcg_setseq_128_srandom_r(pcg_state_setseq_128 *rng, rng->inc.high |= initseq.low & 0x800000000000ULL; rng->inc.low = (initseq.low << 1u) | 1u; pcg_setseq_128_step_r(rng); - rng->state = _pcg128_add(rng->state, initstate); + rng->state = pcg128_add(rng->state, initstate); pcg_setseq_128_step_r(rng); } |