Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ccminer xmr-monero V8 (october2018) fork support needed. #46

Open
wants to merge 208 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
208 commits
Select commit Hold shift + click to select a range
3238b21
update .gitignore
KlausT Sep 6, 2016
6535bcb
switch to VS2013
KlausT Sep 6, 2016
c651fa8
update curl and opennssl for Windows
KlausT Sep 7, 2016
d5b7b0d
add opensdf to .gitignore
KlausT Sep 7, 2016
9449780
fix nonce calculation
KlausT Sep 7, 2016
bad6058
various changes
KlausT Sep 8, 2016
315a087
fix JSON string
KlausT Sep 8, 2016
ab242d8
remove unnecessary shared memory parameter and cudaDeviceSychronize()
KlausT Sep 8, 2016
91eacee
very small optimization
KlausT Sep 8, 2016
2685eeb
add .gitattributes
KlausT Sep 9, 2016
e08c33a
bug fix in blake branch (wrong rotate direction)
KlausT Sep 9, 2016
d2861e5
Release 1.0
KlausT Sep 10, 2016
9577836
minor code cleanup
KlausT Sep 11, 2016
06aac4f
more error checks
KlausT Sep 11, 2016
869457d
remove unnecessary if
KlausT Sep 12, 2016
80c0909
remove cuda_cryptonight_aes.cu
KlausT Sep 17, 2016
bfe8a1b
avoid unnecessary memcpy
KlausT Sep 17, 2016
6f4148c
Revert "remove cuda_cryptonight_aes.cu"
KlausT Sep 17, 2016
8bd0c8c
small speedup (loop unroll)
KlausT Sep 17, 2016
62b2206
keccak optimization
KlausT Sep 17, 2016
c1ed4fa
partially revert last commit
KlausT Sep 17, 2016
5fabba4
Cleanup NVCC, remove space causing compile issues
DrHayt Sep 23, 2016
8c95024
Added keepalive
DrHayt Sep 23, 2016
a16251f
Unused variable warning
DrHayt Sep 23, 2016
c6485dd
Merge pull request #3 from DrHayt/master
KlausT Sep 24, 2016
8d69d06
add missing (char *)
KlausT Sep 24, 2016
a6c438c
update Readme.txt
KlausT Sep 24, 2016
4bcb0c6
update version number to 1.01
KlausT Sep 24, 2016
6745e3c
add sm_20
KlausT Sep 24, 2016
3eda0b9
fix compiler warnings
KlausT Sep 24, 2016
9a26c80
add sm_20 in linux makefile
KlausT Sep 24, 2016
13d4c77
fix compiler warnings (conversion to smaller size)
KlausT Sep 24, 2016
44e305f
bad hack for incompatible gcc versions
KlausT Sep 25, 2016
e9e9f9a
disable broken verification for 64bit builds
KlausT Sep 25, 2016
a278944
add error check
KlausT Sep 26, 2016
669393e
change default launch configuration
KlausT Sep 26, 2016
89b453d
slightly more shares on low difficulty pools
KlausT Sep 26, 2016
118bae5
release version 1.02
KlausT Sep 26, 2016
34ca24b
The compiler option is for NVCC not GCC
ZeroASIC Sep 26, 2016
bb47990
correct parameters for parse_device_config
ZeroASIC Sep 26, 2016
e4d6515
compatibility with CUDA 8
ZeroASIC Sep 27, 2016
ec2664c
some code cleanup
KlausT Sep 27, 2016
421aa94
Merge https://github.com/KlausT/ccminer-cryptonight
ZeroASIC Sep 28, 2016
2805a5f
fix the JSON parsing (submit results)
KlausT Sep 28, 2016
a84d7a7
fix parse_device_config forward declaration
KlausT Sep 28, 2016
b529b1f
enable verification again for 64bit builds
KlausT Sep 28, 2016
4b520ba
prevent nonce overflow when mining on nicehash.com
KlausT Sep 28, 2016
0223d6d
Merge https://github.com/KlausT/ccminer-cryptonight
ZeroASIC Sep 28, 2016
ef4f110
Revert "bad hack for incompatible gcc versions"
KlausT Sep 28, 2016
c665bdb
fix Makefile
KlausT Sep 28, 2016
0ac5794
Show the compiler and CUDA version
KlausT Sep 28, 2016
fce2c4f
Merge https://github.com/KlausT/ccminer-cryptonight
ZeroASIC Sep 28, 2016
bd28c3d
Adjusted the last update
ZeroASIC Sep 28, 2016
1330c4c
(Windows) Switch to CUDA 8
KlausT Sep 28, 2016
8efa050
Release version 1.03
KlausT Sep 28, 2016
408a885
added missing options
ZeroASIC Sep 29, 2016
6b6279a
add VS2015 files to gitignore
KlausT Oct 5, 2016
12b36b5
reduce compiler warnings
KlausT Oct 5, 2016
a052d4a
Merge https://github.com/KlausT/ccminer-cryptonight
ZeroASIC Oct 10, 2016
a82195b
Merge pull request #8 from ZeroASIC/master
KlausT Oct 18, 2016
0d8273c
add sm_37 and sm_62
KlausT Dec 23, 2016
4affec9
less structs, a little bit more speed
KlausT Dec 23, 2016
972d561
avoid compiler warning
KlausT Jan 8, 2017
428f5fe
small optimization for Pascal cards
KlausT Jan 12, 2017
8c5050d
added --color option
KlausT Jan 13, 2017
2f44dff
Update version number
KlausT Jan 13, 2017
5ce7823
change color for debug output
KlausT Jan 14, 2017
14d18d7
use LOG_WARNING for reject reason
KlausT Jan 14, 2017
e038541
switch to v140 platform toolset (VS2015)
KlausT Jan 22, 2017
665f526
fix "struct timespec" redefinition
KlausT Jan 22, 2017
b2f1a6f
(Windows) fix dependencies
KlausT Jan 22, 2017
38ec721
show average hashrate for each gpu
KlausT Jan 22, 2017
438b4bc
Merge branch 'master' into vs2015
KlausT Jan 22, 2017
3af056d
remove unused code
KlausT Jan 22, 2017
0e0655b
Merge branch 'master' into vs2015
KlausT Jan 22, 2017
108d0a2
remove unused code
KlausT Jan 22, 2017
cf8f2ee
Merge branch 'master' into vs2015
KlausT Jan 22, 2017
51cc0f5
more debug output
KlausT Jan 22, 2017
19ee204
remove unused variables
KlausT Jan 22, 2017
1459f72
change eol settings in gitattributes
KlausT Jan 24, 2017
b0b858e
clean up gencode in makefile
KlausT Jan 24, 2017
2a4e591
add debug stuff
KlausT Jan 24, 2017
806eb00
various small changes
KlausT Jan 24, 2017
797a04b
add jansson/Makefile.am again
KlausT Jan 31, 2017
dc02b4e
fix makefile
KlausT Feb 7, 2017
b2a6b9f
small change for pascal cards
KlausT Mar 2, 2017
a5d0c3d
version 2.01
KlausT Mar 2, 2017
d8102ed
call cudaMemset only once
KlausT Mar 17, 2017
828bc6e
less errors at higher block counts (probably)
KlausT Mar 17, 2017
c0d2588
update curl library for Win x64
KlausT May 5, 2017
16ae96c
Ctrl-C handling
KlausT May 6, 2017
f30a433
replace nullptr with NULL
KlausT May 19, 2017
66b9056
Version 2.02
KlausT May 31, 2017
6740c8a
delete unneeded files
KlausT Jun 27, 2017
e535961
add files to .gitignore
KlausT Jun 27, 2017
84f45a5
fix Linux build
KlausT Jun 27, 2017
9660135
add files to .gitignore
KlausT Jun 27, 2017
9990597
Windows: use dll instead of static link and fix the name
KlausT Jun 29, 2017
5accede
move the devicereset function
KlausT Jun 29, 2017
7ccad83
Release 2.03
KlausT Jun 29, 2017
4fde875
Remove unneeded file
esfomeado Jul 7, 2017
a6640f0
Merge pull request #35 from esfomeado/master
KlausT Jul 7, 2017
dd9d613
initialize color codes to avoid crash
KlausT Jul 7, 2017
26f324b
Fix error on VS using getpid()
esfomeado Jul 26, 2017
209ccdc
Merge pull request #40 from esfomeado/master
KlausT Jul 26, 2017
5ee2651
Update Crypto
esfomeado Jul 31, 2017
cc6b0b4
Remove unused code and style fixes
esfomeado Jul 31, 2017
863b5fb
Remove some goto
esfomeado Jul 31, 2017
b4d0f50
Autofind a better value for blocks and threads
esfomeado Jul 31, 2017
1b110cb
Merge pull request #41 from esfomeado/master
KlausT Jul 31, 2017
f1f0755
Cleanup
esfomeado Jul 31, 2017
590f991
Trying to speedup things
esfomeado Jul 31, 2017
ca49c6b
Removed comment
esfomeado Jul 31, 2017
cfc4ff2
Forgot this
esfomeado Jul 31, 2017
a2717ed
fix commit b4d0f509b4ef5cf9c86f85180cf31dfb6e29a9f2
KlausT Jul 31, 2017
01f8a0e
Merge pull request #42 from esfomeado/master
KlausT Jul 31, 2017
320c6f2
Revert "Trying to speedup things"
KlausT Jul 31, 2017
297678d
fix number of blocks in cryptonight_core_gpu_phase2
KlausT Jul 31, 2017
0bf8f30
avoid Intellisense complaints
KlausT Jul 31, 2017
f8760dc
various minor changes
KlausT Jul 31, 2017
404fb6b
Fix for cuda_set_device_config()
esfomeado Aug 1, 2017
637c5e1
Reorganize lib imports
esfomeado Aug 1, 2017
ef5e041
Remove variable not used in cryptonight
esfomeado Aug 1, 2017
0ce1036
Prevent windows to sleep while mining
esfomeado Aug 1, 2017
ee68e6c
Merge pull request #43 from esfomeado/esfomeado
KlausT Aug 1, 2017
1657cf2
fix jansson Makefile.am
KlausT Aug 6, 2017
26fd763
Release 2.04
KlausT Aug 16, 2017
a08b5b8
Update README.md
KlausT Aug 16, 2017
5dd75fb
add missing stddef.h
KlausT Aug 22, 2017
bc614f0
avoid compiler warning
KlausT Sep 12, 2017
4c5c14b
fix bug in the default launch config calculation
KlausT Sep 13, 2017
17d2a28
fix integer overflow
KlausT Sep 13, 2017
fd02107
replace hardcoded number with MAX_GPU
KlausT Sep 16, 2017
e1cfd2a
add error message
KlausT Sep 16, 2017
b1c3d81
show error message when using option -B under Windows
KlausT Sep 16, 2017
bdc0781
update msver()
KlausT Sep 16, 2017
b1f66eb
Release 2.05
KlausT Sep 16, 2017
0674f2e
temporary fix for another "illegal memory access" problem
KlausT Sep 23, 2017
db96072
various small changes
KlausT Sep 23, 2017
c634097
various small changes
KlausT Sep 24, 2017
b62e551
Revert "temporary fix for another "illegal memory access" problem"
KlausT Sep 24, 2017
b496fe0
remove sm_20 and sm_21
KlausT Sep 24, 2017
19205d4
switch to CUDA 9
KlausT Sep 27, 2017
3af4f8c
fix misaligned memory access
KlausT Sep 28, 2017
ca37964
Merge branch 'master' into cuda9
KlausT Sep 28, 2017
e3bab52
fixup! fix misaligned memory access
KlausT Sep 28, 2017
a92ba06
Merge branch 'master' into cuda9
KlausT Sep 28, 2017
957fce2
only one thread per gpu
KlausT Oct 1, 2017
a60e929
Merge branch 'master' into cuda9
KlausT Oct 1, 2017
5eab94a
add error check for the -d option
KlausT Oct 19, 2017
1bfadea
Merge branch 'master' into cuda9
KlausT Oct 19, 2017
8722afc
fix bug that could cause wierd behaviour when you use the -d option
KlausT Oct 19, 2017
5fca3e5
Merge branch 'master' into cuda9
KlausT Oct 19, 2017
c66ab26
fix "illegal memory access" error
KlausT Oct 22, 2017
bedaf00
version 2.06beta
KlausT Oct 26, 2017
d79d0c2
bug fix for the -d option
KlausT Nov 8, 2017
888bf4c
replace 8 with MAX_GPU
KlausT Nov 8, 2017
b640072
increase MAX_GPU to 16
KlausT Nov 26, 2017
31865e0
Release 2.06
KlausT Nov 26, 2017
a6bf21c
add sm_70 (Titan V)
KlausT Dec 8, 2017
a4025ef
fix bug in -d option
KlausT Dec 17, 2017
62e1fbd
Windows: use CUDA 9.1
KlausT Dec 17, 2017
3364c93
Monero Cryptonight variants, and add one for v7
Feb 3, 2018
08ae683
Merge pull request #65 from moneromooo/KlausT
KlausT Feb 12, 2018
1ff4081
rename cpuminer-config.h to cpuminer-config-win.h and increase versio…
KlausT Feb 12, 2018
232b39a
small fix for the nonce range calculation
KlausT Mar 4, 2018
fdb0f78
Updating v1 monero cryptonight tweaks, and less global read/writes
vtnerd Mar 5, 2018
f436b97
Merge pull request #66 from vtnerd/monero-cryptonight-v1
KlausT Feb 24, 2018
69f213a
version 3.01
KlausT Mar 31, 2018
eac89ae
Merge branch 'master' of https://github.com/KlausT/ccminer-cryptonight
KlausT Mar 31, 2018
1677331
fix --color option (requires binaries compiled for Win 10)
KlausT Apr 4, 2018
0c73e40
add algo option so we can choose between old and new algo
KlausT Apr 5, 2018
aa2cf7a
added support for Graft and Stellite forks
KlausT Apr 6, 2018
dc9fbbe
Fix algo_t typedef
ystarnaud Apr 6, 2018
802cef5
Merge pull request #70 from ystarnaud/master
KlausT Apr 6, 2018
34c22ed
Release 3.02
KlausT Apr 6, 2018
ea17d4a
reduce compiler warnings
KlausT Apr 7, 2018
824db32
trying to fix out of memory errors when using the default launch config
KlausT Apr 9, 2018
fec6848
add .vs to .gitignore
KlausT Apr 9, 2018
2adc8e8
Merge branch 'master' of https://github.com/KlausT/ccminer-cryptonight
KlausT Apr 9, 2018
fe333d7
change info text
KlausT Apr 9, 2018
603acac
fix wrong value for memory per thread
KlausT Apr 9, 2018
ee94cda
fix "unspecified launch error" for some cards
KlausT Apr 9, 2018
433c652
Stabilize tab width by using spaces.
andrewachen Apr 12, 2018
62bf7ec
Add Ubuntu Xenial installation instructions.
andrewachen Apr 12, 2018
c9d52ce
Merge pull request #76 from andrewachen/master
KlausT Apr 12, 2018
d7daac7
Intense coin new PoW support
pallas1 Apr 18, 2018
d32d6d0
Intense coin new PoW support
pallas1 Apr 18, 2018
b468cd6
Merge pull request #79 from pallas1/master
KlausT Apr 18, 2018
632b439
fix typo
KlausT Apr 18, 2018
854a8b1
switch to c++ and prepare for cryptonight-heavy
KlausT Apr 20, 2018
7f51457
fix configure.ac
KlausT Apr 22, 2018
b89974b
fix compiler error under Linux
KlausT Apr 22, 2018
5a7e072
fix more compiler errors
KlausT Apr 22, 2018
f227b0b
guess what
KlausT Apr 22, 2018
68623fa
make configure.sh executable
KlausT Apr 23, 2018
f6a83ce
add Electroneum
KlausT Jun 10, 2018
840eff0
lower default launch config for 'M' cards
KlausT Jun 10, 2018
86e9fa3
use stdout instead of stderr
KlausT Jun 10, 2018
3586ded
small change for the benchmark mode
KlausT Jun 11, 2018
8753cf7
increase version number
KlausT Jun 12, 2018
bae1a17
Release 3.03
KlausT Jun 12, 2018
c9ee5e4
fix Stellite algo
KlausT Jun 15, 2018
a035c67
version 3.04
KlausT Jun 15, 2018
412686a
fix memory leak
KlausT Jul 18, 2018
7061f3c
Release 3.05
KlausT Jul 18, 2018
46ce246
add sm_75 (RTX cards)
KlausT Sep 21, 2018
ce20e2b
Release 3.06
KlausT Oct 27, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
11 changes: 11 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
* text=auto

