Skip to content

Add cbatch/calloc/crun --mem-per-cpu #275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Add cbatch/calloc/crun --mem-per-cpu #275

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f5568ec
add cbatch/calloc/crun --mem-per-cpu
1daidai1 May 14, 2025
ce6cab9
fix comments
1daidai1 May 19, 2025
9adf13f
fix comments
1daidai1 May 19, 2025
53cd445
fix comments
1daidai1 May 19, 2025
d7e253e
fix compile error
L-Xiafeng Jul 1, 2025
04bf4da
fix compile error
L-Xiafeng Jul 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions internal/calloc/CmdArgParser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ var (
FlagGetUserEnv bool
FlagExport string
FlagExclusive bool
FlagMemPerCpu string

FlagExtraAttr string
FlagMailType string
Expand Down Expand Up @@ -96,4 +97,6 @@ func init() {
RootCmd.Flags().StringVar(&FlagComment, "comment", "", "Comment of the job")
RootCmd.Flags().StringVarP(&FlagReservation, "reservation", "r", "", "Use reserved resources")
RootCmd.Flags().BoolVar(&FlagExclusive, "exclusive", false, "Exclusive node resources")
RootCmd.Flags().StringVarP(&FlagMemPerCpu, "mem-per-cpu", "", "", "Maximum amount of real memory per CPU, support GB(G, g), MB(M, m), KB(K, k) and Bytes(B), default unit is MB")
RootCmd.MarkFlagsMutuallyExclusive("mem", "mem-per-cpu")
}
8 changes: 8 additions & 0 deletions internal/calloc/calloc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,14 @@ func MainCalloc(cmd *cobra.Command, args []string) error {
task.ReqResources.AllocatableRes.MemoryLimitBytes = memInByte
task.ReqResources.AllocatableRes.MemorySwLimitBytes = memInByte
}
if FlagMemPerCpu != "" {
memInBytePerCpu, err := util.ParseMemStringAsByte(FlagMemPerCpu)
if err != nil {
log.Errorf("Invalid argument: %v", err)
return util.ErrorCmdArg
}
task.MemPerCpu = &memInBytePerCpu
}
if FlagPartition != "" {
task.PartitionName = FlagPartition
}
Expand Down
3 changes: 3 additions & 0 deletions internal/cbatch/CmdArgParser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ var (
FlagStderrPath string
FlagOpenMode string
FlagExclusive bool
FlagMemPerCpu string

FlagWrappedScript string

Expand Down Expand Up @@ -163,4 +164,6 @@ func init() {
RootCmd.Flags().StringVar(&FlagOpenMode, "open-mode", "", "Set the mode for opening output and error files, supported values: append, truncate (default is truncate) ")
RootCmd.Flags().StringVarP(&FlagReservation, "reservation", "r", "", "Use reserved resources")
RootCmd.Flags().BoolVar(&FlagExclusive, "exclusive", false, "Exclusive node resources")
RootCmd.Flags().StringVarP(&FlagMemPerCpu, "mem-per-cpu", "", "", "Maximum amount of real memory per CPU, support GB(G, g), MB(M, m), KB(K, k) and Bytes(B), default unit is MB")
RootCmd.MarkFlagsMutuallyExclusive("mem", "mem-per-cpu")
}
16 changes: 15 additions & 1 deletion internal/cbatch/cbatch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,13 @@ func ProcessCbatchArgs(cmd *cobra.Command, args []CbatchArg) (bool, *protos.Task
}
task.ReqResources.AllocatableRes.MemoryLimitBytes = memInByte
task.ReqResources.AllocatableRes.MemorySwLimitBytes = memInByte
case "--mem-per-cpu":
memInBytePerCpu, err := util.ParseMemStringAsByte(arg.val)
if err != nil {
log.Errorf("Invalid argument: %v in script: %v", arg.name, err)
return false, nil
}
task.MemPerCpu = &memInBytePerCpu
case "-p", "--partition":
task.PartitionName = arg.val
case "-J", "--job-name":
Expand Down Expand Up @@ -208,7 +215,14 @@ func ProcessCbatchArgs(cmd *cobra.Command, args []CbatchArg) (bool, *protos.Task
task.ReqResources.AllocatableRes.MemoryLimitBytes = memInByte
task.ReqResources.AllocatableRes.MemorySwLimitBytes = memInByte
}

if FlagMemPerCpu != "" {
memInBytePerCpu, err := util.ParseMemStringAsByte(FlagMemPerCpu)
if err != nil {
log.Errorf("Invalid argument: %v", err)
return false, nil
}
task.MemPerCpu = &memInBytePerCpu
}
if FlagPartition != "" {
task.PartitionName = FlagPartition
}
Expand Down
3 changes: 3 additions & 0 deletions internal/crun/CmdArgParser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ var (
FlagGres string
FlagPty bool
FlagExclusive bool
FlagMemPerCpu string

FlagX11 bool
FlagX11Fwd bool
Expand Down Expand Up @@ -107,4 +108,6 @@ func init() {
RootCmd.Flags().StringVar(&FlagComment, "comment", "", "Comment of the job")
RootCmd.Flags().StringVarP(&FlagReservation, "reservation", "r", "", "Use reserved resources")
RootCmd.Flags().BoolVar(&FlagExclusive, "exclusive", false, "Exclusive node resources")
RootCmd.Flags().StringVarP(&FlagMemPerCpu, "mem-per-cpu", "", "", "Maximum amount of real memory per CPU, support GB(G, g), MB(M, m), KB(K, k) and Bytes(B), default unit is MB")
RootCmd.MarkFlagsMutuallyExclusive("mem", "mem-per-cpu")
}
8 changes: 8 additions & 0 deletions internal/crun/crun.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,6 +862,14 @@ func MainCrun(args []string) error {
task.ReqResources.AllocatableRes.MemoryLimitBytes = memInByte
task.ReqResources.AllocatableRes.MemorySwLimitBytes = memInByte
}
if FlagMemPerCpu != "" {
memInBytePerCpu, err := util.ParseMemStringAsByte(FlagMemPerCpu)
if err != nil {
log.Errorf("Invalid argument: %v", err)
return util.ErrorCmdArg
}
task.MemPerCpu = &memInBytePerCpu
}
if FlagGres != "" {
gresMap := util.ParseGres(FlagGres)
task.ReqResources.DeviceMap = gresMap
Expand Down
1 change: 1 addition & 0 deletions protos/PublicDefs.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ message TaskToCtld {

string reservation = 36;
bool exclusive = 37;
optional uint64 mem_per_cpu = 38;
}

message TaskInEmbeddedDb {
Expand Down