diff --git a/Egaroucid.sln b/Egaroucid.sln index e31fe3059..d9d6aeb0f 100644 --- a/Egaroucid.sln +++ b/Egaroucid.sln @@ -7,21 +7,30 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Egaroucid", "Egaroucid.vcxp EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + AVX512_Portable|x64 = AVX512_Portable|x64 AVX512|x64 = AVX512|x64 Debug|x64 = Debug|x64 + Generic_Portable|x64 = Generic_Portable|x64 Generic|x64 = Generic|x64 Release|x64 = Release|x64 + SIMD_Portable|x64 = SIMD_Portable|x64 SIMD|x64 = SIMD|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4F8EE9C0-59CC-4FFF-ADD7-4EC8BA4CEE3C}.AVX512_Portable|x64.ActiveCfg = AVX512_Portable|x64 + {4F8EE9C0-59CC-4FFF-ADD7-4EC8BA4CEE3C}.AVX512_Portable|x64.Build.0 = AVX512_Portable|x64 {4F8EE9C0-59CC-4FFF-ADD7-4EC8BA4CEE3C}.AVX512|x64.ActiveCfg = AVX512|x64 {4F8EE9C0-59CC-4FFF-ADD7-4EC8BA4CEE3C}.AVX512|x64.Build.0 = AVX512|x64 {4F8EE9C0-59CC-4FFF-ADD7-4EC8BA4CEE3C}.Debug|x64.ActiveCfg = Debug|x64 {4F8EE9C0-59CC-4FFF-ADD7-4EC8BA4CEE3C}.Debug|x64.Build.0 = Debug|x64 + {4F8EE9C0-59CC-4FFF-ADD7-4EC8BA4CEE3C}.Generic_Portable|x64.ActiveCfg = Generic_Portable|x64 + {4F8EE9C0-59CC-4FFF-ADD7-4EC8BA4CEE3C}.Generic_Portable|x64.Build.0 = Generic_Portable|x64 {4F8EE9C0-59CC-4FFF-ADD7-4EC8BA4CEE3C}.Generic|x64.ActiveCfg = Generic|x64 {4F8EE9C0-59CC-4FFF-ADD7-4EC8BA4CEE3C}.Generic|x64.Build.0 = Generic|x64 {4F8EE9C0-59CC-4FFF-ADD7-4EC8BA4CEE3C}.Release|x64.ActiveCfg = Release|x64 {4F8EE9C0-59CC-4FFF-ADD7-4EC8BA4CEE3C}.Release|x64.Build.0 = Release|x64 + {4F8EE9C0-59CC-4FFF-ADD7-4EC8BA4CEE3C}.SIMD_Portable|x64.ActiveCfg = SIMD_Portable|x64 + {4F8EE9C0-59CC-4FFF-ADD7-4EC8BA4CEE3C}.SIMD_Portable|x64.Build.0 = SIMD_Portable|x64 {4F8EE9C0-59CC-4FFF-ADD7-4EC8BA4CEE3C}.SIMD|x64.ActiveCfg = SIMD|x64 {4F8EE9C0-59CC-4FFF-ADD7-4EC8BA4CEE3C}.SIMD|x64.Build.0 = SIMD|x64 EndGlobalSection diff --git a/Egaroucid.vcxproj b/Egaroucid.vcxproj index 88e14db6c..ea3d6aea5 100644 --- a/Egaroucid.vcxproj +++ b/Egaroucid.vcxproj @@ -1,6 +1,10 @@  + + AVX512_Portable + x64 + AVX512 x64 @@ -9,6 +13,10 @@ Debug x64 + + Generic_Portable + x64 + Generic x64 @@ -17,6 +25,10 @@ Release x64 + + SIMD_Portable + x64 + SIMD x64 @@ -50,6 +62,13 @@ true Unicode + + Application + false + v143 + true + Unicode + Application false @@ -57,6 +76,13 @@ true Unicode + + Application + false + v143 + true + Unicode + Application false @@ -64,6 +90,13 @@ true Unicode + + Application + false + v143 + true + Unicode + @@ -78,12 +111,21 @@ + + + + + + + + + true @@ -110,6 +152,14 @@ $(SIV3D_0_6_15)\include;$(SIV3D_0_6_15)\include\ThirdParty;$(IncludePath) $(SIV3D_0_6_15)\lib\Windows;$(LibraryPath) + + false + bin\ + $(SolutionDir)Intermediate\$(ProjectName)\Release\Intermediate\ + $(ProjectDir)App + $(SIV3D_0_6_15)\include;$(SIV3D_0_6_15)\include\ThirdParty;$(IncludePath) + $(SIV3D_0_6_15)\lib\Windows;$(LibraryPath) + false bin\ @@ -118,6 +168,14 @@ $(SIV3D_0_6_15)\include;$(SIV3D_0_6_15)\include\ThirdParty;$(IncludePath) $(SIV3D_0_6_15)\lib\Windows;$(LibraryPath) + + false + bin\ + $(SolutionDir)Intermediate\$(ProjectName)\Release\Intermediate\ + $(ProjectDir)App + $(SIV3D_0_6_15)\include;$(SIV3D_0_6_15)\include\ThirdParty;$(IncludePath) + $(SIV3D_0_6_15)\lib\Windows;$(LibraryPath) + false bin\ @@ -126,6 +184,14 @@ $(SIV3D_0_6_15)\include;$(SIV3D_0_6_15)\include\ThirdParty;$(IncludePath) $(SIV3D_0_6_15)\lib\Windows;$(LibraryPath) + + false + bin\ + $(SolutionDir)Intermediate\$(ProjectName)\Release\Intermediate\ + $(ProjectDir)App + $(SIV3D_0_6_15)\include;$(SIV3D_0_6_15)\include\ThirdParty;$(IncludePath) + $(SIV3D_0_6_15)\lib\Windows;$(LibraryPath) + bin @@ -219,6 +285,42 @@ xcopy /I /D /Y "LICENSE" "bin" xcopy /I /D /Y "bin\resources\book.egbk3" "bin\document" +xcopy /I /D /Y "LICENSE" "bin" + + + + + Level4 + MaxSpeed + true + true + true + NDEBUG;_WINDOWS;_ENABLE_EXTENDED_ALIGNED_STORAGE;_SILENCE_CXX20_CISO646_REMOVED_WARNING;_SILENCE_ALL_CXX23_DEPRECATION_WARNINGS;_SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS;%(PreprocessorDefinitions) + true + true + MultiThreaded + stdcpplatest + 26451;26812;%(DisableSpecificWarnings) + /Zc:__cplusplus /source-charset:utf-8 /D "HAS_AVX512" /D "GUI_PORTABLE" %(AdditionalOptions) + NotUsing + stdafx.h;%(ForcedIncludeFiles) + false + + + AnySuitable + Size + true + true + + + true + true + true + Windows + advapi32.dll;crypt32.dll;dwmapi.dll;gdi32.dll;imm32.dll;ole32.dll;oleaut32.dll;opengl32.dll;shell32.dll;shlwapi.dll;user32.dll;winmm.dll;ws2_32.dll;%(DelayLoadDLLs) + + + xcopy /I /D /Y "bin\resources\book.egbk3" "bin\document" xcopy /I /D /Y "LICENSE" "bin" @@ -255,6 +357,42 @@ xcopy /I /D /Y "LICENSE" "bin" xcopy /I /D /Y "bin\resources\book.egbk3" "bin\document" +xcopy /I /D /Y "LICENSE" "bin" + + + + + Level4 + MaxSpeed + true + true + true + NDEBUG;_WINDOWS;_ENABLE_EXTENDED_ALIGNED_STORAGE;_SILENCE_CXX20_CISO646_REMOVED_WARNING;_SILENCE_ALL_CXX23_DEPRECATION_WARNINGS;_SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS;%(PreprocessorDefinitions) + true + true + MultiThreaded + stdcpplatest + 26451;26812;%(DisableSpecificWarnings) + /Zc:__cplusplus /source-charset:utf-8 /D "HAS_NO_AVX2" /D "GUI_PORTABLE" %(AdditionalOptions) + NotUsing + stdafx.h;%(ForcedIncludeFiles) + false + + + AnySuitable + Size + true + true + + + true + true + true + Windows + advapi32.dll;crypt32.dll;dwmapi.dll;gdi32.dll;imm32.dll;ole32.dll;oleaut32.dll;opengl32.dll;shell32.dll;shlwapi.dll;user32.dll;winmm.dll;ws2_32.dll;%(DelayLoadDLLs) + + + xcopy /I /D /Y "bin\resources\book.egbk3" "bin\document" xcopy /I /D /Y "LICENSE" "bin" @@ -291,6 +429,42 @@ xcopy /I /D /Y "LICENSE" "bin" xcopy /I /D /Y "bin\resources\book.egbk3" "bin\document" +xcopy /I /D /Y "LICENSE" "bin" + + + + + Level4 + MaxSpeed + true + true + true + NDEBUG;_WINDOWS;_ENABLE_EXTENDED_ALIGNED_STORAGE;_SILENCE_CXX20_CISO646_REMOVED_WARNING;_SILENCE_ALL_CXX23_DEPRECATION_WARNINGS;_SILENCE_ALL_MS_EXT_DEPRECATION_WARNINGS;%(PreprocessorDefinitions) + true + true + MultiThreaded + stdcpplatest + 26451;26812;%(DisableSpecificWarnings) + /Zc:__cplusplus /source-charset:utf-8 /D "GUI_PORTABLE" %(AdditionalOptions) + NotUsing + stdafx.h;%(ForcedIncludeFiles) + false + + + AnySuitable + Size + true + true + + + true + true + true + Windows + advapi32.dll;crypt32.dll;dwmapi.dll;gdi32.dll;imm32.dll;ole32.dll;oleaut32.dll;opengl32.dll;shell32.dll;shlwapi.dll;user32.dll;winmm.dll;ws2_32.dll;%(DelayLoadDLLs) + + + xcopy /I /D /Y "bin\resources\book.egbk3" "bin\document" xcopy /I /D /Y "LICENSE" "bin" diff --git a/bin/ggs/ggs_client_parallel.py b/bin/ggs/ggs_client_parallel.py new file mode 100644 index 000000000..8eb5b2c30 --- /dev/null +++ b/bin/ggs/ggs_client_parallel.py @@ -0,0 +1,444 @@ +import telnetlib +import subprocess +import datetime +import time +import sys + +opponent_id = None +if len(sys.argv) >= 2: + opponent_id = sys.argv[1] + +with open('id/ggs_id.txt', 'r') as f: + ggs_id = f.read() +with open('id/ggs_pw.txt', 'r') as f: + ggs_pw = f.read() +with open('id/ggs_server.txt', 'r') as f: + ggs_server = f.read() +with open('id/ggs_port.txt', 'r') as f: + ggs_port = f.read() + +# launch Egaroucid +d_today = str(datetime.date.today()) +t_now = str(datetime.datetime.now().time()) +logfile_egaroucid0 = 'log/' + d_today.replace('-', '') + '_' + t_now.split('.')[0].replace(':', '') + '_egaroucid_0.txt' +logfile_egaroucid1 = 'log/' + d_today.replace('-', '') + '_' + t_now.split('.')[0].replace(':', '') + '_egaroucid_1.txt' +logfile_client = 'log/' + d_today.replace('-', '') + '_' + t_now.split('.')[0].replace(':', '') + '_client.txt' + +color_dic = {"black":"\033[30m", "red":"\033[31m", "green":"\033[32m", "yellow":"\033[33m", "blue":"\033[34m", "end":"\033[0m"} + +def print_log(*args): + txt = ' '.join([str(elem) for elem in args]) + with open(logfile_client, 'a') as f: + d_today = str(datetime.date.today()) + t_now = str(datetime.datetime.now().time()) + date_time_str = d_today.replace('-', '') + '_' + t_now.split('.')[0].replace(':', '') + f.write(date_time_str + '\t') + f.write(txt + '\n') + print(txt) + +def print_log_color(*args, color='red'): + txt = ' '.join([str(elem) for elem in args]) + with open(logfile_client, 'a') as f: + d_today = str(datetime.date.today()) + t_now = str(datetime.datetime.now().time()) + date_time_str = d_today.replace('-', '') + '_' + t_now.split('.')[0].replace(':', '') + f.write(date_time_str + '\t') + f.write(txt + '\n') + print(color_dic[color] + txt + color_dic["end"]) + + +print_log('log files', logfile_egaroucid0, logfile_egaroucid1, logfile_client) + +n_threads = 4 +egaroucid_cmd0 = './../Egaroucid_for_Console_GGS_Tournament/Egaroucid_for_Console_clang.exe -nobook -t ' + str(n_threads) + ' -quiet -noise -ponder -showvalue -noautopass -hash 30 -logfile ' + logfile_egaroucid0 +egaroucid_cmd1 = './../Egaroucid_for_Console_GGS_Tournament/Egaroucid_for_Console_clang.exe -nobook -t ' + str(n_threads) + ' -quiet -noise -ponder -showvalue -noautopass -hash 30 -logfile ' + logfile_egaroucid1 +egaroucids = [ + subprocess.Popen(egaroucid_cmd0.split(), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL), + subprocess.Popen(egaroucid_cmd1.split(), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) +] + + + + +# telnet +tn = telnetlib.Telnet(ggs_server, ggs_port) + + + + +def fill0(n, r): + res = str(n) + return '0' * (r - len(res)) + res + +def ggs_wait_ready(timeout=None): + output = tn.read_until(b"READY", timeout=timeout).decode("utf-8") + output = output.replace('\r', '').replace('\n\n', '\n') + if len(output): + print_log(output) + return output + + + +def ggs_os_ask_game(tl1, tl2, tl3, game_type, user): + tl1_str = fill0(tl1 // 60, 2) + ':' + fill0(tl1 % 60, 2) + tl2_str = fill0(tl2 // 60, 2) + ':' + fill0(tl2 % 60, 2) + tl3_str = fill0(tl3 // 60, 2) + ':' + fill0(tl3 % 60, 2) + cmd = 'ts ask ' + game_type + ' ' + tl1_str + '/' + tl2_str + '/' + tl3_str + ' ' + user + print_log_color('[INFO] ask game ' + cmd, color='green') + tn.write((cmd + '\n').encode('utf-8')) + +def ggs_os_resume_stored_game(game_id): + cmd = 'ts ask ' + game_id + print_log_color('[INFO] ask stored game ' + cmd, color='green') + tn.write((cmd + '\n').encode('utf-8')) + + +def ggs_os_get_info(s): + ss = s.splitlines() + for line in ss: + if line[:4] == '/os:': + return line + return '' + +def ggs_os_is_game_request(s): + ss = s.split() + if len(ss) == 10 or len(ss) == 11: + return ss[1] == '+' and ss[9] == ggs_id + return False + +def ggs_os_get_received_game_info(s): + data = s.split() + if len(data) == 10 or len(data) == 11: + game_id = data[2] + opponent = data[4] + if len(data) == 10: + raw_tls = data[5].split('/') + else: + raw_tls = data[10].split('/') + tls = [0, 0, 0] + if len(raw_tls) == 3: + for i in range(3): + if raw_tls[i] != '': + tls[i] = int(raw_tls[i].split(':')[0]) * 60 + int(raw_tls[i].split(':')[1]) # seconds + else: + tls[i] = 0 + game_type = data[6] + return game_id, tls[0], tls[1], tls[2], opponent, game_type + print_log_color('[ERROR] cannot receive game : ' + s, color='red') + +def ggs_os_accept_game(request_id): + print_log_color('[INFO] accept game : ' + request_id, color='green') + tn.write(('ts accept ' + request_id + '\n').encode('utf-8')) + + +def ggs_os_is_game_end(s): + ss = s.split() + if ggs_id in ss: + if len(ss) >= 2: + return ss[1] == 'end' + return False + +def ggs_os_is_start_game(s): + ss = s.split() + if ggs_id in ss: + if len(ss) > 3: + return ss[1] == '+' and ss[2] == 'match' + return False + +def ggs_os_is_game_terminated(s): + ss = s.split() + if ggs_id in ss: + if len(ss) > 3: + return ss[1] == '-' + return False + +def ggs_os_start_game_get_id(s): + ss = s.split() + if ggs_id in ss: + if len(ss) > 4: + return ss[3] + print_log_color('[ERROR] cannot receive game id: ' + s, color='red') + + +def ggs_os_is_board_info(s): + ss = s.split() + if len(ss) > 2: + return ss[1] == 'update' or ss[1] == 'join' + return False + +def ggs_os_board_info_get_id(s): + ss = s.split() + if len(ss) >= 3: + return ss[2] + print_log_color('[ERROR] cannot receive game id: ' + s, color='red') + +def ggs_os_get_board(s): + raw_data = s.splitlines() + data = [] + for datum in raw_data: + if len(datum): + if datum[0] == '|': + data.append(datum) + + try: + last_move = data[0].split()[2][:2] + except: + last_move = '' + + me_color = '' + me_remaining_time = 0 + for datum in data: + if datum.find(ggs_id) >= 0: + line = datum.split() + if line[2][0] == '*': + me_color = 'X' + elif line[2][0] == 'O': + me_color = 'O' + else: + print_log_color('[ERROR] invalid color: ' + datum, color='red') + raw_me_remaining_time = line[3].split(',')[0] + me_remaining_time = int(raw_me_remaining_time.split(':')[0]) * 60 + int(raw_me_remaining_time.split(':')[1]) + #print_log('[INFO]', 'me_color', me_color, 'me_remaining_time', me_remaining_time) + raw_player = '' + for datum in data: + player_info_place = datum.find(' to move') + if player_info_place >= 1: + raw_player = datum[player_info_place - 1] + break + #print_log('[INFO]', 'raw_player', raw_player) + if raw_player == '*': + color_to_move = 'X' + elif raw_player == 'O': + color_to_move = 'O' + else: + print_log_color('[ERROR] cannot recognize player: ' + raw_player, color='red') + #print_log('[INFO]', 'color_to_move', color_to_move) + + raw_board = '' + got_coord = False + for datum in data: + if datum.find("A B C D E F G H") >= 0: + if got_coord: + break + else: + got_coord = True + if got_coord: + raw_board += datum + #print_log(raw_board) + board = raw_board.replace('A B C D E F G H', '').replace('\r', '').replace('\n', '').replace('|', '').replace(' ', '') + for i in range(1, 9): + board = board.replace(str(i), '') + board = board.replace('*', 'X') + ' ' + color_to_move + #print_log('[INFO]', 'board', board) + + return last_move, me_color, me_remaining_time, board, color_to_move + + + + + + + + + +def ggs_os_play_move(game_id, coord, value): + cmd = 't /os play ' + game_id + ' ' + coord + '/' + value + tn.write((cmd + '\n').encode('utf-8')) + + + + +def ggs_os_is_synchro(game_id): + return len(game_id.split('.')) == 3 + +def ggs_os_get_synchro_id(game_id): + return int(game_id.split('.')[2]) + + + + + + +def idx_to_coord_str_rev(coord): + x = coord % 8 + y = coord // 8 + return chr(ord('a') + x) + str(y + 1) + +def egaroucid_play_move(eg_idx, move): + cmd = 'play ' + move + #print_log_color('[INFO] Egaroucid play : ' + cmd, color='green') + egaroucids[eg_idx].stdin.write((cmd + '\n').encode('utf-8')) + egaroucids[eg_idx].stdin.flush() + +def egaroucid_settime(eg_idx, color, time_limit): + cmd = 'settime ' + color + ' ' + str(time_limit) + #print_log_color('[INFO] Egaroucid settime : ' + cmd, color='green') + egaroucids[eg_idx].stdin.write((cmd + '\n').encode('utf-8')) + egaroucids[eg_idx].stdin.flush() + +def egaroucid_setboard(eg_idx, board): + cmd = 'setboard ' + board + #print_log_color('[INFO] Egaroucid setboard : ' + cmd, color='green') + egaroucids[eg_idx].stdin.write((cmd + '\n').encode('utf-8')) + egaroucids[eg_idx].stdin.flush() + +def egaroucid_get_move_score(eg_idx): + cmd = 'go' + #print_log_color('[INFO] Egaroucid go : ' + cmd, color='green') + egaroucids[eg_idx].stdin.write((cmd + '\n').encode('utf-8')) + egaroucids[eg_idx].stdin.flush() + line = egaroucids[eg_idx].stdout.readline().decode().replace('\r', '').replace('\n', '') + coord = line.split()[0] + value = line.split()[1] + return coord, value + +def egaroucid_clearcache(eg_idx): + cmd = 'clearcache' + print_log_color('[INFO] Egaroucid clearcache : ' + cmd, color='green') + egaroucids[eg_idx].stdin.write((cmd + '\n').encode('utf-8')) + egaroucids[eg_idx].stdin.flush() + +# login +tn.read_until(b": Enter login (yours, or one you'd like to use).") +tn.write((ggs_id + '\n').encode('utf-8')) +tn.read_until(b": Enter your password.") +tn.write((ggs_pw + '\n').encode('utf-8')) +ggs_wait_ready() +ggs_wait_ready() +ggs_wait_ready() +ggs_wait_ready() +ggs_wait_ready() + +# setup +tn.write(b"ms /os\n") +ggs_wait_ready() +tn.write(b"ts client -\n") +ggs_wait_ready() + +print_log_color('[INFO] Initialized!', color='green') + + +playing_game_id = '' +n_game_playing = 0 +asking_game = False + +transcripts = [['', []], ['', []]] + +n_played = 0 + +board_sent = [False, False] + +egaroucid_clearcache(0) +egaroucid_clearcache(1) + +while True: + #while n_played < 1: + #''' + if n_game_playing == 0: + ggs_cmd_input = input('please input cmd: ') + if ggs_cmd_input: + print_log_color('[INFO]', 'got command', ggs_cmd_input, color='green') + tn.write((ggs_cmd_input + '\n').encode('utf-8')) + #if ggs_cmd_input[:6] == 'ts ask': + # asking_game = True + #''' + ''' + if (n_game_playing == 0) and (not asking_game) and opponent_id != None: + ggs_os_ask_game(480, 0, 0, 's8r18', opponent_id) + asking_game = True + #''' + ''' + if (n_game_playing == 0) and (not asking_game): + ggs_os_resume_stored_game('.33923') + asking_game = True + #''' + if n_game_playing == 0: + received_data = ggs_wait_ready(1) + else: + received_data = ggs_wait_ready() + os_info = ggs_os_get_info(received_data) + if os_info != '': + print_log_color('[INFO] GGS /os info : ' + os_info, color='green') + if ggs_os_is_game_request(os_info): + print_log_color('[INFO] GGS Game Request : ' + os_info, color='green') + request_id, tl1, tl2, tl3, opponent, game_type = ggs_os_get_received_game_info(os_info) + print_log_color('[INFO]', 'got request from', opponent, 'id', request_id, color='green') + ''' + if n_game_playing == 0: + ggs_cmd = input('please input cmd for ggs: ') + print_log_color('[INFO]', 'got command', ggs_cmd, color='green') + tn.write((ggs_cmd + '\n').encode('utf-8')) + else: + ggs_cmd = 't /os decline ' + request_id + print_log_color('[INFO]', 'decline game', ggs_cmd, color='green') + tn.write((ggs_cmd + '\n').encode('utf-8')) + ''' + #ggs_os_accept_game(request_id) + elif ggs_os_is_start_game(os_info): + print_log_color('[INFO] GGS Game Start : ' + os_info, color='green') + game_id = ggs_os_start_game_get_id(os_info) + playing_game_id = game_id + print_log_color('[INFO] GGS Playing Game ID : ' + playing_game_id, color='green') + n_game_playing = 2 + asking_game = False + elif ggs_os_is_game_end(os_info): + print_log_color('[INFO] GGS Game End : ' + os_info, color='green') + n_game_playing -= 1 + if n_game_playing == 0: + playing_game_id = '' + n_played += 1 + board_sent[0] = False + board_sent[1] = False + egaroucid_clearcache(0) + egaroucid_clearcache(1) + #break + ''' + elif ggs_os_is_game_terminated(os_info): + print_log_color('[INFO] GGS Game Terminated : ' + os_info, color='green') + game_playing = False + asking_game = False + break + ''' + elif ggs_os_is_board_info(os_info): + game_id = ggs_os_board_info_get_id(os_info) + game_id_nosub = game_id + sub_idx = 0 + if ggs_os_is_synchro(game_id): + sub_idx = ggs_os_get_synchro_id(game_id) + game_id_nosub = game_id[:-len(str(sub_idx)) - 1] + print_log_color('[INFO] GGS Received board game_id : ' + game_id_nosub + ' playing : ' + playing_game_id, color='green') + if game_id_nosub == playing_game_id: + last_move, me_color, me_remaining_time, board, color_to_move = ggs_os_get_board(received_data) + print_log_color('[INFO] GGS Got board from GGS game_id : ' + game_id, color='green') + print_log_color('[INFO] GGS Got board from GGS egaroucid_color : ' + me_color, color='green') + print_log_color('[INFO] GGS Got board from GGS remaining_time : ' + str(me_remaining_time), color='green') + print_log_color('[INFO] GGS Got board from GGS board : ' + board, color='green') + egaroucid_setboard(sub_idx, board) + board_sent[sub_idx] = True + for ii in range(2): + if not board_sent[ii]: + egaroucid_setboard(ii, board) + board_sent[ii] = True + logfile_transcript = 'log/' + d_today.replace('-', '') + '_' + t_now.split('.')[0].replace(':', '') + '_transcript_' + game_id + '.txt' + with open(logfile_transcript, 'a') as f: + if last_move == '': + f.write('game_id ' + game_id + '\n') + f.write('egaroucid_color ' + me_color + '\n') + f.write('egaroucid_remaining_time ' + str(me_remaining_time) + '\n') + f.write('initial_board ' + board + '\n') + else: + f.write(last_move) + if me_color == color_to_move and '-' in board: + me_remaining_time_proc = max(1, me_remaining_time - 8) + egaroucid_settime(sub_idx, me_color, me_remaining_time_proc) + print_log_color('[INFO] Egaroucid thinking... game_id : ' + game_id, color='green') + coord, value = egaroucid_get_move_score(sub_idx) + if coord == 'ps': + coord = 'pa' # pass for GGS + print_log_color('[INFO] Egaroucid moved : ' + coord + ' score ' + value, color='green') + ggs_os_play_move(game_id, coord, value) + +for egaroucid in egaroucids: + egaroucid.kill() + +tn.close() diff --git a/docs/en/download/img/build_windows_change_edition.png b/docs/en/download/img/build_windows_change_edition.png new file mode 100644 index 000000000..84be8e374 Binary files /dev/null and b/docs/en/download/img/build_windows_change_edition.png differ diff --git a/docs/en/download/img/build_windows_execute.png b/docs/en/download/img/build_windows_execute.png new file mode 100644 index 000000000..971720307 Binary files /dev/null and b/docs/en/download/img/build_windows_execute.png differ diff --git a/docs/en/download/index.html b/docs/en/download/index.html index 7ca1fee8b..3e15df69f 100644 --- a/docs/en/download/index.html +++ b/docs/en/download/index.html @@ -53,7 +53,17 @@ Egaroucid 7.5.1 AVX512 Portable -

