From 4ae778defcc2a2b29ede338cfe1ee937e813eb27 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Mon, 18 Feb 2019 00:09:08 +0100 Subject: [PATCH] include some requested modifications --- src/darkunistd.h | 2 +- src/getopt.c | 2 +- src/go.c | 35 +++++++++++++++++------------------ src/im2col_kernels.cu | 2 +- src/utils.c | 3 +++ 5 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/darkunistd.h b/src/darkunistd.h index bb97da5f..1ba3ef2e 100644 --- a/src/darkunistd.h +++ b/src/darkunistd.h @@ -9,7 +9,7 @@ #include #include /* for _getcwd() and _chdir() */ -#include +#include "getopt.h" #include #include /* for getpid() and the exec..() family */ #include diff --git a/src/getopt.c b/src/getopt.c index 67a764d8..2707e0a8 100644 --- a/src/getopt.c +++ b/src/getopt.c @@ -1,5 +1,5 @@ #ifdef _WIN32 -#include +#include "getopt.h" #ifdef __cplusplus extern "C" { diff --git a/src/go.c b/src/go.c index 2576ecef..54a739d6 100644 --- a/src/go.c +++ b/src/go.c @@ -10,7 +10,8 @@ int inverted = 1; int noi = 1; -static const unsigned int n_ind = 5; +//static const unsigned int n_ind = 5; +#define n_ind 5 typedef struct { char **data; @@ -357,7 +358,7 @@ int generate_move(network net, int player, float *board, int multi, float thresh predict_move(net, board, move, multi); if (player < 0) flip_board(board); - + for(i = 0; i < 19; ++i){ for(j = 0; j < 19; ++j){ if (!legal_go(board, ko, player, i, j)) move[i*19 + j] = 0; @@ -392,7 +393,7 @@ int generate_move(network net, int player, float *board, int multi, float thresh } if(suicide_go(board, player, row, col)){ - return -1; + return -1; } if(suicide_go(board, player, index/19, index%19)) index = max; return index; @@ -461,17 +462,17 @@ void engine_go(char *filename, char *weightfile, int multi) } else if (!strcmp(buff, "known_command")){ char comm[256]; scanf("%s", comm); - int known = (!strcmp(comm, "protocol_version") || - !strcmp(comm, "name") || - !strcmp(comm, "version") || - !strcmp(comm, "known_command") || - !strcmp(comm, "list_commands") || - !strcmp(comm, "quit") || - !strcmp(comm, "boardsize") || - !strcmp(comm, "clear_board") || - !strcmp(comm, "komi") || - !strcmp(comm, "final_status_list") || - !strcmp(comm, "play") || + int known = (!strcmp(comm, "protocol_version") || + !strcmp(comm, "name") || + !strcmp(comm, "version") || + !strcmp(comm, "known_command") || + !strcmp(comm, "list_commands") || + !strcmp(comm, "quit") || + !strcmp(comm, "boardsize") || + !strcmp(comm, "clear_board") || + !strcmp(comm, "komi") || + !strcmp(comm, "final_status_list") || + !strcmp(comm, "play") || !strcmp(comm, "genmove")); if(known) printf("=%s true\n\n", ids); else printf("=%s false\n\n", ids); @@ -575,7 +576,7 @@ void engine_go(char *filename, char *weightfile, int multi) } } fprintf(f, "final_status_list dead\n"); - fclose(f); + fclose(f); #ifdef _WIN32 FILE *p = _popen("./gnugo --mode gtp < game.txt", "r"); #else @@ -716,7 +717,7 @@ float score_game(float *board) } } fprintf(f, "final_score\n"); - fclose(f); + fclose(f); #ifdef _WIN32 FILE *p = _popen("./gnugo --mode gtp < game.txt", "r"); #else @@ -841,5 +842,3 @@ void run_go(int argc, char **argv) else if(0==strcmp(argv[2], "test")) test_go(cfg, weights, multi); else if(0==strcmp(argv[2], "engine")) engine_go(cfg, weights, multi); } - - diff --git a/src/im2col_kernels.cu b/src/im2col_kernels.cu index 876d6ce0..05a89c1b 100644 --- a/src/im2col_kernels.cu +++ b/src/im2col_kernels.cu @@ -1,4 +1,4 @@ -#include +#include #include #include #include diff --git a/src/utils.c b/src/utils.c index 6614f1a8..149a07ff 100644 --- a/src/utils.c +++ b/src/utils.c @@ -13,6 +13,9 @@ #include #endif +#ifndef USE_CMAKE_LIBS +#pragma warning(disable: 4996) +#endif double what_time_is_it_now() {