*.am text eol=lf
*.in text eol=lf
*.sh text eol=lf
*.ac text eol=lf
*.txt text eol=crlf
*.vcxproj text eol=crlf
*.sln text eol=crlf

*.cu diff=cpp
82 changes: 81 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,81 @@
cpuminer-config.h
cpuminer-config.h
*.m4
*.in
compat/*.in
compat/jansson/*.in
configure
#ignore thumbnails created by windows
Thumbs.db
#Ignore files build by Visual Studio
*.obj
*.exe
*.pdb
*.user
*.aps
*.pch
*.vspscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.cache
*.ilk
*.log
*.sdf
*.opensdf
[Dd]ebug*/
*.sbr
obj/
[Rr]elease*/
*.db
*.opendb
.deps/ccminer-cpu-miner.Po
.deps/ccminer-cryptonight.Po
.deps/ccminer-sha2.Po
.deps/ccminer-util.Po
ccminer-cpu-miner.o
ccminer-sha2.o
ccminer-util.o
compat/jansson/.deps/dump.Po
compat/jansson/.deps/error.Po
compat/jansson/.deps/hashtable.Po
compat/jansson/.deps/load.Po
compat/jansson/.deps/memory.Po
compat/jansson/.deps/pack_unpack.Po
compat/jansson/.deps/strbuffer.Po
compat/jansson/.deps/utf.Po
compat/jansson/.deps/value.Po
compat/jansson/dump.o
compat/jansson/error.o
compat/jansson/hashtable.o
compat/jansson/jansson_private_config.h
compat/jansson/libjansson.a
compat/jansson/load.o
compat/jansson/Makefile
compat/jansson/memory.o
compat/jansson/pack_unpack.o
compat/jansson/strbuffer.o
compat/jansson/utf.o
compat/jansson/value.o
compat/Makefile
compat/Makefile.in
config.status
cpuminer-config.h
crypto/.deps/ccminer-aesb.Po
crypto/.deps/ccminer-c_blake256.Po
crypto/.deps/ccminer-c_groestl.Po
crypto/.deps/ccminer-c_jh.Po
crypto/.deps/ccminer-c_keccak.Po
crypto/.deps/ccminer-c_skein.Po
crypto/.deps/ccminer-oaes_lib.Po
cryptonight/.deps/.dirstamp
cryptonight/.dirstamp
Makefile
missing
stamp-h1
compat/Makefile.in
cpuminer-config.h
/.vs
20 changes: 16 additions & 4 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -1,9 +1,21 @@

