Skip to content

Commit

Permalink
Release v1.4 with blake (NEOS)
Browse files Browse the repository at this point in the history 
Blake256: squashed commit...

Squashed commit of the following:

commit c370208
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Wed Sep 3 13:53:01 2014 +0200

    hashlog: prepare store of scanned range

commit e2cf49a
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Wed Sep 3 12:54:13 2014 +0200

    stratum: store server time offset in context

commit 1a4391d
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Tue Sep 2 12:40:52 2014 +0200

    hashlog: prevent double computing on jobs already done

commit 049e577
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Wed Sep 3 09:49:14 2014 +0200

    tmp blake log

commit 43d3e93
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Wed Sep 3 09:29:51 2014 +0200

    blake: set a max throughput

commit 7e595a3
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Tue Sep 2 21:13:37 2014 +0200

    blake: cleanup, remove d_hash buf, not in a chain

    host: only bencode if gpu hash was found

commit de80c7e
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Tue Sep 2 12:40:44 2014 +0200

    blake: remove unused parameter and fix index in d_hash

    that reduce the speed to 92MH/s but the next commit
    give us 30 more

    so, todo: merge the whole checkhash proc in gpu_hash
              and remove this d_hash buffer...

commit 2d42ae6
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Tue Sep 2 05:09:31 2014 +0200

    stratum: handle a small cache of submitted jobs

    Prevent to send duplicated shares on some pools like hashharder..

    This cache keeps submitted job/nounces of the last 15 minutes

    so, remove exit on repeated duplicate shares,
        the submitted cache now handles this problem.

    Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>

commit 1b8c3c1
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Tue Sep 2 03:38:57 2014 +0200

    debug: a new boolean to log or not json rpc data

commit 1f99aae
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Mon Sep 1 18:49:23 2014 +0200

    exit on repeated duplicate shares (to enhance)

    create a new function proper_exit() to do common stuff on exit...

commit 5307324
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Mon Sep 1 12:22:51 2014 +0200

    blake: use a constant for threads, reduce mallocated d_hash size

    and clean a bit more...

commit 0aeac87
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Mon Sep 1 06:12:55 2014 +0200

    blake: tune up and cleanup, ~100 MH/s on a normal 750Ti

    tested on linux and windows (x86 binary)...

    but there is a high number of duplicated shares... weird

commit 4a52d05
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Mon Sep 1 10:22:32 2014 +0200

    debug: show json methods, hide hash/target if ok

commit 1fb9bec
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Mon Sep 1 08:44:19 2014 +0200

    cpu-miner: sort algos by name, show reject reason

commit bfe96c4
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Mon Aug 25 11:21:06 2014 +0200

    release 1.4, update README...

commit c17d11e
Author: Tanguy Pruvot <tanguy.pruvot@gmail.com>
Date:   Sun Aug 31 08:57:48 2014 +0200

    add "blake" 256, 14 rounds (for NEOS blake, not BlakeCoin)

    also remove "missing" file, its old and not compatible with ubuntu 14.04

to test on windows

blake: clean and optimize

Release v1.4 with blake (NEOS)
  • Loading branch information
