diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 21240c75..0f669045 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -12,9 +12,9 @@ jobs: - uses: actions/checkout@v2 - name: Set up Python - uses: actions/setup-python@v1 + uses: actions/setup-python@v3 with: - python-version: 3.7 + python-version: 3.8 - name: Install dependencies run: | diff --git a/katrain/config.json b/katrain/config.json index e26f6f57..63a85ced 100644 --- a/katrain/config.json +++ b/katrain/config.json @@ -2,7 +2,7 @@ "engine": { "katago": "", "altcommand": "", - "model": "katrain/models/g170e-b15c192-s1672170752-d466197061.bin.gz", + "model": "katrain/models/kata1-b18c384nbt-s6582191360-d3422816034.bin.gz", "config": "katrain/KataGo/analysis_config.cfg", "threads": 12, "max_visits": 500, @@ -28,7 +28,7 @@ "anim_pv_time": 0.5, "debug_level": 0, "lang": "en", - "version": "1.13.0", + "version": "1.14.0", "load_fast_analysis": false, "load_sgf_rewind": true }, diff --git a/katrain/core/constants.py b/katrain/core/constants.py index 4aa10100..48dff9ea 100644 --- a/katrain/core/constants.py +++ b/katrain/core/constants.py @@ -1,7 +1,7 @@ PROGRAM_NAME = "KaTrain" -VERSION = "1.13.0" +VERSION = "1.14.0" HOMEPAGE = "https://github.com/sanderland/katrain" -CONFIG_MIN_VERSION = "1.11.0" # keep config files from this version +CONFIG_MIN_VERSION = "1.14.0" # keep config files from this version ANALYSIS_FORMAT_VERSION = "1.0" DATA_FOLDER = "~/.katrain" diff --git a/katrain/gui/popups.py b/katrain/gui/popups.py index bd43f312..a63f0320 100644 --- a/katrain/gui/popups.py +++ b/katrain/gui/popups.py @@ -468,15 +468,14 @@ class BaseConfigPopup(QuickConfigGui): "Strongest distributed model": "https://katagotraining.org/api/networks/get_strongest/", } MODELS = { - "20 block model": "https://github.com/lightvector/KataGo/releases/download/v1.4.5/g170e-b20c256x2-s5303129600-d1228401921.bin.gz", - "30 block model": "https://github.com/lightvector/KataGo/releases/download/v1.4.5/g170-b30c320x2-s4824661760-d1229536699.bin.gz", - "40 block model": "https://github.com/lightvector/KataGo/releases/download/v1.4.5/g170-b40c256x2-s5095420928-d1229425124.bin.gz", - "18 'nested residual block' model": "https://github.com/lightvector/KataGo/releases/download/v1.12.2/b18c384nbt-uec.bin.gz", - "18 block 'optimistic policy' model": "https://github.com/lightvector/KataGo/releases/download/v1.13.0/b18c384nbt-optimisticv13-s5971M.bin.gz", + "old 15 block model": "https://github.com/lightvector/KataGo/releases/download/v1.3.2/g170e-b15c192-s1672170752-d466197061.txt.gz", } MODEL_DESC = { "Fat 40 block model": "https://d3dndmfyhecmj0.cloudfront.net/g170/neuralnets/g170e-b40c384x2-s2348692992-d1229892979.zip", - "15 block model": "https://d3dndmfyhecmj0.cloudfront.net/g170/neuralnets/g170e-b15c192-s1672170752-d466197061.bin.gz", + "Recommended 18b model": "https://media.katagotraining.org/uploaded/networks/models/kata1/kata1-b18c384nbt-s6582191360-d3422816034.bin.gz", + "old 20 block model": "https://github.com/lightvector/KataGo/releases/download/v1.4.5/g170e-b20c256x2-s5303129600-d1228401921.bin.gz", + "old 30 block model": "https://github.com/lightvector/KataGo/releases/download/v1.4.5/g170-b30c320x2-s4824661760-d1229536699.bin.gz", + "old 40 block model": "https://github.com/lightvector/KataGo/releases/download/v1.4.5/g170-b40c256x2-s5095420928-d1229425124.bin.gz", } KATAGOS = { @@ -495,6 +494,8 @@ class BaseConfigPopup(QuickConfigGui): "just-descriptions": { "CUDA v1.13.0 (Windows)": "https://github.com/lightvector/KataGo/releases/download/v1.13.0/katago-v1.13.0-cuda11.2-windows-x64.zip", "CUDA v1.13.0 (Linux)": "https://github.com/lightvector/KataGo/releases/download/v1.13.0/katago-v1.13.0-cuda11.1-linux-x64.zip", + "Cuda/TensorRT v1.13.0 (Windows)": "https://github.com/lightvector/KataGo/releases/download/v1.13.0/katago-v1.13.1-trt8.2-cuda11.2-windows-x64.zip", + "Cuda/TensorRT v1.13.0 (Linux)": "https://github.com/lightvector/KataGo/releases/download/v1.13.0/katago-v1.12.1-trt8.2-cuda11.1-linux-x64.zip", }, } @@ -548,7 +549,7 @@ def find_description(path): # no description to bottom model_files = sorted( [(find_description(path), path) for path in model_files], - key=lambda descpath: "Z" * 10 + path if descpath[0] == descpath[1] else descpath[0], + key=lambda descpath: ("Recommended" not in descpath[0], " - " not in descpath[0], descpath[0]), ) models_available_msg = i18n._("models available").format(num=len(model_files)) self.model_files.values = [models_available_msg] + [desc for desc, path in model_files] @@ -907,7 +908,6 @@ def _refresh(self, _dt=0): ("aitop5", "{:.1%}", "ai_top5_move", 1, True), ] ): - statcell = { bw: TableStatLabel( text=fmt.format(sum_stats[bw][stat]) if stat in sum_stats[bw] else "", diff --git a/katrain/models/g170e-b15c192-s1672170752-d466197061.bin.gz b/katrain/models/g170e-b15c192-s1672170752-d466197061.bin.gz deleted file mode 100644 index 0d21c1b5..00000000 Binary files a/katrain/models/g170e-b15c192-s1672170752-d466197061.bin.gz and /dev/null differ diff --git a/katrain/models/kata1-b18c384nbt-s6582191360-d3422816034.bin.gz b/katrain/models/kata1-b18c384nbt-s6582191360-d3422816034.bin.gz new file mode 100644 index 00000000..0c8ea5df Binary files /dev/null and b/katrain/models/kata1-b18c384nbt-s6582191360-d3422816034.bin.gz differ