It is advised to run ./autogen.sh before./configure (autoconf and automake
It is advised to run ./autogen.sh before ./configure (autoconf and automake
need to be installed on your system for autogen.sh to work)

./configure has an option named --with-cuda that allows you to specify
where your CUDA 5.5 toolkit is installed (usually /usr/local/cuda-5.5,
but some distros may have a different default location)
but some distros may have a different default location).

On Ubuntu Xenial (16 LTS), here's the rough installation process using cuda 9.0:

# wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/cuda-repo-ubuntu1604_9.1.85-1_amd64.deb
# sudo dpkg -i cuda-repo-ubuntu1604_9.1.85-1_amd64.deb
# sudo apt-key adv --fetch-keys http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1604/x86_64/7fa2af80.pub
# sudo apt-get update
# sudo apt install build-essential automake pkg-config libssl-dev libcurl4-openssl-dev cuda-9-0 nvidia-opencl-dev nvidia-cuda-toolkit

For cuda-9-1, you also need the cuda-nvcc-9-1 package.

See README.txt
# ./autogen.sh
# ./configure --with-cuda=/usr/local/cuda
# make clean
# make
26 changes: 12 additions & 14 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,24 @@ 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 sha2.c \
cpu-miner.cpp util.cpp sha2.cpp \
cryptonight/cryptonight.cu cryptonight/cuda_cryptonight_core.cu cryptonight/cuda_cryptonight_extra.cu \
cryptonight.c \
crypto/oaes_lib.c \
crypto/c_keccak.c \
crypto/c_groestl.c \
crypto/c_blake256.c \
crypto/c_jh.c \
crypto/c_skein.c \
crypto/aesb.c
cryptonight-cpu.cpp \
crypto/oaes_lib.cpp \
crypto/c_keccak.cpp \
crypto/c_groestl.cpp \
crypto/c_blake256.cpp \
crypto/c_jh.cpp \
crypto/c_skein.cpp \
crypto/aesb.cpp


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
ccminer_CPPFLAGS = $(CUDA_CFLAGS) -msse2 @LIBCURL_CPPFLAGS@ @OPENMP_CFLAGS@ $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES) -DSCRYPT_KECCAK512 -DSCRYPT_CHACHA -DSCRYPT_CHOOSE_COMPILETIME