Egaroucid is optimized to SIMD version, which requires AVX2 instructions, but old CPUs (created in 2013 or older) might not be able to run it. If so, please install Generic version. If you have a CPU that have AVX-512 extensions, AVX512 edition may be faster.

Please visit GitHub Releases to see older versions and release notes.

About Changing Book Format

to egbk3 Format

Book format is changed in Egaroucid 6.5.1 to .egbk3 extension. If you used older version and install 6.5.1, Egaroucid automatically convert book format in first execution. Also, you can use old .egbk2 and .egbk book in "Book Import" function.

to egbk2 Format

Book format is changed in Egaroucid 6.3.0. The new book's filename extension is .egbk2. If you used version 6.2.0 or older and install 6.3.0, Egaroucid automatically convert book format in first execution. Also, you can use old .egbk book in "Book Reference" and "Book merge", but the save format is only new .egbk2.

+

Egaroucid is optimized to SIMD version, which requires AVX2 instructions, but old CPUs (created in 2013 or older) might not be able to run it. If so, please install Generic version. If you have a CPU that have AVX-512 extensions, AVX512 edition may be faster.

Please visit GitHub Releases to see older versions and release notes.

About Changing Book Format

to egbk3 Format

Book format is changed in Egaroucid 6.5.1 to .egbk3 extension. If you used older version and install 6.5.1, Egaroucid automatically convert book format in first execution. Also, you can use old .egbk2 and .egbk book in "Book Import" function.

