diff --git a/cuckoo-miner/src/cuckoo_sys/plugins/CMakeLists.txt b/cuckoo-miner/src/cuckoo_sys/plugins/CMakeLists.txt index f0d8376..39c1078 100644 --- a/cuckoo-miner/src/cuckoo_sys/plugins/CMakeLists.txt +++ b/cuckoo-miner/src/cuckoo_sys/plugins/CMakeLists.txt @@ -199,9 +199,11 @@ endif() ### AR CUDA TARGETS ######################################### -set (AR2_CUDA_SRC cuckoo/src/cuckaroom/kernel.cuh cuckoo/src/cuckaroom/mean.cu ${BLAKE_2B} ) +set (AR2_CUDA_SRC cuckoo/src/cuckaroom/meaner.cu ${BLAKE_2B} ) +set (AR2_CUDA_SRC2 cuckoo/src/cuckaroom/kernel.cuh cuckoo/src/cuckaroom/mean.cu ${BLAKE_2B} ) if (NOT SKIP_CUCKAROOM_GPU) - build_cuda_target("${AR2_CUDA_SRC}" cuckaroom_cuda_19 "-DXBITS=1 -DEPS_A=4 -DEPS_B=3 -DIDXSHIFT=8 -DEDGEBITS=19") build_cuda_target("${AR2_CUDA_SRC}" cuckaroom_cuda_29 "-DEDGEBITS=29") + build_cuda_target("${AR2_CUDA_SRC2}" cuckaroom_old_cuda_29 "-DEDGEBITS=29") + build_cuda_target("${AR2_CUDA_SRC2}" cuckaroom_cuda_19 "-DXBITS=1 -DEPS_A=4 -DEPS_B=3 -DIDXSHIFT=8 -DEDGEBITS=19") endif() diff --git a/cuckoo-miner/src/cuckoo_sys/plugins/cuckoo b/cuckoo-miner/src/cuckoo_sys/plugins/cuckoo index f130df8..6000e41 160000 --- a/cuckoo-miner/src/cuckoo_sys/plugins/cuckoo +++ b/cuckoo-miner/src/cuckoo_sys/plugins/cuckoo @@ -1 +1 @@ -Subproject commit f130df876a8d97d7e6056a330068787a8fb430cc +Subproject commit 6000e41bf52627b4cff798bc6d17fbecbc9866f1 diff --git a/grin-miner.toml b/grin-miner.toml index 70dda66..d755f5b 100644 --- a/grin-miner.toml +++ b/grin-miner.toml @@ -104,12 +104,10 @@ nthreads = 4 # currently requires 6GB GPU memory #[[mining.miner_plugin_config]] #plugin_name = "cuckaroom_cuda_29" -# or, prior to 2nd hardfork: plugin_name = "cuckarood_cuda_29" #[mining.miner_plugin_config.parameters] #device = 0 #cpuload = 1 -#ntrims = 399 -# or, prior to 2nd hardfork: ntrims = 31 +#ntrims = 15 #genablocks = 1024 #recoverblocks = 2048 #recovertpb = 256