@tpruvot
tpruvot committed Sep 5, 2014
1 parent c56af0d commit 3e44e52
Show file tree
Hide file tree
Showing 16 changed files with 984 additions and 482 deletions.
23 changes: 14 additions & 9 deletions Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ ccminer_SOURCES = elist.h miner.h compat.h \
compat/inttypes.h compat/stdbool.h compat/unistd.h \
compat/sys/time.h compat/getopt/getopt.h \
cpu-miner.c util.c hefty1.c scrypt.c \
hashlog.cpp \
heavy/heavy.cu \
heavy/cuda_blake512.cu heavy/cuda_blake512.h \
heavy/cuda_combine.cu heavy/cuda_combine.h \
Expand All @@ -32,7 +33,7 @@ ccminer_SOURCES = elist.h miner.h compat.h \
quark/cuda_jh512.cu quark/cuda_quark_blake512.cu quark/cuda_quark_groestl512.cu quark/cuda_skein512.cu \
quark/cuda_bmw512.cu quark/cuda_quark_keccak512.cu quark/quarkcoin.cu quark/animecoin.cu \
quark/cuda_quark_compactionTest.cu \
cuda_nist5.cu \
cuda_nist5.cu blake32.cu \
sph/bmw.c sph/blake.c sph/groestl.c sph/jh.c sph/keccak.c sph/skein.c \
sph/cubehash.c sph/echo.c sph/luffa.c sph/sha2.c sph/shavite.c sph/simd.c \
sph/hamsi.c sph/hamsi_helper.c sph/sph_hamsi.h \
Expand All @@ -43,6 +44,7 @@ ccminer_SOURCES = elist.h miner.h compat.h \
x15/x14.cu x15/x15.cu x15/cuda_x14_shabal512.cu x15/cuda_x15_whirlpool.cu x15/whirlpool.cu \
x17/x17.cu x17/cuda_x17_haval512.cu x17/cuda_x17_sha512.cu


ccminer_LDFLAGS = $(PTHREAD_FLAGS) @CUDA_LDFLAGS@
ccminer_LDADD = @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@ @WS2_LIBS@ @CUDA_LIBS@ @OPENMP_CFLAGS@ @LIBS@
ccminer_CPPFLAGS = -msse2 @LIBCURL_CPPFLAGS@ @OPENMP_CFLAGS@ $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES) -DSCRYPT_KECCAK512 -DSCRYPT_CHACHA -DSCRYPT_CHOOSE_COMPILETIME
Expand All @@ -51,30 +53,33 @@ nvcc_ARCH = -gencode=arch=compute_50,code=\"sm_50,compute_50\"
#nvcc_ARCH += -gencode=arch=compute_35,code=\"sm_35,compute_35\"
#nvcc_ARCH += -gencode=arch=compute_30,code=\"sm_30,compute_30\"

nvcc_FLAGS = $(nvcc_ARCH) -I . --ptxas-options=-v --use_fast_math
nvcc_FLAGS = $(nvcc_ARCH) -I . @CUDA_CFLAGS@
nvcc_FLAGS += $(JANSSON_INCLUDES)

# we're now targeting all major compute architectures within one binary.
.cu.o:
$(NVCC) $(nvcc_FLAGS) @CFLAGS@ --maxrregcount=128 -o $@ -c $<
$(NVCC) $(nvcc_FLAGS) --maxrregcount=128 -o $@ -c $<

blake32.o: blake32.cu
$(NVCC) $(nvcc_FLAGS) --maxrregcount=64 -o $@ -c $<

# Luffa and Echo are faster with 80 registers than 128
x11/cuda_x11_luffa512.o: x11/cuda_x11_luffa512.cu
$(NVCC) $(nvcc_FLAGS) @CFLAGS@ --maxrregcount=80 -o $@ -c $<
$(NVCC) $(nvcc_FLAGS) --maxrregcount=80 -o $@ -c $<

x11/cuda_x11_echo.o: x11/cuda_x11_echo.cu
$(NVCC) $(nvcc_FLAGS) @CFLAGS@ --maxrregcount=80 -o $@ -c $<
$(NVCC) $(nvcc_FLAGS) --maxrregcount=80 -o $@ -c $<

# Shavite compiles faster with 128 regs
x11/cuda_x11_shavite512.o: x11/cuda_x11_shavite512.cu
$(NVCC) $(nvcc_FLAGS) -I cudpp-2.1/include @CFLAGS@ --maxrregcount=128 -o $@ -c $<
$(NVCC) $(nvcc_FLAGS) -I cudpp-2.1/include --maxrregcount=128 -o $@ -c $<

x17/cuda_x17_sha512.o: x17/cuda_x17_sha512.cu
$(NVCC) $(nvcc_FLAGS) -O2 --maxrregcount=80 -o $@ -c $<
$(NVCC) $(nvcc_FLAGS) --maxrregcount=80 -o $@ -c $<