to egbk2 Format

Book format is changed in Egaroucid 6.3.0. The new book's filename extension is .egbk2. If you used version 6.2.0 or older and install 6.3.0, Egaroucid automatically convert book format in first execution. Also, you can use old .egbk book in "Book Reference" and "Book merge", but the save format is only new .egbk2.

Build by Yourself

Egaroucid can be built by yourself. You can use detailed optimization options to make it run faster on your PC, or you can modify it!

Windows

You need:

Download the source code of Egaroucid below

+ + + + + + + + +
DateDownload
2025/01/07Egaroucid 7.5.1 source code
+

Unzip the file, then double-click Egaroucid.sln, then Visual Studio opens. Press the Debug>Run Without Debugging, then you can build and run Egaroucid. You can change editions (SIMD, Generic, etc.) by changing Solution Configrations.

Egaroucid's source codes are in src/engine (for AI calculation) and src/gui (for GUI). You can modify Egaroucid by changing these codes!

Run Without DebuggingChange Edition

Mac

To Be Done

Linux

To Be Done

diff --git a/docs/ja/download/img/build_windows_change_edition.png b/docs/ja/download/img/build_windows_change_edition.png new file mode 100644 index 000000000..84be8e374 Binary files /dev/null and b/docs/ja/download/img/build_windows_change_edition.png differ diff --git a/docs/ja/download/img/build_windows_execute.png b/docs/ja/download/img/build_windows_execute.png new file mode 100644 index 000000000..971720307 Binary files /dev/null and b/docs/ja/download/img/build_windows_execute.png differ diff --git a/docs/ja/download/index.html b/docs/ja/download/index.html index de033d1d8..f334d30a8 100644 --- a/docs/ja/download/index.html +++ b/docs/ja/download/index.html @@ -24,7 +24,7 @@

