Merge branch 'v1.4.1x' of github.com:sanderland/katrain into v1.4.1x

This commit is contained in:
Sander Land committed 2020-09-01 10:15:54 +02:00
commit 5c1b5e6c6a
7 files changed
+12 -17

No files matched your search

+2
View File
@@ -25,6 +25,8 @@ These commands install [Homebrew](https://brew.sh), which simplifies installing
To upgrade to a newer version, simply run `pip3 install -U katrain`
If you encounter an error about SDL being missing, try ` brew sdl sdl_image sdl_mixer sdl_ttf portmidi`
### <a name="MacSources"></a>Troubleshooting and Installation from sources
Installation from sources is essentially the same as for Linux, see [here](#LinuxSources),
+1 -1
View File
@@ -266,7 +266,7 @@ class KaTrainGui(Screen, KaTrainBase):
player_info.name = move_tree.root.get_property("P" + bw)
self.update_player(bw)
self.controls.graph.initialize_from_game(self.game.root)
self.controls.rank_graph.initialize_from_game(self.game.root)
# self.controls.rank_graph.initialize_from_game(self.game.root)
self.update_state(redraw_board=True)
def _do_ai_move(self, node=None):
+1 -1
View File
@@ -66,7 +66,7 @@
true
],
"eval_off_show_last": 3,
"text_point_loss": false,
"text_point_loss": true,
"eval_show_ai": true,
"lock_ai": false
},
+1 -1
View File
@@ -334,7 +334,7 @@ class SGF:
clipped_str = match.group() if match else input_str
root = cls(clipped_str).root
# Fix weird FoxGo server KM values
if "foxwq" in root.get_list_property("AP",[]):
if "foxwq" in root.get_list_property("AP", []):
if int(root.get_property("HA", 0)) >= 1:
corrected_komi = 0.5
elif root.get_property("RU").lower() in ["chinese", "cn"]:
+3 -11
View File
@@ -511,7 +511,6 @@
engine_status_pondering: -1
timer:timer
graph: graph
rank_graph: rank_graph
stats: stats
info: info
note: note
@@ -565,27 +564,20 @@
opacity: 0 if self.parent.mode == MODE_PLAY else 1
CollapsablePanel:
id: graph_panel
content_height: graph.height + rank_graph.height
content_height: graph.height # + rank_graph.height
options_height: root.tab_option_height
closed_label: 'closedlabel:scoregraph'
options: ['score','winrate','rank_est']
option_colors: [SCORE_COLOR,WINRATE_COLOR,POINTLOSS_COLOR]
options: ['score','winrate']
option_colors: [SCORE_COLOR,WINRATE_COLOR]
option_active: [True,False,False]
on_option_state:
graph.show_graphs(args[1])
graph.hidden = not (args[1]['score'] or args[1]['winrate'])
rank_graph.hidden = not args[1]['rank_est']
rank_graph.trigger_calculate()
ScoreGraph:
id: graph
opacity: 0 if self.hidden else 1
size_hint_y: None
height: EPSILON if self.hidden else root.graph_height
RankGraph:
id: rank_graph
opacity: 0 if self.hidden else 1
size_hint_y: None
height: EPSILON if self.hidden else root.graph_height
CollapsablePanel:
id: stats_panel
num_active: 3
+1 -1
View File
@@ -144,7 +144,7 @@ class ControlsPanel(BoxLayout):
self.stats.player = ""
self.graph.update_value(current_node)
self.rank_graph.update_value(current_node)
# self.rank_graph.update_value(current_node)
self.note.text = current_node.note
self.info.text = info
+3 -2
View File
@@ -378,6 +378,7 @@ class ConfigPopup(QuickConfigGui):
super().__init__(katrain)
self.paths = [self.katrain.config("engine/model"), "katrain/models", "~/.katrain"]
self.katago_paths = [self.katrain.config("engine/katago"), "~/.katrain"]
Clock.schedule_once(self.check_katas)
MDApp.get_running_app().bind(language=self.check_models)
MDApp.get_running_app().bind(language=self.check_katas)
@@ -448,14 +449,14 @@ class ConfigPopup(QuickConfigGui):
KATAGOS = {
"win": {
"OpenCL v1.6.1": "https://github.com/lightvector/KataGo/releases/download/v1.6.1/katago-v1.6.1-gpu-opencl-windows-x64.zip",
"CUDA v1.6.1 (New NVIDIA cards)": "https://github.com/lightvector/KataGo/releases/download/v1.6.1/katago-v1.6.1-gpu-cuda10.2-windows-x64.zip",
# "CUDA v1.6.1 (New NVIDIA cards)": "https://github.com/lightvector/KataGo/releases/download/v1.6.1/katago-v1.6.1-gpu-cuda10.2-windows-x64.zip",
"Eigen AVX2 (Modern CPUs) v1.6.1": "https://github.com/lightvector/KataGo/releases/download/v1.6.1/katago-v1.6.1-cpu-eigen-avx2-windows-x64.zip",
"Eigen (CPU, Non-optimized) v1.6.1": "https://github.com/lightvector/KataGo/releases/download/v1.6.1/katago-v1.6.1-cpu-eigen-windows-x64.zip",
"OpenCL v1.6.1 (bigger boards)": "https://github.com/lightvector/KataGo/releases/download/v1.6.1%2Bbs29/katago-v1.6.1+bs29-gpu-opencl-windows-x64.zip",
},
"linux": {
"OpenCL v1.6.1": "https://github.com/lightvector/KataGo/releases/download/v1.6.1/katago-v1.6.1-gpu-opencl-linux-x64.zip",
"CUDA v1.6.1 (New NVIDIA cards)": "https://github.com/lightvector/KataGo/releases/download/v1.6.1/katago-v1.6.1-gpu-cuda10.2-linux-x64.zip",
# "CUDA v1.6.1 (New NVIDIA cards)": "https://github.com/lightvector/KataGo/releases/download/v1.6.1/katago-v1.6.1-gpu-cuda10.2-linux-x64.zip",
"Eigen AVX2 (Modern CPUs) v1.6.1": "https://github.com/lightvector/KataGo/releases/download/v1.6.1/katago-v1.6.1-cpu-eigen-avx2-linux-x64.zip",
"Eigen (CPU, Non-optimized) v1.6.1": "https://github.com/lightvector/KataGo/releases/download/v1.6.1/katago-v1.6.1-cpu-eigen-linux-x64.zip",
"OpenCL v1.6.1 (bigger boards)": "https://github.com/lightvector/KataGo/releases/download/v1.6.1%2Bbs29/katago-v1.6.1+bs29-gpu-opencl-linux-x64.zip",