diff --git a/Makefile.am b/Makefile.am
index 831cfd2..e5ba361 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,16 +29,18 @@ ccminer_SOURCES = elist.h miner.h compat.h \
groestlcoin.cpp cuda_groestlcoin.cu cuda_groestlcoin.h \
myriadgroestl.cpp cuda_myriadgroestl.cu \
JHA/jackpotcoin.cu JHA/cuda_jha_keccak512.cu \
- JHA/cuda_jha_compactionTest.cu quark/cuda_quark_checkhash.cu \
+ JHA/cuda_jha_compactionTest.cu quark/cuda_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 \
cuda_nist5.cu \
sph/cubehash.c sph/echo.c sph/luffa.c sph/shavite.c sph/simd.c \
sph/hamsi.c sph/hamsi_helper.c sph/sph_hamsi.h \
+ sph/shabal.c sph/whirlpool.c \
x13/x13.cu x13/cuda_x13_hamsi512.cu x13/cuda_x13_fugue512.cu \
x11/x11.cu x11/cuda_x11_luffa512.cu x11/cuda_x11_cubehash512.cu \
- x11/cuda_x11_shavite512.cu x11/cuda_x11_simd512.cu x11/cuda_x11_echo.cu
+ x11/cuda_x11_shavite512.cu x11/cuda_x11_simd512.cu x11/cuda_x11_echo.cu \
+ x15/x14.cu x15/x15.cu x15/cuda_x14_shabal512.cu x15/cuda_x15_whirlpool.cu
ccminer_LDFLAGS = $(PTHREAD_FLAGS) @CUDA_LDFLAGS@
ccminer_LDADD = @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@ @WS2_LIBS@ @CUDA_LIBS@ @OPENMP_CFLAGS@ @LIBS@
diff --git a/README.md b/README.md
index 0a54f7f..af8fd12 100644
--- a/README.md
+++ b/README.md
@@ -2,3 +2,6 @@ ccminer
=======
Christian Buchner's & Christian H.'s CUDA miner project
+
+Fork by tpruvot@github with X14 support
+ BTC donation address: 1AJdfCpLWPNoAMDfHF1wD5y8VgKSSTHxPo
\ No newline at end of file
diff --git a/README.txt b/README.txt
index a40f30e..8212671 100644
--- a/README.txt
+++ b/README.txt
@@ -19,6 +19,10 @@ If you find this tool useful and like to support its continued
SFR donation address: SR4b87aEnPfTs77bo9NnnaV21fiF6jQpAp
MNC donation address: MShgNUSYwybEbXLvJUtdNg1a7rUeiNgooK
BTQ donation address: 13GFwLiZL2DaA9XeE733PNrQX5QYLFsonS
+
+X14/X15 (tpruvot@github)
+ BTC donation address: 1AJdfCpLWPNoAMDfHF1wD5y8VgKSSTHxPo
+
***************************************************************
>>> Introduction <<<
@@ -88,6 +92,7 @@ its command line interface and options.
-P, --protocol-dump verbose dump of protocol-level activities
-B, --background run the miner in the background
--benchmark run in offline benchmark mode
+ --cputest debug hashes from cpu algorithms
-c, --config=FILE load a JSON-format configuration file
-V, --version display version information and exit
-h, --help display this help text and exit
diff --git a/ccminer.sln b/ccminer.sln
index a28278f..783caa5 100644
--- a/ccminer.sln
+++ b/ccminer.sln
@@ -1,6 +1,7 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.30723.0
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ccminer", "ccminer.vcxproj", "{36DC07F9-A4A6-4877-A146-1B960083CF6F}"
EndProject
Global
diff --git a/ccminer.vcxproj b/ccminer.vcxproj
index 93621c4..87567c5 100644
--- a/ccminer.vcxproj
+++ b/ccminer.vcxproj
@@ -1,53 +1,61 @@

