From 6294327273966422b2277421da2b25b4f1ff81a1 Mon Sep 17 00:00:00 2001 From: josc146 Date: Wed, 7 Jun 2023 20:38:19 +0800 Subject: [PATCH] update InstallPyDep for better macOS support --- backend-golang/rwkv.go | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/backend-golang/rwkv.go b/backend-golang/rwkv.go index c53ff0a..395ac2c 100644 --- a/backend-golang/rwkv.go +++ b/backend-golang/rwkv.go @@ -52,17 +52,22 @@ func (a *App) InstallPyDep(python string, cnMirror bool) (string, error) { if err != nil { return "", err } + if runtime.GOOS == "windows" { ChangeFileLine("./py310/python310._pth", 3, "Lib\\site-packages") } - if cnMirror { - _, err = Cmd(python, "./backend-python/get-pip.py", "-i", "https://pypi.tuna.tsinghua.edu.cn/simple") - } else { - _, err = Cmd(python, "./backend-python/get-pip.py") - } - if err != nil { - return "", err + + if runtime.GOOS == "windows" { + if cnMirror { + _, err = Cmd(python, "./backend-python/get-pip.py", "-i", "https://pypi.tuna.tsinghua.edu.cn/simple") + } else { + _, err = Cmd(python, "./backend-python/get-pip.py") + } + if err != nil { + return "", err + } } + if runtime.GOOS == "windows" { _, err = Cmd(python, "-m", "pip", "install", "torch==1.13.1", "torchvision==0.14.1", "torchaudio==0.13.1", "--index-url", "https://download.pytorch.org/whl/cu117") } else { @@ -71,9 +76,18 @@ func (a *App) InstallPyDep(python string, cnMirror bool) (string, error) { if err != nil { return "", err } - if cnMirror { - return Cmd(python, "-m", "pip", "install", "-r", "./backend-python/requirements.txt", "-i", "https://pypi.tuna.tsinghua.edu.cn/simple") + + if runtime.GOOS == "windows" { + if cnMirror { + return Cmd(python, "-m", "pip", "install", "-r", "./backend-python/requirements.txt", "-i", "https://pypi.tuna.tsinghua.edu.cn/simple") + } else { + return Cmd(python, "-m", "pip", "install", "-r", "./backend-python/requirements_versions.txt") + } } else { - return Cmd(python, "-m", "pip", "install", "-r", "./backend-python/requirements_versions.txt") + if cnMirror { + return Cmd(python, "-m", "pip", "install", "-r", "./backend-python/requirements_without_cyac.txt", "-i", "https://pypi.tuna.tsinghua.edu.cn/simple") + } else { + return Cmd(python, "-m", "pip", "install", "-r", "./backend-python/requirements_without_cyac.txt") + } } }