diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Ray.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Ray.java index 47a68380..00ffb645 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Ray.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Ray.java @@ -62,11 +62,7 @@ public class Ray { @ApiModelProperty(value = "搜索算法为MedianStopping时传入,计算中位数的最小试验数。") private Integer minSamplesRequired; - @ApiModelProperty(value = "使用cpu数") - private Integer cpu; - - @ApiModelProperty(value = "使用gpu数") - private Integer gpu; + private String resource; private Integer state; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/RayVo.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/RayVo.java index af8b3e17..8f001f38 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/RayVo.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/RayVo.java @@ -55,11 +55,7 @@ public class RayVo { @ApiModelProperty(value = "计算中位数的最小试验数:调度算法为MedianStopping时传入,计算中位数的最小试验数。") private Integer minSamplesRequired; - @ApiModelProperty(value = "使用cpu数") - private Integer cpu; - - @ApiModelProperty(value = "使用gpu数") - private Integer gpu; + private String resource; private String createBy; diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/RayDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/RayDaoMapper.xml index 86d88f35..b8a7818c 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/RayDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/RayDaoMapper.xml @@ -4,11 +4,11 @@ insert into ray(name, description, dataset, dataset_path, code, main_py, num_samples, parameters, points_to_evaluate, storage_path, search_alg, scheduler, metric, mode, max_t, - min_samples_required, cpu, gpu, create_by, update_by) + min_samples_required, resource, create_by, update_by) values (#{ray.name}, #{ray.description}, #{ray.dataset}, #{ray.datasetPath}, #{ray.code}, #{ray.mainPy}, #{ray.numSamples}, #{ray.parameters}, #{ray.pointsToEvaluate}, #{ray.storagePath}, #{ray.searchAlg}, #{ray.scheduler}, #{ray.metric}, #{ray.mode}, #{ray.maxT}, #{ray.minSamplesRequired}, - #{ray.cpu}, #{ray.gpu}, #{ray.createBy}, #{ray.updateBy}) + #{ray.resource}, #{ray.createBy}, #{ray.updateBy}) @@ -62,11 +62,8 @@ min_samples_required = #{ray.minSamplesRequired}, - - cpu = #{ray.cpu}, - - - gpu = #{ray.gpu}, + + resource = #{ray.resource}, update_by = #{ray.updateBy},