From 78f2dd6ffdb285f5cedf198812eb3edc6a93029b Mon Sep 17 00:00:00 2001 From: Tanguy Pruvot Date: Sat, 6 Dec 2014 13:03:25 +0100 Subject: [PATCH] lyra2: reduce default intensity on windows --- lyra2/Sponge.c | 2 +- lyra2/lyra2RE.cu | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lyra2/Sponge.c b/lyra2/Sponge.c index bdf4397..e0a001e 100644 --- a/lyra2/Sponge.c +++ b/lyra2/Sponge.c @@ -744,7 +744,7 @@ inline void reducedDuplexRowd(uint64_t *state, uint64_t *rowIn, uint64_t *rowInO Prints an array of unsigned chars */ void printArray(unsigned char *array, unsigned int size, char *name) { - int i; + unsigned int i; printf("%s: ", name); for (i = 0; i < size; i++) { printf("%2x|", array[i]); diff --git a/lyra2/lyra2RE.cu b/lyra2/lyra2RE.cu index 03003ce..60ed22a 100644 --- a/lyra2/lyra2RE.cu +++ b/lyra2/lyra2RE.cu @@ -11,11 +11,6 @@ extern "C" { static _ALIGN(64) uint64_t *d_hash[8]; -extern void quark_check_cpu_init(int thr_id, int threads); -extern void quark_check_cpu_setTarget(const void *ptarget); -extern uint32_t quark_check_cpu_hash_64(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint32_t *d_inputHash, int order); -extern uint32_t quark_check_cpu_hash_64_2(int thr_id, int threads, uint32_t startNounce, uint32_t *d_nonceVector, uint64_t *d_inputHash, int order); - extern void blake256_cpu_init(int thr_id, int threads); extern void blake256_cpu_hash_80(const int thr_id, const uint32_t threads, const uint32_t startNonce, uint64_t *Hash, int order); extern void blake256_cpu_setBlock_80(uint32_t *pdata); @@ -68,7 +63,7 @@ extern "C" int scanhash_lyra(int thr_id, uint32_t *pdata, unsigned long *hashes_done) { const uint32_t first_nonce = pdata[19]; - int intensity = (device_sm[device_map[thr_id]] >= 500) ? 19 : 18; + int intensity = (device_sm[device_map[thr_id]] >= 500 && !is_windows()) ? 19 : 18; int throughput = opt_work_size ? opt_work_size : (1 << intensity); // 18=256*256*4; throughput = min(throughput, (int)(max_nonce - first_nonce));