From 974fe16a68b867607fac52988f9df0f4fc3dd312 Mon Sep 17 00:00:00 2001 From: limengxuan Date: Mon, 29 Jan 2024 15:06:03 +0800 Subject: [PATCH 1/4] move device-sharing logics from predicates to standalone devices plugin Signed-off-by: limengxuan --- docs/user-guide/how_to_use_gpu_number.md | 31 ++++- docs/user-guide/how_to_use_gpu_sharing.md | 31 ++++- docs/user-guide/how_to_use_vgpu.md | 29 ++++- pkg/scheduler/plugins/devices/devices.go | 110 ++++++++++++++++++ pkg/scheduler/plugins/factory.go | 2 + .../plugins/predicates/predicates.go | 51 -------- 6 files changed, 200 insertions(+), 54 deletions(-) create mode 100644 pkg/scheduler/plugins/devices/devices.go diff --git a/docs/user-guide/how_to_use_gpu_number.md b/docs/user-guide/how_to_use_gpu_number.md index b4a38a22a3..1b561a2c52 100644 --- a/docs/user-guide/how_to_use_gpu_number.md +++ b/docs/user-guide/how_to_use_gpu_number.md @@ -18,6 +18,35 @@ After installed, update the scheduler configuration: kubectl edit cm -n volcano-system volcano-scheduler-configmap ``` +For volcano v1.8.2+(v1.8.2 included), use the following configMap + +```yaml +kind: ConfigMap +apiVersion: v1 +metadata: + name: volcano-scheduler-configmap + namespace: volcano-system +data: + volcano-scheduler.conf: | + actions: "enqueue, allocate, backfill" + tiers: + - plugins: + - name: priority + - name: gang + - name: conformance + - plugins: + - name: drf + - name: devices + arguments: + devices.GPUNumberEnable: true # enable gpu number + - name: predicates + - name: proportion + - name: nodeorder + - name: binpack +``` + +For volcano v1.8.2-, use the following configMap + ```yaml kind: ConfigMap apiVersion: v1 @@ -36,7 +65,7 @@ data: - name: drf - name: predicates arguments: - predicate.GPUNumberEnable: true # enable gpu number + predicates.GPUNumberEnable: true # enable gpu number - name: proportion - name: nodeorder - name: binpack diff --git a/docs/user-guide/how_to_use_gpu_sharing.md b/docs/user-guide/how_to_use_gpu_sharing.md index 5f760cd3c3..d07d214a2c 100644 --- a/docs/user-guide/how_to_use_gpu_sharing.md +++ b/docs/user-guide/how_to_use_gpu_sharing.md @@ -18,6 +18,35 @@ After installed, update the scheduler configuration: kubectl edit cm -n volcano-system volcano-scheduler-configmap ``` +For volcano v1.8.2+(v1.8.2 included), use the following configMap + +```yaml +kind: ConfigMap +apiVersion: v1 +metadata: + name: volcano-scheduler-configmap + namespace: volcano-system +data: + volcano-scheduler.conf: | + actions: "enqueue, allocate, backfill" + tiers: + - plugins: + - name: priority + - name: gang + - name: conformance + - plugins: + - name: drf + - name: devices + arguments: + devices.GPUSharingEnable: true # enable gpu sharing + - name: predicates + - name: proportion + - name: nodeorder + - name: binpack +``` + +For volcano v1.8.2-, use the following configMap + ```yaml kind: ConfigMap apiVersion: v1 @@ -36,7 +65,7 @@ data: - name: drf - name: predicates arguments: - predicate.GPUSharingEnable: true # enable gpu sharing + predicates.GPUSharingEnable: true # enable gpu sharing - name: proportion - name: nodeorder - name: binpack diff --git a/docs/user-guide/how_to_use_vgpu.md b/docs/user-guide/how_to_use_vgpu.md index 7512b54629..aa47743c93 100644 --- a/docs/user-guide/how_to_use_vgpu.md +++ b/docs/user-guide/how_to_use_vgpu.md @@ -26,6 +26,33 @@ After installed, update the scheduler configuration: kubectl edit cm -n volcano-system volcano-scheduler-configmap ``` +For volcano v1.8.2+(v1.8.2 included), use the following configMap +```yaml +kind: ConfigMap +apiVersion: v1 +metadata: + name: volcano-scheduler-configmap + namespace: volcano-system +data: + volcano-scheduler.conf: | + actions: "enqueue, allocate, backfill" + tiers: + - plugins: + - name: priority + - name: gang + - name: conformance + - plugins: + - name: drf + - name: devices + arguments: + devices.VGPUEnable: true # enable vgpu + - name: predicates + - name: proportion + - name: nodeorder + - name: binpack +``` + +For volcano v1.8.2-, use the following configMap ```yaml kind: ConfigMap apiVersion: v1 @@ -44,7 +71,7 @@ data: - name: drf - name: predicates arguments: - predicate.VGPUEnable: true # enable vgpu + predicates.VGPUEnable: true # enable vgpu - name: proportion - name: nodeorder - name: binpack diff --git a/pkg/scheduler/plugins/devices/devices.go b/pkg/scheduler/plugins/devices/devices.go new file mode 100644 index 0000000000..39c0fe73a9 --- /dev/null +++ b/pkg/scheduler/plugins/devices/devices.go @@ -0,0 +1,110 @@ +/* +Copyright 2024 The Volcano Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package devices + +import ( + "fmt" + + "k8s.io/klog/v2" + + "volcano.sh/volcano/pkg/scheduler/api" + "volcano.sh/volcano/pkg/scheduler/api/devices" + "volcano.sh/volcano/pkg/scheduler/api/devices/nvidia/gpushare" + "volcano.sh/volcano/pkg/scheduler/api/devices/nvidia/vgpu" + "volcano.sh/volcano/pkg/scheduler/framework" +) + +// PluginName indicates name of volcano scheduler plugin. +const ( + PluginName = "devices" + // GPUSharingPredicate is the key for enabling GPU Sharing Predicate in YAML + GPUSharingPredicate = "devices.GPUSharingEnable" + NodeLockEnable = "devices.NodeLockEnable" + GPUNumberPredicate = "devices.GPUNumberEnable" + + VGPUEnable = "devices.VGPUEnable" +) + +type devicesPlugin struct { + // Arguments given for the plugin + pluginArguments framework.Arguments +} + +// New return priority plugin +func New(arguments framework.Arguments) framework.Plugin { + return &devicesPlugin{pluginArguments: arguments} +} + +func (dp *devicesPlugin) Name() string { + return PluginName +} + +func enablePredicate(args framework.Arguments) { + // Checks whether predicate.GPUSharingEnable is provided or not, if given, modifies the value in predicateEnable struct. + args.GetBool(&gpushare.GpuSharingEnable, GPUSharingPredicate) + args.GetBool(&gpushare.GpuNumberEnable, GPUNumberPredicate) + args.GetBool(&gpushare.NodeLockEnable, NodeLockEnable) + args.GetBool(&vgpu.VGPUEnable, VGPUEnable) + + if gpushare.GpuSharingEnable && gpushare.GpuNumberEnable { + klog.Fatal("can not define true in both gpu sharing and gpu number") + } + if (gpushare.GpuSharingEnable || gpushare.GpuNumberEnable) && vgpu.VGPUEnable { + klog.Fatal("gpu-share and vgpu can't be used together") + } +} + +func (dp *devicesPlugin) OnSessionOpen(ssn *framework.Session) { + enablePredicate(dp.pluginArguments) + // Register event handlers to update task info in PodLister & nodeMap + ssn.AddPredicateFn(dp.Name(), func(task *api.TaskInfo, node *api.NodeInfo) ([]*api.Status, error) { + predicateStatus := make([]*api.Status, 0) + // Check PredicateWithCache + for _, val := range api.RegisteredDevices { + if dev, ok := node.Others[val].(api.Devices); ok { + if dev == nil { + predicateStatus = append(predicateStatus, &api.Status{ + Code: devices.Unschedulable, + Reason: "node not initialized with device" + val, + }) + return predicateStatus, fmt.Errorf("node not initialized with device %s", val) + } + code, msg, err := dev.FilterNode(task.Pod) + filterNodeStatus := &api.Status{ + Code: code, + Reason: msg, + } + if err != nil { + return predicateStatus, err + } + if filterNodeStatus.Code != api.Success { + predicateStatus = append(predicateStatus, filterNodeStatus) + return predicateStatus, fmt.Errorf("plugin device filternode predicates failed %s", msg) + } + } else { + klog.Warningf("Devices %s assertion conversion failed, skip", val) + } + } + + klog.V(4).Infof("checkDevices predicates Task <%s/%s> on Node <%s>: fit ", + task.Namespace, task.Name, node.Name) + + return predicateStatus, nil + }) +} + +func (dp *devicesPlugin) OnSessionClose(ssn *framework.Session) {} diff --git a/pkg/scheduler/plugins/factory.go b/pkg/scheduler/plugins/factory.go index d96d0db975..ec811c2f87 100644 --- a/pkg/scheduler/plugins/factory.go +++ b/pkg/scheduler/plugins/factory.go @@ -21,6 +21,7 @@ import ( "volcano.sh/volcano/pkg/scheduler/plugins/binpack" "volcano.sh/volcano/pkg/scheduler/plugins/cdp" "volcano.sh/volcano/pkg/scheduler/plugins/conformance" + "volcano.sh/volcano/pkg/scheduler/plugins/devices" "volcano.sh/volcano/pkg/scheduler/plugins/drf" "volcano.sh/volcano/pkg/scheduler/plugins/extender" "volcano.sh/volcano/pkg/scheduler/plugins/gang" @@ -43,6 +44,7 @@ func init() { // Plugins for Jobs framework.RegisterPluginBuilder(drf.PluginName, drf.New) framework.RegisterPluginBuilder(gang.PluginName, gang.New) + framework.RegisterPluginBuilder(devices.PluginName, devices.New) framework.RegisterPluginBuilder(predicates.PluginName, predicates.New) framework.RegisterPluginBuilder(priority.PluginName, priority.New) framework.RegisterPluginBuilder(nodeorder.PluginName, nodeorder.New) diff --git a/pkg/scheduler/plugins/predicates/predicates.go b/pkg/scheduler/plugins/predicates/predicates.go index 324dbae7a2..34c656bc24 100644 --- a/pkg/scheduler/plugins/predicates/predicates.go +++ b/pkg/scheduler/plugins/predicates/predicates.go @@ -39,9 +39,6 @@ import ( "k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumezone" "volcano.sh/volcano/pkg/scheduler/api" - "volcano.sh/volcano/pkg/scheduler/api/devices" - "volcano.sh/volcano/pkg/scheduler/api/devices/nvidia/gpushare" - "volcano.sh/volcano/pkg/scheduler/api/devices/nvidia/vgpu" "volcano.sh/volcano/pkg/scheduler/framework" "volcano.sh/volcano/pkg/scheduler/plugins/util/k8s" ) @@ -71,13 +68,6 @@ const ( // PodTopologySpreadEnable is the key for enabling Pod Topology Spread Predicates in scheduler configmap PodTopologySpreadEnable = "predicate.PodTopologySpreadEnable" - // GPUSharingPredicate is the key for enabling GPU Sharing Predicate in YAML - GPUSharingPredicate = "predicate.GPUSharingEnable" - NodeLockEnable = "predicate.NodeLockEnable" - GPUNumberPredicate = "predicate.GPUNumberEnable" - - VGPUEnable = "predicate.VGPUEnable" - // CachePredicate control cache predicate feature CachePredicate = "predicate.CacheEnable" @@ -176,18 +166,6 @@ func enablePredicate(args framework.Arguments) predicateEnable { args.GetBool(&predicate.volumeZoneEnable, VolumeZoneEnable) args.GetBool(&predicate.podTopologySpreadEnable, PodTopologySpreadEnable) - // Checks whether predicate.GPUSharingEnable is provided or not, if given, modifies the value in predicateEnable struct. - args.GetBool(&gpushare.GpuSharingEnable, GPUSharingPredicate) - args.GetBool(&gpushare.GpuNumberEnable, GPUNumberPredicate) - args.GetBool(&gpushare.NodeLockEnable, NodeLockEnable) - args.GetBool(&vgpu.VGPUEnable, VGPUEnable) - - if gpushare.GpuSharingEnable && gpushare.GpuNumberEnable { - klog.Fatal("can not define true in both gpu sharing and gpu number") - } - if (gpushare.GpuSharingEnable || gpushare.GpuNumberEnable) && vgpu.VGPUEnable { - klog.Fatal("gpu-share and vgpu can't be used together") - } args.GetBool(&predicate.cacheEnable, CachePredicate) // Checks whether predicate.ProportionalEnable is provided or not, if given, modifies the value in predicateEnable struct. args.GetBool(&predicate.proportionalEnable, ProportionalPredicate) @@ -539,35 +517,6 @@ func (pp *predicatesPlugin) OnSessionOpen(ssn *framework.Session) { } } - for _, val := range api.RegisteredDevices { - if dev, ok := node.Others[val].(api.Devices); ok { - if dev == nil { - predicateStatus = append(predicateStatus, &api.Status{ - Code: devices.Unschedulable, - Reason: "node not initialized with device" + val, - }) - return predicateStatus, fmt.Errorf("node not initialized with device %s", val) - } - code, msg, err := dev.FilterNode(task.Pod) - filterNodeStatus := &api.Status{ - Code: code, - Reason: msg, - } - if err != nil { - return predicateStatus, err - } - if filterNodeStatus.Code != api.Success { - predicateStatus = append(predicateStatus, filterNodeStatus) - return predicateStatus, fmt.Errorf("plugin device filternode predicates failed %s", msg) - } - } else { - klog.Warningf("Devices %s assertion conversion failed, skip", val) - } - } - - klog.V(4).Infof("checkNodeGPUPredicate predicates Task <%s/%s> on Node <%s>: fit %v", - task.Namespace, task.Name, node.Name, fit) - if predicate.proportionalEnable { // Check ProportionalPredicate proportionalStatus, err := checkNodeResourceIsProportional(task, node, predicate.proportional) From ac8e005486bfcd5571dda5c0975a3de08e0fbaef Mon Sep 17 00:00:00 2001 From: limengxuan Date: Sun, 4 Feb 2024 14:37:22 +0800 Subject: [PATCH 2/4] update docs Signed-off-by: limengxuan --- docs/user-guide/how_to_use_gpu_number.md | 2 +- docs/user-guide/how_to_use_gpu_sharing.md | 2 +- docs/user-guide/how_to_use_vgpu.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/user-guide/how_to_use_gpu_number.md b/docs/user-guide/how_to_use_gpu_number.md index 1b561a2c52..1d22b2e040 100644 --- a/docs/user-guide/how_to_use_gpu_number.md +++ b/docs/user-guide/how_to_use_gpu_number.md @@ -65,7 +65,7 @@ data: - name: drf - name: predicates arguments: - predicates.GPUNumberEnable: true # enable gpu number + predicate.GPUNumberEnable: true # enable gpu number - name: proportion - name: nodeorder - name: binpack diff --git a/docs/user-guide/how_to_use_gpu_sharing.md b/docs/user-guide/how_to_use_gpu_sharing.md index d07d214a2c..0766bf33f8 100644 --- a/docs/user-guide/how_to_use_gpu_sharing.md +++ b/docs/user-guide/how_to_use_gpu_sharing.md @@ -65,7 +65,7 @@ data: - name: drf - name: predicates arguments: - predicates.GPUSharingEnable: true # enable gpu sharing + predicate.GPUSharingEnable: true # enable gpu sharing - name: proportion - name: nodeorder - name: binpack diff --git a/docs/user-guide/how_to_use_vgpu.md b/docs/user-guide/how_to_use_vgpu.md index aa47743c93..4989bdea39 100644 --- a/docs/user-guide/how_to_use_vgpu.md +++ b/docs/user-guide/how_to_use_vgpu.md @@ -71,7 +71,7 @@ data: - name: drf - name: predicates arguments: - predicates.VGPUEnable: true # enable vgpu + predicate.VGPUEnable: true # enable vgpu - name: proportion - name: nodeorder - name: binpack From 14f1a68f6c896bf1f438156b1fb547f099615825 Mon Sep 17 00:00:00 2001 From: limengxuan Date: Mon, 19 Feb 2024 11:37:55 +0800 Subject: [PATCH 3/4] modify docs Signed-off-by: limengxuan --- docs/user-guide/how_to_use_gpu_number.md | 4 ++-- docs/user-guide/how_to_use_gpu_sharing.md | 4 ++-- docs/user-guide/how_to_use_vgpu.md | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/user-guide/how_to_use_gpu_number.md b/docs/user-guide/how_to_use_gpu_number.md index 1d22b2e040..5477fd29c1 100644 --- a/docs/user-guide/how_to_use_gpu_number.md +++ b/docs/user-guide/how_to_use_gpu_number.md @@ -18,7 +18,7 @@ After installed, update the scheduler configuration: kubectl edit cm -n volcano-system volcano-scheduler-configmap ``` -For volcano v1.8.2+(v1.8.2 included), use the following configMap +For volcano v1.8.2+(v1.8.2 excluded), use the following configMap ```yaml kind: ConfigMap @@ -45,7 +45,7 @@ data: - name: binpack ``` -For volcano v1.8.2-, use the following configMap +For volcano v1.8.2-(v1.8.2 included), use the following configMap ```yaml kind: ConfigMap diff --git a/docs/user-guide/how_to_use_gpu_sharing.md b/docs/user-guide/how_to_use_gpu_sharing.md index 0766bf33f8..f8b36ceb74 100644 --- a/docs/user-guide/how_to_use_gpu_sharing.md +++ b/docs/user-guide/how_to_use_gpu_sharing.md @@ -18,7 +18,7 @@ After installed, update the scheduler configuration: kubectl edit cm -n volcano-system volcano-scheduler-configmap ``` -For volcano v1.8.2+(v1.8.2 included), use the following configMap +For volcano v1.8.2+(v1.8.2 excluded), use the following configMap ```yaml kind: ConfigMap @@ -45,7 +45,7 @@ data: - name: binpack ``` -For volcano v1.8.2-, use the following configMap +For volcano v1.8.2-(v1.8.2 included), use the following configMap ```yaml kind: ConfigMap diff --git a/docs/user-guide/how_to_use_vgpu.md b/docs/user-guide/how_to_use_vgpu.md index 4989bdea39..437d5fb93a 100644 --- a/docs/user-guide/how_to_use_vgpu.md +++ b/docs/user-guide/how_to_use_vgpu.md @@ -26,7 +26,7 @@ After installed, update the scheduler configuration: kubectl edit cm -n volcano-system volcano-scheduler-configmap ``` -For volcano v1.8.2+(v1.8.2 included), use the following configMap +For volcano v1.8.2+(v1.8.2 excluded), use the following configMap ```yaml kind: ConfigMap apiVersion: v1 @@ -52,7 +52,7 @@ data: - name: binpack ``` -For volcano v1.8.2-, use the following configMap +For volcano v1.8.2-(v1.8.2 included), use the following configMap ```yaml kind: ConfigMap apiVersion: v1 From 37c8bcac09ca55fb0c45b259fbd5bb06d6f74d32 Mon Sep 17 00:00:00 2001 From: limengxuan Date: Fri, 1 Mar 2024 18:08:05 +0800 Subject: [PATCH 4/4] rename plugin name from devices to deviceshare Signed-off-by: limengxuan --- docs/user-guide/how_to_use_gpu_number.md | 4 ++-- docs/user-guide/how_to_use_gpu_sharing.md | 4 ++-- docs/user-guide/how_to_use_vgpu.md | 4 ++-- .../devices.go => deviceshare/deviceshare.go} | 22 +++++++++---------- pkg/scheduler/plugins/factory.go | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) rename pkg/scheduler/plugins/{devices/devices.go => deviceshare/deviceshare.go} (85%) diff --git a/docs/user-guide/how_to_use_gpu_number.md b/docs/user-guide/how_to_use_gpu_number.md index 5477fd29c1..f8415a06b7 100644 --- a/docs/user-guide/how_to_use_gpu_number.md +++ b/docs/user-guide/how_to_use_gpu_number.md @@ -36,9 +36,9 @@ data: - name: conformance - plugins: - name: drf - - name: devices + - name: deviceshare arguments: - devices.GPUNumberEnable: true # enable gpu number + deviceshare.GPUNumberEnable: true # enable gpu number - name: predicates - name: proportion - name: nodeorder diff --git a/docs/user-guide/how_to_use_gpu_sharing.md b/docs/user-guide/how_to_use_gpu_sharing.md index f8b36ceb74..d6c09d297a 100644 --- a/docs/user-guide/how_to_use_gpu_sharing.md +++ b/docs/user-guide/how_to_use_gpu_sharing.md @@ -36,9 +36,9 @@ data: - name: conformance - plugins: - name: drf - - name: devices + - name: deviceshare arguments: - devices.GPUSharingEnable: true # enable gpu sharing + deviceshare.GPUSharingEnable: true # enable gpu sharing - name: predicates - name: proportion - name: nodeorder diff --git a/docs/user-guide/how_to_use_vgpu.md b/docs/user-guide/how_to_use_vgpu.md index 437d5fb93a..eb9b82d6c7 100644 --- a/docs/user-guide/how_to_use_vgpu.md +++ b/docs/user-guide/how_to_use_vgpu.md @@ -43,9 +43,9 @@ data: - name: conformance - plugins: - name: drf - - name: devices + - name: deviceshare arguments: - devices.VGPUEnable: true # enable vgpu + deviceshare.VGPUEnable: true # enable vgpu - name: predicates - name: proportion - name: nodeorder diff --git a/pkg/scheduler/plugins/devices/devices.go b/pkg/scheduler/plugins/deviceshare/deviceshare.go similarity index 85% rename from pkg/scheduler/plugins/devices/devices.go rename to pkg/scheduler/plugins/deviceshare/deviceshare.go index 39c0fe73a9..0fd3d2b710 100644 --- a/pkg/scheduler/plugins/devices/devices.go +++ b/pkg/scheduler/plugins/deviceshare/deviceshare.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package devices +package deviceshare import ( "fmt" @@ -30,26 +30,26 @@ import ( // PluginName indicates name of volcano scheduler plugin. const ( - PluginName = "devices" + PluginName = "deviceshare" // GPUSharingPredicate is the key for enabling GPU Sharing Predicate in YAML - GPUSharingPredicate = "devices.GPUSharingEnable" - NodeLockEnable = "devices.NodeLockEnable" - GPUNumberPredicate = "devices.GPUNumberEnable" + GPUSharingPredicate = "deviceshare.GPUSharingEnable" + NodeLockEnable = "deviceshare.NodeLockEnable" + GPUNumberPredicate = "deviceshare.GPUNumberEnable" - VGPUEnable = "devices.VGPUEnable" + VGPUEnable = "deviceshare.VGPUEnable" ) -type devicesPlugin struct { +type deviceSharePlugin struct { // Arguments given for the plugin pluginArguments framework.Arguments } // New return priority plugin func New(arguments framework.Arguments) framework.Plugin { - return &devicesPlugin{pluginArguments: arguments} + return &deviceSharePlugin{pluginArguments: arguments} } -func (dp *devicesPlugin) Name() string { +func (dp *deviceSharePlugin) Name() string { return PluginName } @@ -68,7 +68,7 @@ func enablePredicate(args framework.Arguments) { } } -func (dp *devicesPlugin) OnSessionOpen(ssn *framework.Session) { +func (dp *deviceSharePlugin) OnSessionOpen(ssn *framework.Session) { enablePredicate(dp.pluginArguments) // Register event handlers to update task info in PodLister & nodeMap ssn.AddPredicateFn(dp.Name(), func(task *api.TaskInfo, node *api.NodeInfo) ([]*api.Status, error) { @@ -107,4 +107,4 @@ func (dp *devicesPlugin) OnSessionOpen(ssn *framework.Session) { }) } -func (dp *devicesPlugin) OnSessionClose(ssn *framework.Session) {} +func (dp *deviceSharePlugin) OnSessionClose(ssn *framework.Session) {} diff --git a/pkg/scheduler/plugins/factory.go b/pkg/scheduler/plugins/factory.go index ec811c2f87..ba2bb92f97 100644 --- a/pkg/scheduler/plugins/factory.go +++ b/pkg/scheduler/plugins/factory.go @@ -21,7 +21,7 @@ import ( "volcano.sh/volcano/pkg/scheduler/plugins/binpack" "volcano.sh/volcano/pkg/scheduler/plugins/cdp" "volcano.sh/volcano/pkg/scheduler/plugins/conformance" - "volcano.sh/volcano/pkg/scheduler/plugins/devices" + "volcano.sh/volcano/pkg/scheduler/plugins/deviceshare" "volcano.sh/volcano/pkg/scheduler/plugins/drf" "volcano.sh/volcano/pkg/scheduler/plugins/extender" "volcano.sh/volcano/pkg/scheduler/plugins/gang" @@ -44,7 +44,7 @@ func init() { // Plugins for Jobs framework.RegisterPluginBuilder(drf.PluginName, drf.New) framework.RegisterPluginBuilder(gang.PluginName, gang.New) - framework.RegisterPluginBuilder(devices.PluginName, devices.New) + framework.RegisterPluginBuilder(deviceshare.PluginName, deviceshare.New) framework.RegisterPluginBuilder(predicates.PluginName, predicates.New) framework.RegisterPluginBuilder(priority.PluginName, priority.New) framework.RegisterPluginBuilder(nodeorder.PluginName, nodeorder.New)