GOSTSec/ccminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/ccminer synced 2025-08-26 13:51:51 +00:00
Code Issues Releases Wiki Activity

x64: link nvml api to allow app. clocks and P0

Browse Source 
_WIN32 is also defined on x64 builds...

+ fix compat/getopt dos2unix (there was mixed CRLF)
This commit is contained in:
Tanguy Pruvot 2015-06-22 14:18:06 +02:00
parent a12dfa5370
commit cb9d51c026
2 changed files with 33 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ccminer.cpp
View File

@ -3227,7 +3227,7 @@ int main(int argc, char *argv[])
} }
#ifdef USE_WRAPNVML #ifdef USE_WRAPNVML
#ifndef WIN32 #if defined(__linux__) || defined(_WIN64)
/* nvml is currently not the best choice on Windows (only in x64) */ /* nvml is currently not the best choice on Windows (only in x64) */
hnvml = nvml_create(); hnvml = nvml_create();
if (hnvml) { if (hnvml) {
@ -3237,11 +3237,12 @@ int main(int argc, char *argv[])
cuda_reset_device(n, NULL); cuda_reset_device(n, NULL);
} }
} }
#else #endif
if (nvapi_init() == 0) #ifdef WIN32
if (!hnvml && nvapi_init() == 0)
applog(LOG_INFO, "NVAPI GPU monitoring enabled."); applog(LOG_INFO, "NVAPI GPU monitoring enabled.");
#endif #endif
else else if (!hnvml)
applog(LOG_INFO, "GPU monitoring is not available."); applog(LOG_INFO, "GPU monitoring is not available.");
#endif #endif

3
compat/getopt/getopt_long.c
View File

@ -54,9 +54,6 @@ static const char rcsid[]="$Id: getopt_long.c,v 1.1 2009/10/16 19:50:28 rodney E
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#if 0
#include <err.h>
#endif
#include <errno.h> #include <errno.h>
#include <getopt.h> #include <getopt.h>
#include <stdlib.h> #include <stdlib.h>