English -

Egaroucid ダウンロード

インストール版とポータブル版があります。インストール版はインストーラを実行すると自動的に最適な設定でインストールしてくれるものです。ポータブル版はzipファイルを解凍して使うものです。

インストール版

以下のボタンを押してインストーラをダウンロードしてください。ダウンロードが完了したらインストーラを実行し、手順に従うとインストールが完了します。

+

Egaroucid ダウンロード

インストール版とポータブル版があります。インストール版はインストーラを実行すると自動的に最適な設定でインストールしてくれるものです。ポータブル版はzipファイルを解凍して使うものです。

EgaroucidはWindows向けに作っていますが、Macでもビルド可能です(有志による貢献です)

インストール版

以下のボタンを押してインストーラをダウンロードしてください。ダウンロードが完了したらインストーラを実行し、手順に従うとインストールが完了します。

ダウンロードアイコンEgaroucid 7.5.1 をダウンロード

インストーラを実行すると以下のように「WindowsによってPCが保護されました」と出ることがありますが、「詳細情報」を押すと「実行」ボタンが出ます。こちらを押すとインストーラを実行できます。なお、Egaroucidは悪意を持ったコードを含んでいませんが、この操作は自己責任で行ってください。

「WindowsによってPCが保護されました」という画面「WindowsによってPCが保護されました」という画面において「詳細情報」を押して実行する