# ABI requiring code modules
quark/cuda_quark_compactionTest.o: quark/cuda_quark_compactionTest.cu
$(NVCC) $(nvcc_FLAGS) -I cudpp-2.1/include @CFLAGS@ -Xptxas "-abi=yes -v" --maxrregcount=80 -o $@ -c $<
$(NVCC) $(nvcc_FLAGS) -I cudpp-2.1/include --maxrregcount=80 -o $@ -c $<

JHA/cuda_jha_compactionTest.o: JHA/cuda_jha_compactionTest.cu
$(NVCC) $(nvcc_FLAGS) -I cudpp-2.1/include @CFLAGS@ -Xptxas "-abi=yes -v" --maxrregcount=80 -o $@ -c $<
$(NVCC) $(nvcc_FLAGS) -I cudpp-2.1/include --maxrregcount=80 -o $@ -c $<
31 changes: 29 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,32 @@ ccminer

Christian Buchner's &amp; Christian H.'s CUDA miner project

Fork by tpruvot@github with X14 support
BTC donation address: 1AJdfCpLWPNoAMDfHF1wD5y8VgKSSTHxPo
Fork by tpruvot@github with X14,X15,X17,WHIRL and Blake256 support

BTC donation address: 1AJdfCpLWPNoAMDfHF1wD5y8VgKSSTHxPo
[![tip for next commit](https://tip4commit.com/projects/927.svg)](https://tip4commit.com/github/tpruvot/ccminer)

A big part of my recent additions were wrote by [djm34](https://github.com/djm34),
You can also donate some beers (or redbulls)

This variant was tested and built on Linux (ubuntu server 14.04)
and VStudio 2013.

Note that the x86 releases are faster than x64 ones on Windows.

About source code dependencies
------------------------------

This project requires some libraries to be built :

- OpenSSL

- Curl

- pthreads

You can download prebuilt .lib and dll on the [bitcointalk forum thread](https://bitcointalk.org/?topic=167229.0)


There is also a [Tutorial for windows](http://cudamining.co.uk/url/tutorials/id/3) on [CudaMining](http://cudamining.co.uk) website.

15 changes: 15 additions & 0 deletions README.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,14 @@ its command line interface and options.
jackpot use to mine Jackpotcoin
quark use to mine Quarkcoin
anime use to mine Animecoin
blake use to mine NEOS (Blake 256)
nist5 use to mine TalkCoin
fresh use to mine Freshcoin
whirl use to mine Whirlcoin
x11 use to mine DarkCoin
x14 use to mine X14Coin
x15 use to mine Halcyon
x17 use to mine X17

-d, --devices gives a comma separated list of CUDA device IDs
to operate on. Device IDs start counting from 0!
Expand Down Expand Up @@ -98,6 +101,7 @@ its command line interface and options.
--benchmark run in offline benchmark mode
--cputest debug hashes from cpu algorithms
-c, --config=FILE load a JSON-format configuration file
-C, --color display colored output in a linux Terminal
-V, --version display version information and exit
-h, --help display this help text and exit

Expand Down Expand Up @@ -148,6 +152,14 @@ features.

>>> RELEASE HISTORY <<<

Sep. 1st 2014 add X17, optimized x15 and whirl
add blake (256 variant)
color support on Windows,
remove some dll dependencies (pthreads, msvcp)

Aug. 18th 2014 add X14, X15, Whirl, and Fresh algos,
also add colors and nvprof cmd line support

June 15th 2014 add X13 and Diamond Groestl support.
Thanks to tsiv and to Bombadil for the contributions!

Expand Down Expand Up @@ -214,6 +226,9 @@ Notable contributors to this application are:

Christian Buchner, Christian H. (Germany): CUDA implementation

Tanguy Pruvot : CUDA, blake, general code cleanup, tuneup for linux (Makefiles)
and some vstudio 2013 stuff...

and also many thanks to anyone else who contributed to the original
cpuminer application (Jeff Garzik, pooler), it's original HVC-fork
and the HVC-fork available at hvc.1gh.com
Expand Down
Loading

0 comments on commit 3e44e52

Please sign in to comment.