Skip to content
This repository has been archived by the owner on Jan 9, 2021. It is now read-only.

Commit

Permalink
bump to revision v0.9 (VC++ project files not updated yet)
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian Buchner authored and Christian Buchner committed May 6, 2014
1 parent c5c73b6 commit e049f32
Show file tree
Hide file tree
Showing 16 changed files with 3,020 additions and 1,354 deletions.
9 changes: 7 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ bin_PROGRAMS = ccminer
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 sph/blake.c sph/groestl.c sph/jh.c sph/keccak.c sph/skein.c hefty1.c scrypt.c sha2.c \
sph/sph_blake.h sph/sph_groestl.h sph/sph_jh.h sph/sph_keccak.h sph/sph_skein.h sph/sph_types.h \
cpu-miner.c util.c sph/bmw.c sph/blake.c sph/groestl.c sph/jh.c sph/keccak.c sph/skein.c hefty1.c scrypt.c sha2.c \
sph/bmw.h sph/sph_blake.h sph/sph_groestl.h sph/sph_jh.h sph/sph_keccak.h sph/sph_skein.h sph/sph_types.h \
heavy/heavy.cu \
heavy/cuda_blake512.cu heavy/cuda_blake512.h \
heavy/cuda_combine.cu heavy/cuda_combine.h \
Expand All @@ -30,6 +30,8 @@ ccminer_SOURCES = elist.h miner.h compat.h \
JHA/jackpotcoin.cu JHA/cuda_jha_keccak512.cu \
JHA/cuda_jha_compactionTest.cu quark/cuda_quark_checkhash.cu \
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 \
myriadgroestl.cpp cuda_myriadgroestl.cu

ccminer_LDFLAGS = $(PTHREAD_FLAGS) @CUDA_LDFLAGS@
Expand All @@ -42,5 +44,8 @@ ccminer_CPPFLAGS = -msse2 @LIBCURL_CPPFLAGS@ @OPENMP_CFLAGS@ $(PTHREAD_FLAGS) -f

# ABI requiring code modules
# this module doesn't compile with Compute 2.0 unfortunately
quark/cuda_quark_compactionTest.o: quark/cuda_quark_compactionTest.cu
$(NVCC) -I . -I cudpp-2.1/include @CFLAGS@ -Xptxas "-abi=yes -v" -gencode=arch=compute_30,code=\"sm_30,compute_30\" -gencode=arch=compute_35,code=\"sm_35,compute_35\" --maxrregcount=80 --ptxas-options=-v $(JANSSON_INCLUDES) -o $@ -c $<

JHA/cuda_jha_compactionTest.o: JHA/cuda_jha_compactionTest.cu
$(NVCC) -I . -I cudpp-2.1/include @CFLAGS@ -Xptxas "-abi=yes -v" -gencode=arch=compute_30,code=\"sm_30,compute_30\" -gencode=arch=compute_35,code=\"sm_35,compute_35\" --maxrregcount=80 --ptxas-options=-v $(JANSSON_INCLUDES) -o $@ -c $<
187 changes: 140 additions & 47 deletions Makefile.in

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion README.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

ccMiner release 0.7 (May 01th 2014) - "Jackpot II"
ccMiner release 0.9 (May 06th 2014) - "Say Hi to Quark, Anime"
-------------------------------------------------------------

***************************************************************
Expand All @@ -14,6 +14,8 @@ If you find this tool useful and like to support its continued
DOGE donation address: DT9ghsGmez6ojVdEZgvaZbT2Z3TruXG6yP
HVC donation address: HNN3PyyTMkDo4RkEjkWSGMwqia1yD8mwJN
GRS donation address: FmJKJAhvyHWPeEVeLQHefr2naqgWc9ABTM
JPC donation address: JYFBypVDkk583yKWY4M46TG5vXG8hfgD2U
MNC donation address: MShgNUSYwybEbXLvJUtdNg1a7rUeiNgooK
***************************************************************

>>> Introduction <<<
Expand All @@ -39,6 +41,8 @@ its command line interface and options.
groestl use to mine Groestlcoin
myr-gr use to mine Myriad-Groestl
jackpot use to mine Jackpotcoin
quark use to mine Quarkcoin
anime use to mine Animecoin

-d, --devices gives a comma separated list of CUDA device IDs
to operate on. Device IDs start counting from 0!
Expand Down Expand Up @@ -117,6 +121,8 @@ from your old clunkers.

>>> RELEASE HISTORY <<<

May 6th 2014 this adds the quark and animecoin algorithms.

May 3rd 2014 add the MjollnirCoin hash algorithm for the upcomin
MjollnirCoin relaunch.