Egaroucidは64bitのWindowsかつIntel製かAMD製のCPU、またはx64互換機能のあるARM製CPUに対応しています。

Egaroucidは個々の環境向けに高速に動くようにいくつかのバージョン(SIMD / Generic / AVX512)を用意しています。インストール版では自動で最適なものをインストールしてくれます。

過去のバージョンや各バージョンのリリースノートはGitHubのリリースからご覧ください。

ポータブル版

Egaroucidは64bitのWindowsかつIntel製かAMD製のCPU、x64互換機能のあるARM製CPUに対応しています。

以下から自分の環境に合ったものをダウンロードし、zipを解凍してください。中のEgaroucid_[バージョン].exeを実行するとEgaroucidが起動します。

@@ -52,7 +52,17 @@
Egaroucid 7.5.1 AVX512 Portable
-

EgaroucidはSIMDバージョン(AVX2が必要)に最適化して作っていますが、こちらは概ね2013年以降のCPUでないと動作しません。その場合にはGenericバージョンを使用してください。また、AVX-512に対応したCPU (Intel Core iシリーズの第7から11世代の一部など) をお使いの場合はAVX512版の方が高速に動くかもしれません。

過去のバージョンや各バージョンのリリースノートはGitHubのリリースからご覧ください。

book形式の変更について

