diff --git a/cuckoo-miner/src/cuckoo_sys/plugins/CMakeLists.txt b/cuckoo-miner/src/cuckoo_sys/plugins/CMakeLists.txt index c1b517d..e8cd1b2 100644 --- a/cuckoo-miner/src/cuckoo_sys/plugins/CMakeLists.txt +++ b/cuckoo-miner/src/cuckoo_sys/plugins/CMakeLists.txt @@ -162,9 +162,9 @@ build_cpu_target("${AR2_CPU_SRC}" cuckarood_cpu_avx2_29 "-mavx2 -DNSIPHASH=8 -DE ### AR CUDA TARGETS ######################################### -set (AR2_CUDA_SRC cuckoo/src/cuckarood/mean.cu ${BLAKE_2B} ) +set (AR2_CUDA_SRC cuckoo/src/cuckarood/photon.cu cuckoo/src/cuckarood/kernel.cu ${BLAKE_2B} ) if (NOT SKIP_CUCKAROOD_GPU) - build_cuda_target("${AR2_CUDA_SRC}" cuckarood_cuda_19 "-DEPS_A=4 -DEPS_B=3 -DIDXSHIFT=2 -DEDGEBITS=19") + build_cuda_target("${AR2_CUDA_SRC}" cuckarood_cuda_19 "-DXBITS=1 -DEPS_A=4 -DEPS_B=3 -DIDXSHIFT=8 -DEDGEBITS=19") build_cuda_target("${AR2_CUDA_SRC}" cuckarood_cuda_29 "-DEDGEBITS=29") endif() diff --git a/cuckoo-miner/src/cuckoo_sys/plugins/cuckoo b/cuckoo-miner/src/cuckoo_sys/plugins/cuckoo index a69183d..fdbb59c 160000 --- a/cuckoo-miner/src/cuckoo_sys/plugins/cuckoo +++ b/cuckoo-miner/src/cuckoo_sys/plugins/cuckoo @@ -1 +1 @@ -Subproject commit a69183d6bcf192c303b9a64e2fbd17cf9094a90e +Subproject commit fdbb59c508cdb1ad822c6c0c277e0468a30fd096 diff --git a/grin-miner.toml b/grin-miner.toml index 69ca55b..5f88d0d 100644 --- a/grin-miner.toml +++ b/grin-miner.toml @@ -101,20 +101,16 @@ nthreads = 4 # instance of each plugin. device 0 is used by default # -# currently requires 5.5GB+ GPU memory +# currently requires 5GB GPU memory #[[mining.miner_plugin_config]] #plugin_name = "cuckarood_cuda_29" #[mining.miner_plugin_config.parameters] #device = 0 #cpuload = 1 -#ntrims = 176 -#genablocks = 4096 -#genatpb = 128 -#genbtpb = 128 -#trimtpb = 512 -#tailtpb = 1024 -#recoverblocks = 1024 -#recovertpb = 1024 +#ntrims = 458 +#genablocks = 1024 +#recoverblocks = 2048 +#recovertpb = 256 # e.g. To enable multiple devices (copy params from above as needed)