chn/nixos
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixos.git synced 2026-01-12 02:09:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

packages.sbatch-tui: set config path at compile time

Browse Source
This commit is contained in:
陈浩南
2025-03-01 21:06:57 +08:00
parent 04580cecdf
commit d97315ef23
4 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
modules/services/slurm.nix
View File

@@ -249,7 +249,21 @@ inputs:
}; };
nixos = nixos =
{ {
packages.packages._packages = [ inputs.pkgs.localPackages.sbatch-tui ]; packages.packages._packages = [(inputs.pkgs.localPackages.sbatch-tui.override
{
sbatchConfig = inputs.pkgs.writeText "sbatch.yaml" (builtins.toJSON
{
GpuIds = slurm.tui.gpuIds;
GpuPartition = slurm.tui.gpuPartition;
CpuQueues = builtins.map
(queue:
[
queue.name
{ CpuMpiThreads = queue.mpiThreads; CpuOpenmpThreads = queue.openmpThreads; MemoryGB = queue.memoryGB; }
])
slurm.tui.cpuQueues;
});
})];
user.sharedModules = [{ home.packages = user.sharedModules = [{ home.packages =
[ [
(inputs.pkgs.writeShellScriptBin "sbatch" (inputs.pkgs.writeShellScriptBin "sbatch"
@@ -257,18 +271,6 @@ inputs:
];}]; ];}];
services.mariadb = { enable = true; instances.slurm = {}; }; services.mariadb = { enable = true; instances.slurm = {}; };
}; };
environment.etc."sbatch-tui.yaml".text = builtins.toJSON
{
GpuIds = slurm.tui.gpuIds;
GpuPartition = slurm.tui.gpuPartition;
CpuQueues = builtins.map
(queue:
[
queue.name
{ CpuMpiThreads = queue.mpiThreads; CpuOpenmpThreads = queue.openmpThreads; MemoryGB = queue.memoryGB; }
])
slurm.tui.cpuQueues;
};
networking.firewall = networking.firewall =
let config = inputs.lib.mkIf slurm.setupFirewall [ 6817 ]; let config = inputs.lib.mkIf slurm.setupFirewall [ 6817 ];
in { allowedTCPPorts = config; allowedUDPPorts = config; }; in { allowedTCPPorts = config; allowedUDPPorts = config; };

3
packages/sbatch-tui/CMakeLists.txt
View File

@@ -15,6 +15,9 @@ find_package(biu REQUIRED)
add_executable(sbatch-tui src/main.cpp) add_executable(sbatch-tui src/main.cpp)
target_compile_features(sbatch-tui PUBLIC cxx_std_23) target_compile_features(sbatch-tui PUBLIC cxx_std_23)
target_link_libraries(sbatch-tui PRIVATE ftxui::screen ftxui::dom ftxui::component biu::biu) target_link_libraries(sbatch-tui PRIVATE ftxui::screen ftxui::dom ftxui::component biu::biu)
if(SBATCH_CONFIG)
target_compile_definitions(sbatch-tui PRIVATE SBATCH_CONFIG="${SBATCH_CONFIG}")
endif()
install(TARGETS sbatch-tui RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) install(TARGETS sbatch-tui RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

3
packages/sbatch-tui/default.nix
View File

@@ -1,7 +1,8 @@
{ stdenv, cmake, pkg-config, ftxui, biu }: stdenv.mkDerivation { lib, stdenv, cmake, pkg-config, sbatchConfig ? null, ftxui, biu }: stdenv.mkDerivation
{ {
name = "sbatch-tui"; name = "sbatch-tui";
src = ./.; src = ./.;
buildInputs = [ ftxui biu ]; buildInputs = [ ftxui biu ];
nativeBuildInputs = [ cmake pkg-config ]; nativeBuildInputs = [ cmake pkg-config ];
cmakeFlags = lib.optional (sbatchConfig != null) [ "-DSBATCH_CONFIG=${sbatchConfig}" ];
} }

6
packages/sbatch-tui/src/main.cpp
View File

@@ -5,6 +5,10 @@
# include <boost/algorithm/string.hpp> # include <boost/algorithm/string.hpp>
# include <biu.hpp> # include <biu.hpp>
# ifndef SBATCH_CONFIG
# define SBATCH_CONFIG "./sbatch-tui.yaml"
# endif
int main() int main()
{ {
using namespace biu::literals; using namespace biu::literals;
@@ -17,7 +21,7 @@ int main()
std::optional<std::vector<std::string>> GpuIds; std::optional<std::vector<std::string>> GpuIds;
std::string GpuPartition; std::string GpuPartition;
}; };
auto device = YAML::LoadFile("/etc/sbatch-tui.yaml").as<Device>(); auto device = YAML::LoadFile(SBATCH_CONFIG).as<Device>();
// 需要绑定到界面上的变量 // 需要绑定到界面上的变量
struct struct