egbk3形式への変更

Egaroucidはバージョン6.5.1からbook形式を変更し、拡張子が.egbk3のものを使うようになりました。以前のバージョンをお使いで新しく6.5.1をインストールした場合、初回起動時に古い.egbk2形式および.egbk形式のbookを自動で変換します。また、古い形式もbookの読み込みなど各種機能が使えます。ただし、保存形式は新しい.egbk3形式になります。

egbk2形式への変更

Egaroucidはバージョン6.3.0からbook形式を変更しました。新しいbookの拡張子は.egbk2です。6.2.0以前のバージョンをお使いで新しく6.3.0をインストールした場合、初回起動時に古い.egbk形式のbookを自動で変換します。また、古い形式もbookの参照および統合機能が使えます。ただし、保存形式は新しい.egbk2形式になります。

+

EgaroucidはSIMDバージョン(AVX2が必要)に最適化して作っていますが、こちらは概ね2013年以降のCPUでないと動作しません。その場合にはGenericバージョンを使用してください。また、AVX-512に対応したCPU (Intel Core iシリーズの第7から11世代の一部など) をお使いの場合はAVX512版の方が高速に動くかもしれません。

過去のバージョンや各バージョンのリリースノートはGitHubのリリースからご覧ください。

book形式の変更について

egbk3形式への変更