Expand Down
20 changes: 10 additions & 10 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for ccminer 2014.04.27.
# Generated by GNU Autoconf 2.68 for ccminer 2014.05.03.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
Expand Down Expand Up @@ -557,8 +557,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='ccminer'
PACKAGE_TARNAME='ccminer'
PACKAGE_VERSION='2014.04.27'
PACKAGE_STRING='ccminer 2014.04.27'
PACKAGE_VERSION='2014.05.03'
PACKAGE_STRING='ccminer 2014.05.03'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''

Expand Down Expand Up @@ -1297,7 +1297,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures ccminer 2014.04.27 to adapt to many kinds of systems.
\`configure' configures ccminer 2014.05.03 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1368,7 +1368,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of ccminer 2014.04.27:";;
short | recursive ) echo "Configuration of ccminer 2014.05.03:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1469,7 +1469,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
ccminer configure 2014.04.27
ccminer configure 2014.05.03
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
Expand Down Expand Up @@ -1972,7 +1972,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by ccminer $as_me 2014.04.27, which was
It was created by ccminer $as_me 2014.05.03, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -2901,7 +2901,7 @@ fi

# Define the identity of the package.
PACKAGE='ccminer'
VERSION='2014.04.27'
VERSION='2014.05.03'


cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -7118,7 +7118,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by ccminer $as_me 2014.04.27, which was
This file was extended by ccminer $as_me 2014.05.03, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -7184,7 +7184,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
ccminer config.status 2014.04.27
ccminer config.status 2014.05.03
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
AC_INIT([ccminer], [2014.05.03])
AC_INIT([ccminer], [2014.05.06])

AC_PREREQ([2.59c])
AC_CANONICAL_SYSTEM
Expand Down
22 changes: 19 additions & 3 deletions cpu-miner.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,9 @@ typedef enum {
ALGO_FUGUE256, /* Fugue256 */
ALGO_GROESTL,
ALGO_MYR_GR,
ALGO_JACKPOT
ALGO_JACKPOT,
ALGO_QUARK,
ALGO_ANIME
} sha256_algos;

static const char *algo_names[] = {
Expand All @@ -135,7 +137,9 @@ static const char *algo_names[] = {
"fugue256",
"groestl",
"myr-gr",
"jackpot"
"jackpot",
"quark",
"anime"
};

bool opt_debug = false;
Expand Down Expand Up @@ -203,6 +207,8 @@ Options:\n\
groestl Groestlcoin hash\n\
myr-gr Myriad-Groestl hash\n\
jackpot Jackpot hash\n\
quark Quark hash\n\
anime Animecoin hash\n\
-d, --devices takes a comma separated list of CUDA devices to use.\n\
Device IDs start counting from 0! Alternatively takes\n\
string names of your cards like gtx780ti or gt640#2\n\
Expand Down Expand Up @@ -877,6 +883,16 @@ static void *miner_thread(void *userdata)
max_nonce, &hashes_done);
break;

case ALGO_QUARK:
rc = scanhash_quark(thr_id, work.data, work.target,
max_nonce, &hashes_done);
break;

case ALGO_ANIME:
rc = scanhash_anime(thr_id, work.data, work.target,
max_nonce, &hashes_done);
break;

default:
/* should never happen */
goto out;
Expand Down Expand Up @@ -1429,7 +1445,7 @@ static void signal_handler(int sig)
}
#endif

#define PROGRAM_VERSION "0.8"
#define PROGRAM_VERSION "0.9"
int main(int argc, char *argv[])
{
struct thr_info *thr;
Expand Down
4 changes: 2 additions & 2 deletions cpuminer-config.h
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
#define PACKAGE_NAME "ccminer"

/* Define to the full name and version of this package. */
#define PACKAGE_STRING "ccminer 2014.05.03"
#define PACKAGE_STRING "ccminer 2014.05.06"

/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
Expand All @@ -161,7 +161,7 @@
#undef PACKAGE_URL

/* Define to the version of this package. */
#define PACKAGE_VERSION "2014.05.03"
#define PACKAGE_VERSION "2014.05.06"

/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
Expand Down
8 changes: 8 additions & 0 deletions miner.h
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,14 @@ extern int scanhash_jackpot(int thr_id, uint32_t *pdata,
const uint32_t *ptarget, uint32_t max_nonce,
unsigned long *hashes_done);

extern int scanhash_quark(int thr_id, uint32_t *pdata,
const uint32_t *ptarget, uint32_t max_nonce,
unsigned long *hashes_done);

extern int scanhash_anime(int thr_id, uint32_t *pdata,
const uint32_t *ptarget, uint32_t max_nonce,
unsigned long *hashes_done);

extern void fugue256_hash(unsigned char* output, const unsigned char* input, int len);
extern void heavycoin_hash(unsigned char* output, const unsigned char* input, int len);
extern void groestlcoin_hash(unsigned char* output, const unsigned char* input, int len);
Expand Down
Loading

0 comments on commit e049f32

Please sign in to comment.