chn/nixos
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixos.git synced 2026-01-11 16:49:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

packages.sbatch-tui: remove "All" memory option

Browse Source
This commit is contained in:
陈浩南
2025-12-05 15:09:24 +08:00
parent cb6b13638c
commit faaff1cc61
4 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/sbatch-tui/src/fdtd.cpp
View File

@@ -13,7 +13,7 @@ namespace sbatch
std::string Cpus = "1";
bool Nomultithread = true;
int MemorySchemeSelected = 0;
std::vector<std::string> MemorySchemeEntries = { "Default", "All", "Custom" };
std::vector<std::string> MemorySchemeEntries = { "Default", "Custom" };
std::string Memory = "1";
std::string InputFile = "input.fsp";
};
@@ -75,7 +75,7 @@ namespace sbatch
ftxui::Menu(&State_.MemorySchemeEntries, &State_.MemorySchemeSelected),
input(&State_.Memory, "Memory (GB): ")
| with_list_padding | with_separator
| ftxui::Maybe([&]{ return State_.MemorySchemeSelected == 2; })
| ftxui::Maybe([&]{ return State_.MemorySchemeSelected == 1; })
}) | with_title("Memory:", ftxui::Color::GrayDark) | with_separator
}) | with_title("Resource allocation:") | with_bottom,
// 第三行：输入文件
@@ -97,8 +97,7 @@ namespace sbatch
auto mem_string = [&]
{
if (State_.MemorySchemeSelected == 0) return recommended.Memory ? "--mem={}G"_f(*recommended.Memory) : "";
else if (State_.MemorySchemeSelected == 1) return "--mem=0"s;
else if (State_.MemorySchemeSelected == 2) return "--mem={}G"_f(State_.Memory);
else if (State_.MemorySchemeSelected == 1) return "--mem={}G"_f(State_.Memory);
else std::unreachable();
}();
return

7
packages/sbatch-tui/src/mumax3.cpp
View File

@@ -14,7 +14,7 @@ namespace sbatch
std::vector<std::vector<std::string>> GpuEntries;
bool Nomultithread = true;
int MemorySchemeSelected = 0;
std::vector<std::string> MemorySchemeEntries = { "Default", "All", "Custom" };
std::vector<std::string> MemorySchemeEntries = { "Default", "Custom" };
std::string Memory = "1";
std::string InputFile = "input.txt";
};
@@ -83,7 +83,7 @@ namespace sbatch
ftxui::Menu(&State_.MemorySchemeEntries, &State_.MemorySchemeSelected),
input(&State_.Memory, "Memory (GB): ")
| with_list_padding | with_separator
| ftxui::Maybe([&]{ return State_.MemorySchemeSelected == 2; })
| ftxui::Maybe([&]{ return State_.MemorySchemeSelected == 1; })
}) | with_title("Memory:", ftxui::Color::GrayDark) | with_separator
}) | with_title("Resource allocation:") | with_bottom,
// 第三行：任务名和输入输出文件
@@ -105,8 +105,7 @@ namespace sbatch
auto mem_string = [&]
{
if (State_.MemorySchemeSelected == 0) return "--mem=32G"s;
else if (State_.MemorySchemeSelected == 1) return "--mem=0"s;
else if (State_.MemorySchemeSelected == 2) return "--mem={}G"_f(State_.Memory);
else if (State_.MemorySchemeSelected == 1) return "--mem={}G"_f(State_.Memory);
else std::unreachable();
}();
return

7
packages/sbatch-tui/src/vasp_cpu.cpp
View File

@@ -16,7 +16,7 @@ namespace sbatch
std::string OpenmpThreads = "1";
bool Nomultithread = true;
int MemorySchemeSelected = 0;
std::vector<std::string> MemorySchemeEntries = { "Default", "All", "Custom" };
std::vector<std::string> MemorySchemeEntries = { "Default", "Custom" };
std::string Memory = "1";
bool OptcellEnable = false;
int OptcellSelected = 0;
@@ -88,7 +88,7 @@ namespace sbatch
ftxui::Menu(&State_.MemorySchemeEntries, &State_.MemorySchemeSelected),
input(&State_.Memory, "Memory (GB): ")
| with_list_padding | with_separator
| ftxui::Maybe([&]{ return State_.MemorySchemeSelected == 2; })
| ftxui::Maybe([&]{ return State_.MemorySchemeSelected == 1; })
}) | with_title("Memory:", ftxui::Color::GrayDark) | with_separator
}) | with_title("Resource allocation:") | with_bottom,
// 第三行：任务名和输出文件
@@ -127,8 +127,7 @@ namespace sbatch
auto mem_string = [&]
{
if (State_.MemorySchemeSelected == 0) return recommended.Memory ? "--mem={}G"_f(*recommended.Memory) : "";
else if (State_.MemorySchemeSelected == 1) return "--mem=0"s;
else if (State_.MemorySchemeSelected == 2) return "--mem={}G"_f(State_.Memory);
else if (State_.MemorySchemeSelected == 1) return "--mem={}G"_f(State_.Memory);
else std::unreachable();
}();
auto srun_string = [&]

7
packages/sbatch-tui/src/vasp_gpu.cpp
View File

@@ -19,7 +19,7 @@ namespace sbatch
std::string OpenmpThreads = "1";
bool Nomultithread = true;
int MemorySchemeSelected = 0;
std::vector<std::string> MemorySchemeEntries = { "Default", "All", "Custom" };
std::vector<std::string> MemorySchemeEntries = { "Default", "Custom" };
std::string Memory = "1";
bool OptcellEnable = false;
int OptcellSelected = 0;
@@ -108,7 +108,7 @@ namespace sbatch
ftxui::Menu(&State_.MemorySchemeEntries, &State_.MemorySchemeSelected),
input(&State_.Memory, "Memory (GB): ")
| with_list_padding | with_separator
| ftxui::Maybe([&]{ return State_.MemorySchemeSelected == 2; })
| ftxui::Maybe([&]{ return State_.MemorySchemeSelected == 1; })
}) | with_title("Memory:", ftxui::Color::GrayDark) | with_separator
}) | with_title("Resource allocation:") | with_bottom,
// 第三行：任务名和输出文件
@@ -150,8 +150,7 @@ namespace sbatch
auto mem_string = [&]
{
if (State_.MemorySchemeSelected == 0) return "--mem=32G"s;
else if (State_.MemorySchemeSelected == 1) return "--mem=0"s;
else if (State_.MemorySchemeSelected == 2) return "--mem={}G"_f(State_.Memory);
else if (State_.MemorySchemeSelected == 1) return "--mem={}G"_f(State_.Memory);
else std::unreachable();
}();
return