Egaroucidはバージョン6.5.1からbook形式を変更し、拡張子が.egbk3のものを使うようになりました。以前のバージョンをお使いで新しく6.5.1をインストールした場合、初回起動時に古い.egbk2形式および.egbk形式のbookを自動で変換します。また、古い形式もbookの読み込みなど各種機能が使えます。ただし、保存形式は新しい.egbk3形式になります。

egbk2形式への変更

Egaroucidはバージョン6.3.0からbook形式を変更しました。新しいbookの拡張子は.egbk2です。6.2.0以前のバージョンをお使いで新しく6.3.0をインストールした場合、初回起動時に古い.egbk形式のbookを自動で変換します。また、古い形式もbookの参照および統合機能が使えます。ただし、保存形式は新しい.egbk2形式になります。

自分でビルドする

Egaroucidは自分でビルドすることもできます。自分のPCで高速に動くように細かい最適化オプションを使ったり、改造して遊んだりできます。

Windows

必要なもの

Egaroucidのソースコードを以下からダウンロードします。

+ + + + + + + + +
リリース日ダウンロード
2025/01/07Egaroucid 7.5.1 ソースコード
+

Zipを解凍し、Egaroucid.slnをダブルクリックし、Visual StudioでEgaroucidプロジェクトを開きます。デバッグ>デバッグなしで開始ボタンを押して、ビルド・実行できます。ソリューション構成からエディション(SIMD版など)を選べます。

Egaroucidのソースコードはsrc/engine内のもの(AI部分)とsrc/gui内のもの(GUI描画に関わる部分)です。こちらをいじると改造できます。

デバッグなしで開始エディションを変更

Mac

そのうち追記します

Linux

そのうち追記します