#NVCC_GENCODE = -gencode=arch=compute_35,code=\"sm_35,compute_35\"
#NVCC_GENCODE = -gencode=arch=compute_30,code=\"sm_30,compute_30\" -gencode=arch=compute_35,code=\"sm_35,compute_35\"
NVCC_GENCODE = -gencode=arch=compute_20,code=\"sm_20,compute_20\" -gencode=arch=compute_30,code=\"sm_30,compute_30\" -gencode=arch=compute_35,code=\"sm_35,compute_35\"
NVCC_GENCODE = -D_FORCE_INLINES $(CUDA_CFLAGS) -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35 -gencode=arch=compute_37,code=sm_37 -gencode=arch=compute_50,code=sm_50 -gencode=arch=compute_52,code=sm_52 -gencode=arch=compute_60,code=sm_60 -gencode=arch=compute_61,code=sm_61 -gencode=arch=compute_70,code=sm_70 -gencode=arch=compute_75,code=sm_75

# we're now targeting all major compute architectures within one binary.
.cu.o:
$(NVCC) @CFLAGS@ -I . -Xptxas "-abi=no -v" $(NVCC_GENCODE) --maxrregcount=80 --ptxas-options=-v $(JANSSON_INCLUDES) -o $@ -c $<
$(NVCC) @CFLAGS@ -I . $(NVCC_GENCODE) --maxrregcount=128 $(JANSSON_INCLUDES) -o $@ -c $<
Loading