diff --git a/packages/chn-bsub/bsub.yaml b/packages/chn-bsub/bsub.yaml index 4f6faab4..0c469390 100644 --- a/packages/chn-bsub/bsub.yaml +++ b/packages/chn-bsub/bsub.yaml @@ -1,4 +1,2 @@ -Queues: - normal: [ 4, 4, 20 ] - normal_1day: [ 4, 7, 28 ] - +normal: [ 4, 4, 20 ] +normal_1day: [ 4, 7, 28 ] diff --git a/packages/chn-bsub/src/main.cpp b/packages/chn-bsub/src/main.cpp index b25cdfae..31490dab 100644 --- a/packages/chn-bsub/src/main.cpp +++ b/packages/chn-bsub/src/main.cpp @@ -35,9 +35,9 @@ int main() }(); std::string OutputFile = "output.txt"; } State; - struct { std::map> Queues; } QueueConfig = + std::map> QueueConfig = YAML::LoadFile(BSUB_CONFIG).as(); - State.QueueEntries = QueueConfig.Queues + State.QueueEntries = QueueConfig | ranges::views::transform([](auto const& item) { return item.first; }) | ranges::to_vector; @@ -140,7 +140,7 @@ int main() State.CurrentInterface = InterfaceType::Confirm; State.SubmitCommand = [&] { - auto [nproc, nthr, ncpu] = QueueConfig.Queues.at(State.QueueEntries[State.QueueSelected]); + auto [nproc, nthr, ncpu] = QueueConfig.at(State.QueueEntries[State.QueueSelected]); auto args = std::vector { "bsub",