Merge branch 'windows' into cuda9

KlausT · Dec 15, 2017 · c3d6245 · c3d6245
2 parents 0bd6247 + c7fa7ac
commit c3d6245
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/README.txt b/README.txt
@@ -1,4 +1,4 @@
-ccMiner release 8.15(KlausT-mod) (November 21th, 2017)
+ccMiner release 8.16(KlausT-mod) (December 15th, 2017)
 ---------------------------------------------------------------
 
 ***************************************************************
@@ -244,6 +244,7 @@ features.
                   fix bug that prevented a reconnect after a connection loss
 2017-11-21 v8.15: support up to 16 GPUs
                   fix problem with not exiting when there's an error
+2017-12-15 v8.16: add sm_71 (Titan cards) (CUDA 9 and newer versions)
 >>> AUTHORS <<<
 
 Notable contributors to this application are:

diff --git a/ccminer-config-win.h b/ccminer-config-win.h
@@ -156,7 +156,7 @@
 #define PACKAGE_NAME "ccminer"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "ccminer 8.15-KlausT"
+#define PACKAGE_STRING "ccminer 8.16-KlausT"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "ccminer"
@@ -165,7 +165,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "8.15-KlausT"
+#define PACKAGE_VERSION "8.16-KlausT"
 
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
@@ -188,7 +188,7 @@
 //#define USE_XOP 1
 
 /* Version number of package */
-#define VERSION "8.15-KlausT"
+#define VERSION "8.16-KlausT"
 
 /* Define curl_free() as free() if our version of curl lacks curl_free. */
 /* #undef curl_free */

diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([ccminer], [8.15-KlausT])
+AC_INIT([ccminer], [8.16-KlausT])
 
 AC_PREREQ([2.59c])
 AC_CANONICAL_SYSTEM

diff --git a/lyra2/lyra2REv2.cu b/lyra2/lyra2REv2.cu
@@ -83,8 +83,14 @@ int scanhash_lyra2v2(int thr_id, uint32_t *pdata,
 
 	cudaDeviceProp props;
 	cudaGetDeviceProperties(&props, device_map[thr_id]);
-
-	if(strstr(props.name, "1080"))
+	if(strstr(props.name, "Titan"))
+	{
+		intensity = 256 * 256 * 15;
+#ifdef _WIN64
+		intensity = 256 * 256 * 22;
+#endif
+	}
+	else if(strstr(props.name, "1080"))
 	{
 		intensity = 256 * 256 * 15;
 #ifdef _WIN64

diff --git a/x11/c11.cu b/x11/c11.cu
@@ -154,7 +154,8 @@ int scanhash_c11(int thr_id, uint32_t *pdata,
 #if defined WIN32 && !defined _WIN64
 		intensity = 256 * 256 * 16;
 #else
-		if(strstr(props.name, "970"))		  intensity = (256 * 256 * 22);
+		if(strstr(props.name, "Titan"))   intensity = (256 * 256 * 22);
+		else if(strstr(props.name, "970"))		  intensity = (256 * 256 * 22);
 		else if(strstr(props.name, "980"))    intensity = (256 * 256 * 22);
 		else if(strstr(props.name, "1070"))   intensity = (256 * 256 * 22);
 		else if(strstr(props.name, "1080"))   intensity = (256 * 256 * 22);

diff --git a/x11/x11.cu b/x11/x11.cu
@@ -157,7 +157,8 @@ extern int scanhash_x11(int thr_id, uint32_t *pdata,
 #if defined WIN32 && !defined _WIN64
 		intensity = 256 * 256 * 16;
 #else
-		if(strstr(props.name, "970"))		  intensity = (256 * 256 * 22);
+		if(strstr(props.name, "Titan"))		  intensity = (256 * 256 * 22);
+		else if(strstr(props.name, "970"))	  intensity = (256 * 256 * 22);
 		else if(strstr(props.name, "980"))    intensity = (256 * 256 * 22);
 		else if(strstr(props.name, "1070"))   intensity = (256 * 256 * 22);
 		else if(strstr(props.name, "1080"))   intensity = (256 * 256 * 22);