Skip to content

Commit 28098e4

Browse files
committed
feat: add pip_index_url configuration and update installation commands
1 parent 8e9b946 commit 28098e4

File tree

3 files changed

+27
-3
lines changed

3 files changed

+27
-3
lines changed

src/parallax/config/config_manager.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ namespace parallax
1818
const std::string KEY_WSL_KERNEL_URL = "wsl_kernel_url";
1919
const std::string KEY_PRAKASA_GIT_REPO_URL = "prakasa_git_repo_url";
2020
const std::string KEY_PRAKASA_GIT_BRANCH = "prakasa_git_branch";
21+
const std::string KEY_PIP_INDEX_URL = "pip_index_url";
2122

2223
// Default configuration file name
2324
const std::string ConfigManager::DEFAULT_CONFIG_PATH = "parallax_config.txt";
@@ -62,7 +63,7 @@ namespace parallax
6263
config_values_[KEY_PRAKASA_GIT_REPO_URL] =
6364
"https://github.com/hetu-project/prakasa.git";
6465
config_values_[KEY_PRAKASA_GIT_BRANCH] = "main";
65-
// proxy_url has no default value
66+
// proxy_url and pip_index_url have no default value (use official PyPI by default)
6667
}
6768

6869
// Load configuration file
@@ -109,7 +110,8 @@ namespace parallax
109110
{KEY_WSL_INSTALLER_URL, config_values_[KEY_WSL_INSTALLER_URL]},
110111
{KEY_WSL_KERNEL_URL, config_values_[KEY_WSL_KERNEL_URL]},
111112
{KEY_PRAKASA_GIT_REPO_URL, config_values_[KEY_PRAKASA_GIT_REPO_URL]},
112-
{KEY_PRAKASA_GIT_BRANCH, config_values_[KEY_PRAKASA_GIT_BRANCH]}};
113+
{KEY_PRAKASA_GIT_BRANCH, config_values_[KEY_PRAKASA_GIT_BRANCH]},
114+
{KEY_PIP_INDEX_URL, config_values_[KEY_PIP_INDEX_URL]}};
113115

114116
std::string line;
115117
while (std::getline(file, line))
@@ -325,7 +327,8 @@ namespace parallax
325327
{
326328
static const std::set<std::string> valid_keys = {
327329
KEY_PROXY_URL, KEY_WSL_LINUX_DISTRO, KEY_WSL_INSTALLER_URL,
328-
KEY_WSL_KERNEL_URL, KEY_PRAKASA_GIT_REPO_URL, KEY_PRAKASA_GIT_BRANCH};
330+
KEY_WSL_KERNEL_URL, KEY_PRAKASA_GIT_REPO_URL, KEY_PRAKASA_GIT_BRANCH,
331+
KEY_PIP_INDEX_URL};
329332

330333
return valid_keys.find(key) != valid_keys.end();
331334
}

src/parallax/config/config_manager.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ namespace parallax
1515
extern const std::string KEY_WSL_KERNEL_URL;
1616
extern const std::string KEY_PRAKASA_GIT_REPO_URL;
1717
extern const std::string KEY_PRAKASA_GIT_BRANCH;
18+
extern const std::string KEY_PIP_INDEX_URL;
1819

1920
// Configuration file manager class
2021
class ConfigManager

src/parallax/environment/software_installer2.cpp

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,9 @@ namespace parallax
175175
std::string git_branch =
176176
parallax::config::ConfigManager::GetInstance().GetConfigValue(
177177
parallax::config::KEY_PRAKASA_GIT_BRANCH);
178+
std::string pip_index_url =
179+
parallax::config::ConfigManager::GetInstance().GetConfigValue(
180+
parallax::config::KEY_PIP_INDEX_URL);
178181

179182
const std::string &proxy_url = context_->GetProxyUrl();
180183

@@ -283,6 +286,14 @@ namespace parallax
283286
"cd ~/prakasa && ([ -d ./venv ] || python3 -m venv ./venv) && source "
284287
"./venv/bin/activate "
285288
"&& pip install -e '.[gpu]'";
289+
if (!pip_index_url.empty())
290+
{
291+
install_base_cmd =
292+
"cd ~/prakasa && ([ -d ./venv ] || python3 -m venv ./venv) && source "
293+
"./venv/bin/activate "
294+
"&& pip install -i " +
295+
pip_index_url + " -e '.[gpu]'";
296+
}
286297
if (!proxy_url.empty())
287298
{
288299
install_base_cmd =
@@ -291,6 +302,15 @@ namespace parallax
291302
"./venv/bin/activate && HTTP_PROXY=\"" +
292303
proxy_url + "\" HTTPS_PROXY=\"" + proxy_url +
293304
"\" pip install -e '.[gpu]'";
305+
if (!pip_index_url.empty())
306+
{
307+
install_base_cmd =
308+
"cd ~/prakasa && ([ -d ./venv ] || python3 -m venv ./venv) && "
309+
"source "
310+
"./venv/bin/activate && HTTP_PROXY=\"" +
311+
proxy_url + "\" HTTPS_PROXY=\"" + proxy_url +
312+
"\" pip install -i " + pip_index_url + " -e '.[gpu]'";
313+
}
294314
}
295315
commands.emplace_back("install_prakasa_base", install_base_cmd, 1800,
296316
true);

0 commit comments

Comments
 (0)