Merge pull request #114 from bashtage/add-static

bashtage · web-flow · commit 7ae4c25d1d05 · 2017-09-29T08:03:07.000+01:00
Add static
diff --git a/.travis.yml b/.travis.yml
@@ -34,7 +34,8 @@ before_install:
   - ./miniconda3.sh -b
   - export PATH=/home/travis/miniconda3/bin:$PATH
   - conda config --set always_yes true
-  - conda update --all --quiet
+  # Disable until fixed
+  # - conda update --all --quiet
   - PKGS="python=${PYTHON}"
   - PKGS="${PKGS} numpy"; if [ ${NUMPY} ]; then PKGS="${PKGS}=${NUMPY}"; fi
   - PKGS="${PKGS} Cython"; if [ ${CYTHON} ]; then PKGS="${PKGS}=${CYTHON}"; fi
diff --git a/randomstate/interface/mlfg-1279-861/mlfg-1279-861-shim.h b/randomstate/interface/mlfg-1279-861/mlfg-1279-861-shim.h
@@ -24,21 +24,21 @@ typedef struct s_aug_state {
   uint64_t zig_random_int;
 } aug_state;
 
-NPY_INLINE uint32_t random_uint32(aug_state *state) {
+static NPY_INLINE uint32_t random_uint32(aug_state *state) {
   return (uint32_t)(mlfg_next(state->rng) >> 32);
 }
 
-NPY_INLINE uint64_t random_uint64(aug_state *state) {
+static NPY_INLINE uint64_t random_uint64(aug_state *state) {
   uint64_t out = mlfg_next(state->rng) & 0xffffffff00000000ULL;
   out |= mlfg_next(state->rng) >> 32;
   return out;
 }
 
-NPY_INLINE uint64_t random_raw_values(aug_state *state) {
+static NPY_INLINE uint64_t random_raw_values(aug_state *state) {
   return mlfg_next(state->rng) >> 1;
 }
 
-NPY_INLINE double random_double(aug_state *state) {
+static NPY_INLINE double random_double(aug_state *state) {
   uint64_t rn;
   rn = mlfg_next(state->rng);
   return (rn >> 11) * (1.0 / 9007199254740992.0);
diff --git a/randomstate/interface/mrg32k3a/mrg32k3a-shim.h b/randomstate/interface/mrg32k3a/mrg32k3a-shim.h
@@ -26,20 +26,20 @@ typedef struct s_aug_state {
   uint32_t uinteger;
 } aug_state;
 
-inline uint32_t random_uint32(aug_state *state) {
+static inline uint32_t random_uint32(aug_state *state) {
   return mrg32k3a_random(state->rng);
 }
 
-inline uint64_t random_uint64(aug_state *state) {
+static inline uint64_t random_uint64(aug_state *state) {
   return (((uint64_t)mrg32k3a_random(state->rng) << 32) |
           mrg32k3a_random(state->rng));
 }
 
-inline uint64_t random_raw_values(aug_state *state) {
+static inline uint64_t random_raw_values(aug_state *state) {
   return (uint64_t)random_uint32(state);
 }
 
-inline double random_double(aug_state *state) {
+static inline double random_double(aug_state *state) {
   int32_t a = random_uint32(state) >> 5, b = random_uint32(state) >> 6;
   return (a * 67108864.0 + b) / 9007199254740992.0;
 }
diff --git a/randomstate/interface/pcg-32/pcg-32-shim.h b/randomstate/interface/pcg-32/pcg-32-shim.h
@@ -19,34 +19,34 @@ typedef struct s_aug_state {
   uint64_t zig_random_int;
 } aug_state;
 
-NPY_INLINE uint32_t random_uint32(aug_state *state) {
+static NPY_INLINE uint32_t random_uint32(aug_state *state) {
   return pcg32_random_r(state->rng);
 }
 
-NPY_INLINE uint64_t random_uint64(aug_state *state) {
+static NPY_INLINE uint64_t random_uint64(aug_state *state) {
   return (((uint64_t)pcg32_random_r((*state).rng) << 32) |
           pcg32_random_r((*state).rng));
 }
 
-NPY_INLINE void set_seed(aug_state *state, uint64_t seed, uint64_t inc) {
+static NPY_INLINE void set_seed(aug_state *state, uint64_t seed, uint64_t inc) {
   pcg32_srandom_r(state->rng, seed, inc);
 }
 
-NPY_INLINE void advance_state(aug_state *state, uint64_t delta) {
+static NPY_INLINE void advance_state(aug_state *state, uint64_t delta) {
   pcg32_advance_r(state->rng, delta);
 }
 
-NPY_INLINE uint64_t random_raw_values(aug_state *state) {
+static NPY_INLINE uint64_t random_raw_values(aug_state *state) {
   return (uint64_t)random_uint32(state);
 }
 
-NPY_INLINE void entropy_init(aug_state *state) {
+static NPY_INLINE void entropy_init(aug_state *state) {
   uint64_t seeds[2];
   entropy_fill((void *)seeds, sizeof(seeds));
   set_seed(state, seeds[0], seeds[1]);
 }
 
-NPY_INLINE double random_double(aug_state *state) {
+static NPY_INLINE double random_double(aug_state *state) {
   int32_t a = random_uint32(state) >> 5, b = random_uint32(state) >> 6;
   return (a * 67108864.0 + b) / 9007199254740992.0;
 }
diff --git a/randomstate/interface/pcg-64/pcg-64-shim.h b/randomstate/interface/pcg-64/pcg-64-shim.h
@@ -22,7 +22,7 @@ typedef struct s_aug_state {
   uint64_t zig_random_int;
 } aug_state;
 
-inline uint32_t random_uint32(aug_state *state) {
+static inline uint32_t random_uint32(aug_state *state) {
   uint64_t temp;
   if (state->has_uint32) {
     state->has_uint32 = 0;
@@ -34,28 +34,28 @@ inline uint32_t random_uint32(aug_state *state) {
   return (uint32_t)(temp & 0xFFFFFFFFLL);
 }
 
-inline uint64_t random_uint64(aug_state *state) {
+static inline uint64_t random_uint64(aug_state *state) {
   return pcg64_random_r(state->rng);
 }
 
-inline uint64_t random_raw_values(aug_state *state) {
+static inline uint64_t random_raw_values(aug_state *state) {
   return random_uint64(state);
 }
 
-inline void set_seed(aug_state *state, pcg128_t seed, pcg128_t inc) {
+static inline void set_seed(aug_state *state, pcg128_t seed, pcg128_t inc) {
   pcg64_srandom_r(state->rng, seed, inc);
 }
 
-inline void advance_state(aug_state *state, pcg128_t delta) {
+static inline void advance_state(aug_state *state, pcg128_t delta) {
   pcg64_advance_r(state->rng, delta);
 }
 
-inline void entropy_init(aug_state *state) {
+static inline void entropy_init(aug_state *state) {
   pcg128_t seeds[2];
   entropy_fill((void *)seeds, sizeof(seeds));
   set_seed(state, seeds[0], seeds[1]);
 }
 
-inline double random_double(aug_state *state) {
+static inline double random_double(aug_state *state) {
   return (random_uint64(state) >> 11) * (1.0 / 9007199254740992.0);
 }
diff --git a/randomstate/interface/random-kit/random-kit-shim.h b/randomstate/interface/random-kit/random-kit-shim.h
@@ -23,21 +23,21 @@ typedef struct s_aug_state {
   uint64_t zig_random_int;
 } aug_state;
 
-inline uint32_t random_uint32(aug_state *state) {
+static inline uint32_t random_uint32(aug_state *state) {
   return randomkit_random(state->rng);
 }
 
-inline uint64_t random_uint64(aug_state *state) {
+static inline uint64_t random_uint64(aug_state *state) {
   return (((uint64_t)randomkit_random(state->rng)) << 32) |
          randomkit_random(state->rng);
 }
 
-inline double random_double(aug_state *state) {
+static inline double random_double(aug_state *state) {
   int32_t a = random_uint32(state) >> 5, b = random_uint32(state) >> 6;
   return (a * 67108864.0 + b) / 9007199254740992.0;
 }
 
-inline uint64_t random_raw_values(aug_state *state) {
+static inline uint64_t random_raw_values(aug_state *state) {
   return (uint64_t)random_uint32(state);
 }
 
diff --git a/randomstate/interface/xoroshiro128plus/xoroshiro128plus-shim.h b/randomstate/interface/xoroshiro128plus/xoroshiro128plus-shim.h
@@ -23,7 +23,7 @@ typedef struct s_aug_state {
 
 } aug_state;
 
-inline uint32_t random_uint32(aug_state *state) {
+static inline uint32_t random_uint32(aug_state *state) {
   uint64_t temp;
   if (state->has_uint32) {
     state->has_uint32 = 0;
@@ -35,15 +35,15 @@ inline uint32_t random_uint32(aug_state *state) {
   return (uint32_t)(temp & 0xFFFFFFFFLL);
 }
 
-inline uint64_t random_uint64(aug_state *state) {
+static inline uint64_t random_uint64(aug_state *state) {
   return xoroshiro128plus_next(state->rng);
 }
 
-inline uint64_t random_raw_values(aug_state *state) {
+static inline uint64_t random_raw_values(aug_state *state) {
   return random_uint64(state);
 }
 
-inline double random_double(aug_state *state) {
+static inline double random_double(aug_state *state) {
   uint64_t rn;
   rn = random_uint64(state);
   return (rn >> 11) * (1.0 / 9007199254740992.0);
diff --git a/randomstate/interface/xorshift1024/xorshift1024-shim.h b/randomstate/interface/xorshift1024/xorshift1024-shim.h
@@ -23,7 +23,7 @@ typedef struct s_aug_state {
 
 } aug_state;
 
-inline uint32_t random_uint32(aug_state *state) {
+static inline uint32_t random_uint32(aug_state *state) {
   uint64_t temp;
   if (state->has_uint32) {
     state->has_uint32 = 0;
@@ -35,15 +35,15 @@ inline uint32_t random_uint32(aug_state *state) {
   return (uint32_t)(temp & 0xFFFFFFFFLL);
 }
 
-inline uint64_t random_uint64(aug_state *state) {
+static inline uint64_t random_uint64(aug_state *state) {
   return xorshift1024_next(state->rng);
 }
 
-inline uint64_t random_raw_values(aug_state *state) {
+static inline uint64_t random_raw_values(aug_state *state) {
   return random_uint64(state);
 }
 
-inline double random_double(aug_state *state) {
+static inline double random_double(aug_state *state) {
   return (random_uint64(state) >> 11) * (1.0 / 9007199254740992.0);
 }
 
diff --git a/randomstate/interface/xorshift128/xorshift128-shim.h b/randomstate/interface/xorshift128/xorshift128-shim.h
@@ -23,7 +23,7 @@ typedef struct s_aug_state {
 
 } aug_state;
 
-inline uint32_t random_uint32(aug_state *state) {
+static inline uint32_t random_uint32(aug_state *state) {
   uint64_t temp;
   if (state->has_uint32) {
     state->has_uint32 = 0;
@@ -35,15 +35,15 @@ inline uint32_t random_uint32(aug_state *state) {
   return (uint32_t)(temp & 0xFFFFFFFFLL);
 }
 
-inline uint64_t random_uint64(aug_state *state) {
+static inline uint64_t random_uint64(aug_state *state) {
   return xorshift128_next(state->rng);
 }
 
-inline uint64_t random_raw_values(aug_state *state) {
+static inline uint64_t random_raw_values(aug_state *state) {
   return random_uint64(state);
 }
 
-inline double random_double(aug_state *state) {
+static inline double random_double(aug_state *state) {
   return (random_uint64(state) >> 11) * (1.0 / 9007199254740992.0);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -26,20 +26,20 @@ typedef struct s_aug_state {`
`26`	`26`	`uint32_t uinteger;`
`27`	`27`	`} aug_state;`
`28`	`28`
`29`		`-inline uint32_t random_uint32(aug_state *state) {`
	`29`	`+static inline uint32_t random_uint32(aug_state *state) {`
`30`	`30`	`return mrg32k3a_random(state->rng);`
`31`	`31`	`}`
`32`	`32`
`33`		`-inline uint64_t random_uint64(aug_state *state) {`
	`33`	`+static inline uint64_t random_uint64(aug_state *state) {`
`34`	`34`	`return (((uint64_t)mrg32k3a_random(state->rng) << 32) \|`
`35`	`35`	`mrg32k3a_random(state->rng));`
`36`	`36`	`}`
`37`	`37`
`38`		`-inline uint64_t random_raw_values(aug_state *state) {`
	`38`	`+static inline uint64_t random_raw_values(aug_state *state) {`
`39`	`39`	`return (uint64_t)random_uint32(state);`
`40`	`40`	`}`
`41`	`41`
`42`		`-inline double random_double(aug_state *state) {`
	`42`	`+static inline double random_double(aug_state *state) {`
`43`	`43`	`int32_t a = random_uint32(state) >> 5, b = random_uint32(state) >> 6;`
`44`	`44`	`return (a * 67108864.0 + b) / 9007199254740992.0;`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,34 +19,34 @@ typedef struct s_aug_state {`
`19`	`19`	`uint64_t zig_random_int;`
`20`	`20`	`} aug_state;`
`21`	`21`
`22`		`-NPY_INLINE uint32_t random_uint32(aug_state *state) {`
	`22`	`+static NPY_INLINE uint32_t random_uint32(aug_state *state) {`
`23`	`23`	`return pcg32_random_r(state->rng);`
`24`	`24`	`}`
`25`	`25`
`26`		`-NPY_INLINE uint64_t random_uint64(aug_state *state) {`
	`26`	`+static NPY_INLINE uint64_t random_uint64(aug_state *state) {`
`27`	`27`	`return (((uint64_t)pcg32_random_r((*state).rng) << 32) \|`
`28`	`28`	`pcg32_random_r((*state).rng));`
`29`	`29`	`}`
`30`	`30`
`31`		`-NPY_INLINE void set_seed(aug_state *state, uint64_t seed, uint64_t inc) {`
	`31`	`+static NPY_INLINE void set_seed(aug_state *state, uint64_t seed, uint64_t inc) {`
`32`	`32`	`pcg32_srandom_r(state->rng, seed, inc);`
`33`	`33`	`}`
`34`	`34`
`35`		`-NPY_INLINE void advance_state(aug_state *state, uint64_t delta) {`
	`35`	`+static NPY_INLINE void advance_state(aug_state *state, uint64_t delta) {`
`36`	`36`	`pcg32_advance_r(state->rng, delta);`
`37`	`37`	`}`
`38`	`38`
`39`		`-NPY_INLINE uint64_t random_raw_values(aug_state *state) {`
	`39`	`+static NPY_INLINE uint64_t random_raw_values(aug_state *state) {`
`40`	`40`	`return (uint64_t)random_uint32(state);`
`41`	`41`	`}`
`42`	`42`
`43`		`-NPY_INLINE void entropy_init(aug_state *state) {`
	`43`	`+static NPY_INLINE void entropy_init(aug_state *state) {`
`44`	`44`	`uint64_t seeds[2];`
`45`	`45`	`entropy_fill((void *)seeds, sizeof(seeds));`
`46`	`46`	`set_seed(state, seeds[0], seeds[1]);`
`47`	`47`	`}`
`48`	`48`
`49`		`-NPY_INLINE double random_double(aug_state *state) {`
	`49`	`+static NPY_INLINE double random_double(aug_state *state) {`
`50`	`50`	`int32_t a = random_uint32(state) >> 5, b = random_uint32(state) >> 6;`
`51`	`51`	`return (a * 67108864.0 + b) / 9007199254740992.0;`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ typedef struct s_aug_state {`
`22`	`22`	`uint64_t zig_random_int;`
`23`	`23`	`} aug_state;`
`24`	`24`
`25`		`-inline uint32_t random_uint32(aug_state *state) {`
	`25`	`+static inline uint32_t random_uint32(aug_state *state) {`
`26`	`26`	`uint64_t temp;`
`27`	`27`	`if (state->has_uint32) {`
`28`	`28`	`state->has_uint32 = 0;`
`@@ -34,28 +34,28 @@ inline uint32_t random_uint32(aug_state *state) {`
`34`	`34`	`return (uint32_t)(temp & 0xFFFFFFFFLL);`
`35`	`35`	`}`
`36`	`36`
`37`		`-inline uint64_t random_uint64(aug_state *state) {`
	`37`	`+static inline uint64_t random_uint64(aug_state *state) {`
`38`	`38`	`return pcg64_random_r(state->rng);`
`39`	`39`	`}`
`40`	`40`
`41`		`-inline uint64_t random_raw_values(aug_state *state) {`
	`41`	`+static inline uint64_t random_raw_values(aug_state *state) {`
`42`	`42`	`return random_uint64(state);`
`43`	`43`	`}`
`44`	`44`
`45`		`-inline void set_seed(aug_state *state, pcg128_t seed, pcg128_t inc) {`
	`45`	`+static inline void set_seed(aug_state *state, pcg128_t seed, pcg128_t inc) {`
`46`	`46`	`pcg64_srandom_r(state->rng, seed, inc);`
`47`	`47`	`}`
`48`	`48`
`49`		`-inline void advance_state(aug_state *state, pcg128_t delta) {`
	`49`	`+static inline void advance_state(aug_state *state, pcg128_t delta) {`
`50`	`50`	`pcg64_advance_r(state->rng, delta);`
`51`	`51`	`}`
`52`	`52`
`53`		`-inline void entropy_init(aug_state *state) {`
	`53`	`+static inline void entropy_init(aug_state *state) {`
`54`	`54`	`pcg128_t seeds[2];`
`55`	`55`	`entropy_fill((void *)seeds, sizeof(seeds));`
`56`	`56`	`set_seed(state, seeds[0], seeds[1]);`
`57`	`57`	`}`
`58`	`58`
`59`		`-inline double random_double(aug_state *state) {`
	`59`	`+static inline double random_double(aug_state *state) {`
`60`	`60`	`return (random_uint64(state) >> 11) * (1.0 / 9007199254740992.0);`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,21 +23,21 @@ typedef struct s_aug_state {`
`23`	`23`	`uint64_t zig_random_int;`
`24`	`24`	`} aug_state;`
`25`	`25`
`26`		`-inline uint32_t random_uint32(aug_state *state) {`
	`26`	`+static inline uint32_t random_uint32(aug_state *state) {`
`27`	`27`	`return randomkit_random(state->rng);`
`28`	`28`	`}`
`29`	`29`
`30`		`-inline uint64_t random_uint64(aug_state *state) {`
	`30`	`+static inline uint64_t random_uint64(aug_state *state) {`
`31`	`31`	`return (((uint64_t)randomkit_random(state->rng)) << 32) \|`
`32`	`32`	`randomkit_random(state->rng);`
`33`	`33`	`}`
`34`	`34`
`35`		`-inline double random_double(aug_state *state) {`
	`35`	`+static inline double random_double(aug_state *state) {`
`36`	`36`	`int32_t a = random_uint32(state) >> 5, b = random_uint32(state) >> 6;`
`37`	`37`	`return (a * 67108864.0 + b) / 9007199254740992.0;`
`38`	`38`	`}`
`39`	`39`
`40`		`-inline uint64_t random_raw_values(aug_state *state) {`
	`40`	`+static inline uint64_t random_raw_values(aug_state *state) {`
`41`	`41`	`return (uint64_t)random_uint32(state);`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ typedef struct s_aug_state {`
`23`	`23`
`24`	`24`	`} aug_state;`
`25`	`25`
`26`		`-inline uint32_t random_uint32(aug_state *state) {`
	`26`	`+static inline uint32_t random_uint32(aug_state *state) {`
`27`	`27`	`uint64_t temp;`
`28`	`28`	`if (state->has_uint32) {`
`29`	`29`	`state->has_uint32 = 0;`
`@@ -35,15 +35,15 @@ inline uint32_t random_uint32(aug_state *state) {`
`35`	`35`	`return (uint32_t)(temp & 0xFFFFFFFFLL);`
`36`	`36`	`}`
`37`	`37`
`38`		`-inline uint64_t random_uint64(aug_state *state) {`
	`38`	`+static inline uint64_t random_uint64(aug_state *state) {`
`39`	`39`	`return xorshift1024_next(state->rng);`
`40`	`40`	`}`
`41`	`41`
`42`		`-inline uint64_t random_raw_values(aug_state *state) {`
	`42`	`+static inline uint64_t random_raw_values(aug_state *state) {`
`43`	`43`	`return random_uint64(state);`
`44`	`44`	`}`
`45`	`45`
`46`		`-inline double random_double(aug_state *state) {`
	`46`	`+static inline double random_double(aug_state *state) {`
`47`	`47`	`return (random_uint64(state) >> 11) * (1.0 / 9007199254740992.0);`
`48`	`48`	`}`
`49`	`49`