-
+
-
- Debug
+
+ Release
Win32
-
+
Debug
- x64
-
-
- Release
Win32
Release
x64
+
+ Debug
+ x64
+
{36DC07F9-A4A6-4877-A146-1B960083CF6F}
ccminer
-
+
Application
- true
+ false
+ true
MultiByte
+ v120
+ false
-
+
Application
true
MultiByte
+ v120
+ false
-
+
Application
false
true
MultiByte
+ v120
+ false
-
+
Application
- false
- true
+ true
MultiByte
+ v120
+ false
-
+
@@ -64,6 +72,8 @@
true
+ $(CUDA_INC_PATH);$(IncludePath)
+ $(CUDA_LIB_PATH);$(LibraryPath)
true
@@ -92,17 +102,15 @@
copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"
- true
+ false
80
true
- true
- compute_35,sm_35
-
-
+ false
+ compute_50,sm_50
@@ -123,7 +131,7 @@ copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"
copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"
- true
+ false
80
@@ -142,7 +150,7 @@ copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"
MaxSpeed
true
true
- WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;SCRYPT_KECCAK512;SCRYPT_CHACHA;SCRYPT_CHOOSE_COMPILETIME;%(PreprocessorDefinitions)
+ WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;CURL_STATICLIB;SCRYPT_KECCAK512;SCRYPT_CHACHA;SCRYPT_CHOOSE_COMPILETIME;MAXWELL_OR_FERMI=1;%(PreprocessorDefinitions)
.;compat;compat\jansson;compat\getopt;..\pthreads\Pre-built.2\include;..\curl-7.29.0\include;..\OpenSSL-Win32\include;%(AdditionalIncludeDirectories);$(CudaToolkitIncludeDir)
@@ -158,18 +166,23 @@ copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"
copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"
- true
+ false
80
true
- true
- compute_35,sm_35
-
-
-
+ false
+ compute_50,sm_50
+ --optimize 2
+
+
+ false
+
+
+ O2
+
@@ -193,7 +206,7 @@ copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"
copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"
- true
+ false
80
@@ -201,7 +214,7 @@ copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"
true
true
- compute_35,sm_35
+ compute_50,sm_50
@@ -216,10 +229,12 @@ copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"
- /TP %(AdditionalOptions)
- /TP %(AdditionalOptions)
- /TP %(AdditionalOptions)
- /TP %(AdditionalOptions)
+ /Tp %(AdditionalOptions)
+ /Tp %(AdditionalOptions)
+ /Tp %(AdditionalOptions)
+ /Tp %(AdditionalOptions)
+ false
+ Full
@@ -227,10 +242,10 @@ copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"
- /TP %(AdditionalOptions)
- /TP %(AdditionalOptions)
- /TP %(AdditionalOptions)
- /TP %(AdditionalOptions)
+ /Tp %(AdditionalOptions)
+ /Tp %(AdditionalOptions)
+ /Tp %(AdditionalOptions)
+ /Tp %(AdditionalOptions)
@@ -242,16 +257,21 @@ copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"
+
+
+
+ true
+
- /TP %(AdditionalOptions)
- /TP %(AdditionalOptions)
- /TP %(AdditionalOptions)
- /TP %(AdditionalOptions)
+ /Tp %(AdditionalOptions)
+ /Tp %(AdditionalOptions)
+ /Tp %(AdditionalOptions)
+ /Tp %(AdditionalOptions)
@@ -277,241 +297,263 @@ copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"
+
+
+
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=yes -v" %(AdditionalOptions)
- -Xptxas "-abi=yes -v" %(AdditionalOptions)
- -Xptxas "-abi=yes -v" %(AdditionalOptions)
- -Xptxas "-abi=yes -v" %(AdditionalOptions)
+ -Xptxas "-abi=yes" %(AdditionalOptions)
+ -Xptxas "-abi=yes" %(AdditionalOptions)
+ -Xptxas "-abi=yes" %(AdditionalOptions)
+ -Xptxas "-abi=yes" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ --ptxas-options=-O3 %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ --ptxas-options=-O3 %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
-
-
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ --ptxas-options=-O3 %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+
+
+ false
+ --ptxas-options=-O3 %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=yes -v" %(AdditionalOptions)
- -Xptxas "-abi=yes -v" %(AdditionalOptions)
- -Xptxas "-abi=yes -v" %(AdditionalOptions)
- -Xptxas "-abi=yes -v" %(AdditionalOptions)
+ -Xptxas "-abi=yes" %(AdditionalOptions)
+ -Xptxas "-abi=yes" %(AdditionalOptions)
+ -Xptxas "-abi=yes" %(AdditionalOptions)
+ -Xptxas "-abi=yes" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ --ptxas-options=-O3 %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ --ptxas-options=-O3 %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ --ptxas-options=-O3 %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- true
- true
- true
- true
+ true
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ --ptxas-options=-O3 %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ --ptxas-options=-O3 %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ --ptxas-options=-O3 %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ --ptxas-options=-O2 %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
128
128
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ --ptxas-options=-O3 %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- true
- true
- true
- true
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ true
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ --ptxas-options=-O3 %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ --ptxas-options=-O3 %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
- -Xptxas "-abi=no -v" %(AdditionalOptions)
+ --ptxas-options=-O2 %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+
+
+ --ptxas-options=-O3 %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+
+
+ --ptxas-options=-O2 %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+
+
+ --ptxas-options=-O2 %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+
+
+ --ptxas-options=-O2 %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
+ %(AdditionalOptions)
-
+
\ No newline at end of file
diff --git a/ccminer.vcxproj.filters b/ccminer.vcxproj.filters
index 2fb6824..f1271e3 100644
--- a/ccminer.vcxproj.filters
+++ b/ccminer.vcxproj.filters
@@ -58,6 +58,9 @@
{d67a2af7-4851-4d21-910e-87791bc8ee35}
+
+ {a2403c22-6777-46ab-a55a-3fcc7386c974}
+
@@ -153,6 +156,15 @@
Source Files\sph
+
+ Source Files\sph
+
+
+ Source Files\sph
+
+
+ Source Files\sph
+
@@ -254,6 +266,12 @@
Header Files\sph
+
+ Header Files\sph
+
+
+ Header Files\sph
+
@@ -268,9 +286,6 @@
Source Files\CUDA\JHA
-
- Source Files\CUDA\quark
-
Source Files\CUDA
@@ -361,5 +376,20 @@
Source Files\CUDA\x13
+
+ Source Files\CUDA
+
+
+ Source Files\CUDA\x15
+
+
+ Source Files\CUDA\x15
+
+
+ Source Files\CUDA\x15
+
+
+ Source Files\CUDA\x15
+
\ No newline at end of file
diff --git a/compat/thrust/system/detail/generic/find.inl b/compat/thrust/system/detail/generic/find.inl
index a3414e1..3d035a7 100644
--- a/compat/thrust/system/detail/generic/find.inl
+++ b/compat/thrust/system/detail/generic/find.inl
@@ -86,7 +86,7 @@ InputIterator find_if(thrust::execution_policy &exec,
// TODO incorporate sizeof(InputType) into interval_threshold and round to multiple of 32
const difference_type interval_threshold = 1 << 20;
- const difference_type interval_size = (std::min)(interval_threshold, n);
+ const difference_type interval_size = min(interval_threshold, n);
// force transform_iterator output to bool
typedef thrust::transform_iterator XfrmIterator;
diff --git a/cpu-miner.c b/cpu-miner.c
index 9e3c3b0..4d97db8 100644
--- a/cpu-miner.c
+++ b/cpu-miner.c
@@ -21,6 +21,7 @@
#include
#ifdef WIN32
#include
+#include
#else
#include
#include
@@ -133,6 +134,8 @@ typedef enum {
ALGO_NIST5,
ALGO_X11,
ALGO_X13,
+ ALGO_X14,
+ ALGO_X15,
ALGO_DMD_GR,
} sha256_algos;
@@ -148,6 +151,8 @@ static const char *algo_names[] = {
"nist5",
"x11",
"x13",
+ "x14",
+ "x15",
"dmd-gr",
};
@@ -222,6 +227,8 @@ Options:\n\
nist5 NIST5 (TalkCoin) hash\n\
x11 X11 (DarkCoin) hash\n\
x13 X13 (MaruCoin) hash\n\
+ x14 X14 hash\n\
+ x15 X15 hash\n\
dmd-gr Diamond-Groestl hash\n\
-d, --devices takes a comma separated list of CUDA devices to use.\n\
Device IDs start counting from 0! Alternatively takes\n\
@@ -258,6 +265,7 @@ Options:\n\
#endif
"\
--benchmark run in offline benchmark mode\n\
+ --cputest debug hashes from cpu algorithms\n\
-c, --config=FILE load a JSON-format configuration file\n\
-V, --version display version information and exit\n\
-h, --help display this help text and exit\n\
@@ -278,6 +286,7 @@ static struct option const options[] = {
{ "background", 0, NULL, 'B' },
#endif
{ "benchmark", 0, NULL, 1005 },
+ { "cputest", 0, NULL, 1006 },
{ "cert", 1, NULL, 1001 },
{ "config", 1, NULL, 'c' },
{ "debug", 0, NULL, 'D' },
@@ -924,6 +933,17 @@ static void *miner_thread(void *userdata)
max_nonce, &hashes_done);
break;
+ case ALGO_X14:
+ rc = scanhash_x14(thr_id, work.data, work.target,
+ max_nonce, &hashes_done);
+ break;
+
+ case ALGO_X15:
+ rc = scanhash_x15(thr_id, work.data, work.target,
+ max_nonce, &hashes_done);
+ exit(0);
+ break;
+
default:
/* should never happen */
goto out;
@@ -1345,6 +1365,10 @@ static void parse_arg (int key, char *arg)
want_stratum = false;
have_stratum = false;
break;
+ case 1006:
+ print_hash_tests();
+ exit(0);
+ break;
case 1003:
want_longpoll = false;
break;
@@ -1481,26 +1505,26 @@ static void signal_handler(int sig)
}
#endif
-#define PROGRAM_VERSION "1.2"
+#define PROGRAM_VERSION "1.2-VC12"
int main(int argc, char *argv[])
{
struct thr_info *thr;
long flags;
int i;
+ printf("*** ccMiner for nVidia GPUs by Christian Buchner and Christian H. ***\n");
+ printf("\t This is version "PROGRAM_VERSION" (tpruvot@github)\n");
#ifdef WIN32
- SYSTEM_INFO sysinfo;
+ printf("\t Built with VC++ 2013 and nVidia CUDA SDK 6.5 RC (DC 5.0)\n\n");
+#else
+ printf("\t Built with the nVidia CUDA SDK 6.5 RC\n\n");
#endif
-
- printf(" *** ccMiner for nVidia GPUs by Christian Buchner and Christian H. ***\n");
- printf("\t This is version "PROGRAM_VERSION" (beta)\n");
printf("\t based on pooler-cpuminer 2.3.2 (c) 2010 Jeff Garzik, 2012 pooler\n");
- printf("\t based on pooler-cpuminer extension for HVC from\n\t https://github.com/heavycoin/cpuminer-heavycoin\n");
- printf("\t\t\tand\n\t http://hvc.1gh.com/\n");
+ printf("\t based on pooler-cpuminer extension for HVC from http://hvc.1gh.com/" "\n\n");
printf("\tCuda additions Copyright 2014 Christian Buchner, Christian H.\n");
- printf("\t LTC donation address: LKS1WDKGED647msBQfLBHV3Ls8sveGncnm\n");
printf("\t BTC donation address: 16hJF5mceSojnTD3ZTUDqdRhDyPJzoRakM\n");
- printf("\t YAC donation address: Y87sptDEcpLkLeAuex6qZioDbvy1qXZEj4\n");
+ printf("\tCuda X14 and X15 added by Tanguy Pruvot (also in cpuminer-multi)\n");
+ printf("\t BTC donation address: 1AJdfCpLWPNoAMDfHF1wD5y8VgKSSTHxPo\n\n");
rpc_user = strdup("");
rpc_pass = strdup("");
diff --git a/cpuminer-config.h b/cpuminer-config.h
index 21c0a1b..21beba3 100644
--- a/cpuminer-config.h
+++ b/cpuminer-config.h
@@ -152,7 +152,7 @@
#define PACKAGE_NAME "ccminer"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "ccminer 2014.06.15"
+#define PACKAGE_STRING "ccminer 2014.08.12"
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -161,7 +161,7 @@
#undef PACKAGE_URL
/* Define to the version of this package. */
-#define PACKAGE_VERSION "2014.06.15"
+#define PACKAGE_VERSION "2014.08.12-VC12"
/* If using the C implementation of alloca, define if you know the
direction of stack growth for your system; otherwise it will be
diff --git a/heavy/heavy.cu b/heavy/heavy.cu
index 98728dc..e306d8a 100644
--- a/heavy/heavy.cu
+++ b/heavy/heavy.cu
@@ -1,10 +1,15 @@
-#include
-#include
#include
#include "cuda_runtime.h"
#include "device_launch_parameters.h"
+
+#include
+#include
+#include
+
#include