diff --git a/src/gui/function/const/settings.hpp b/src/gui/function/const/settings.hpp index d92c340d9..a38e9c8a1 100644 --- a/src/gui/function/const/settings.hpp +++ b/src/gui/function/const/settings.hpp @@ -10,6 +10,10 @@ #pragma once +/* Compile Options + -DGUI_PORTABLE : Portable Mode +*/ + /* @brief GUI settings */ @@ -18,7 +22,11 @@ // always false for Mac #define GUI_PORTABLE_MODE false #else - #define GUI_PORTABLE_MODE true + #ifdef GUI_PORTABLE + #define GUI_PORTABLE_MODE true + #else + #define GUI_PORTABLE_MODE false + #endif #endif // GUI Open Console? #define GUI_OPEN_CONSOLE false \ No newline at end of file diff --git a/web_resources/en/download/img/build_windows_change_edition.png b/web_resources/en/download/img/build_windows_change_edition.png new file mode 100644 index 000000000..91d7f818c Binary files /dev/null and b/web_resources/en/download/img/build_windows_change_edition.png differ diff --git a/web_resources/en/download/img/build_windows_execute.png b/web_resources/en/download/img/build_windows_execute.png new file mode 100644 index 000000000..6fd9eae81 Binary files /dev/null and b/web_resources/en/download/img/build_windows_execute.png differ diff --git a/web_resources/en/download/index.md b/web_resources/en/download/index.md index 4fd531f62..a4d7f61ee 100644 --- a/web_resources/en/download/index.md +++ b/web_resources/en/download/index.md @@ -56,3 +56,40 @@ Book format is changed in Egaroucid 6.5.1 to ```.egbk3``` extension. If you used Book format is changed in Egaroucid 6.3.0. The new book's filename extension is ```.egbk2```. If you used version 6.2.0 or older and install 6.3.0, Egaroucid automatically convert book format in first execution. Also, you can use old ```.egbk``` book in "Book Reference" and "Book merge", but the save format is only new ```.egbk2```. + + + + +## Build by Yourself + +Egaroucid can be built by yourself. You can use detailed optimization options to make it run faster on your PC, or you can modify it! + +### Windows + +You need: + +
    +
  • [Visual Studio](https://visualstudio.microsoft.com/en/vs/community/)
    • +
  • [Siv3D](https://siv3d.github.io/en-us/)
    • +
+ +Download the source code of Egaroucid below + +GUI_SOURCE_TABLE_HERE + +Unzip the file, then double-click Egaroucid.sln, then Visual Studio opens. Press the Debug>Run Without Debugging, then you can build and run Egaroucid. You can change editions (SIMD, Generic, etc.) by changing Solution Configrations. + +Egaroucid's source codes are in src/engine (for AI calculation) and src/gui (for GUI). You can modify Egaroucid by changing these codes! + +
+ Run Without Debugging + Change Edition +
+ +### Mac + +To Be Done + +### Linux + +To Be Done diff --git a/web_resources/en/release_gui_source.html b/web_resources/en/release_gui_source.html new file mode 100644 index 000000000..dc739f768 --- /dev/null +++ b/web_resources/en/release_gui_source.html @@ -0,0 +1,10 @@ +
+ + + + + + + + +
DateDownload
DATE[Egaroucid VERSION_DOT source code](https://github.com/Nyanyan/Egaroucid/archive/refs/tags/vVERSION_DOT.zip)
diff --git a/web_resources/generate_html.py b/web_resources/generate_html.py index f0281609d..4719eaef7 100644 --- a/web_resources/generate_html.py +++ b/web_resources/generate_html.py @@ -16,6 +16,7 @@ CONSOLE_VERSION_UNDERBAR = CONSOLE_VERSION_DOT.replace('.', '_') GUI_RELEASE_IDENTIFIER = 'GUI_DOWNLOAD_TABLE_HERE' +GUI_SOURCE_RELEASE_IDENTIFIER = 'GUI_SOURCE_TABLE_HERE' CONSOLE_RELEASE_IDENTIFIER = 'CONSOLE_DOWNLOAD_TABLE_HERE' CONSOLE_SOURCE_RELEASE_IDENTIFIER = 'CONSOLE_SOURCE_TABLE_HERE' @@ -93,6 +94,9 @@ def convert_img(file): with open(elements_dir + '/release_gui.html', 'r', encoding='utf-8') as f: release_gui_html = f.read().replace('DATE', GUI_DATE_STR).replace('VERSION_DOT', GUI_VERSION_DOT).replace('VERSION_UNDERBAR', GUI_VERSION_UNDERBAR) +with open(elements_dir + '/release_gui_source.html', 'r', encoding='utf-8') as f: + release_gui_source_html = f.read().replace('DATE', GUI_DATE_STR).replace('VERSION_DOT', GUI_VERSION_DOT).replace('VERSION_UNDERBAR', GUI_VERSION_UNDERBAR) + with open(elements_dir + '/release_console_zip.html', 'r', encoding='utf-8') as f: release_console_zip_html = f.read().replace('DATE', CONSOLE_DATE_STR).replace('VERSION_DOT', CONSOLE_VERSION_DOT).replace('VERSION_UNDERBAR', CONSOLE_VERSION_UNDERBAR) @@ -203,6 +207,8 @@ def create_html(dr): # download tables if GUI_RELEASE_IDENTIFIER in elem: elem = elem.replace(GUI_RELEASE_IDENTIFIER, release_gui_html) + if GUI_SOURCE_RELEASE_IDENTIFIER in elem: + elem = elem.replace(GUI_SOURCE_RELEASE_IDENTIFIER, release_gui_source_html) if CONSOLE_RELEASE_IDENTIFIER in elem: elem = elem.replace(CONSOLE_RELEASE_IDENTIFIER, release_console_zip_html) if CONSOLE_SOURCE_RELEASE_IDENTIFIER in elem: diff --git a/web_resources/ja/download/img/build_windows_change_edition.png b/web_resources/ja/download/img/build_windows_change_edition.png new file mode 100644 index 000000000..91d7f818c Binary files /dev/null and b/web_resources/ja/download/img/build_windows_change_edition.png differ diff --git a/web_resources/ja/download/img/build_windows_execute.png b/web_resources/ja/download/img/build_windows_execute.png new file mode 100644 index 000000000..6fd9eae81 Binary files /dev/null and b/web_resources/ja/download/img/build_windows_execute.png differ diff --git a/web_resources/ja/download/index.md b/web_resources/ja/download/index.md index 35626a526..32de52f3e 100644 --- a/web_resources/ja/download/index.md +++ b/web_resources/ja/download/index.md @@ -2,6 +2,8 @@ インストール版とポータブル版があります。インストール版はインストーラを実行すると自動的に最適な設定でインストールしてくれるものです。ポータブル版はzipファイルを解凍して使うものです。 +EgaroucidはWindows向けに作っていますが、Macでもビルド可能です(有志による貢献です) + ## インストール版 @@ -54,3 +56,39 @@ Egaroucidはバージョン6.5.1からbook形式を変更し、拡張子が```.e ### egbk2形式への変更 Egaroucidはバージョン6.3.0からbook形式を変更しました。新しいbookの拡張子は```.egbk2```です。6.2.0以前のバージョンをお使いで新しく6.3.0をインストールした場合、初回起動時に古い```.egbk```形式のbookを自動で変換します。また、古い形式もbookの参照および統合機能が使えます。ただし、保存形式は新しい```.egbk2```形式になります。 + + + +## 自分でビルドする + +Egaroucidは自分でビルドすることもできます。自分のPCで高速に動くように細かい最適化オプションを使ったり、改造して遊んだりできます。 + +### Windows + +必要なもの + +
    +
  • [Visual Studio](https://visualstudio.microsoft.com/ja/vs/community/)
    • +
  • [Siv3D](https://siv3d.github.io/ja-jp/)
    • +
+ +Egaroucidのソースコードを以下からダウンロードします。 + +GUI_SOURCE_TABLE_HERE + +Zipを解凍し、Egaroucid.slnをダブルクリックし、Visual StudioでEgaroucidプロジェクトを開きます。デバッグ>デバッグなしで開始ボタンを押して、ビルド・実行できます。ソリューション構成からエディション(SIMD版など)を選べます。 + +Egaroucidのソースコードはsrc/engine内のもの(AI部分)とsrc/gui内のもの(GUI描画に関わる部分)です。こちらをいじると改造できます。 + +
+ デバッグなしで開始 + エディションを変更 +
+ +### Mac + +そのうち追記します + +### Linux + +そのうち追記します diff --git a/web_resources/ja/release_gui_source.html b/web_resources/ja/release_gui_source.html new file mode 100644 index 000000000..4e7b7387d --- /dev/null +++ b/web_resources/ja/release_gui_source.html @@ -0,0 +1,10 @@ +
+ + + + + + + + +
リリース日ダウンロード
DATE[Egaroucid VERSION_DOT ソースコード](https://github.com/Nyanyan/Egaroucid/archive/refs/tags/vVERSION_DOT.zip)