#5241 合并V20240116.patch分支内容到V20240129

Merged
ychao_1983 merged 4 commits from tmp-merge-cyf into V20240129 2 months ago
  1. +5
    -1
      modules/urfs_client/objectstorage/mocks/objectstorage_mock.go
  2. +20
    -20
      services/ai_task_service/container_builder/pre_model_builder.go
  3. +1
    -1
      web_src/js/features/clipboard.js
  4. +1
    -1
      web_src/js/features/highlight.js

+ 5
- 1
modules/urfs_client/objectstorage/mocks/objectstorage_mock.go View File

@@ -1,5 +1,9 @@
// Code generated by MockGen. DO NOT EDIT.
// Source: objectstorage.go

// Package mocks is a generated GoMock package.
package mocks

import (
gomock "github.com/golang/mock/gomock"
reflect "reflect"
)

+ 20
- 20
services/ai_task_service/container_builder/pre_model_builder.go View File

@@ -30,25 +30,25 @@ func (b *PretrainModelBuilder) SetOpts(opts *entity.ContainerBuildOpts) {
func (b *PretrainModelBuilder) Build(ctx *context.CreationContext) ([]entity.ContainerData, *response.BizError) {
form := ctx.Request
var preTrainModelEntity []entity.ContainerData
if ctx.Request.Cluster == entity.C2Net && (ctx.Request.JobType == models.JobTypeDebug || ctx.Request.JobType == models.JobTypeTrain) && ctx.Request.ComputeSource.Name == models.GPU {
//挂载一个文件夹保证容器内pretrainmodel目录提交镜像时不被打包
uploader := storage_helper.SelectStorageHelperFromStorageType(entity.OBS)
objectKey := path.Join(uploader.GetJobDefaultObjectKeyPrefix(form.JobName), "pretrain_model_mount")
uploader.MKDIR(objectKey, "pretrain model folder")
preTrainModelEntity = append(preTrainModelEntity, entity.ContainerData{
Name: "pretrain_model_mount",
Bucket: uploader.GetBucket(),
EndPoint: uploader.GetEndpoint(),
ObjectKey: objectKey + "/",
ReadOnly: false,
ContainerPath: b.Opts.ContainerPath,
RealPath: uploader.GetRealPath(objectKey),
S3DownloadUrl: uploader.GetS3DownloadUrl(objectKey),
IsDir: true,
IsOverwrite: true,
IsNeedUnzip: false,
})
}
//if ctx.Request.Cluster == entity.C2Net && (ctx.Request.JobType == models.JobTypeDebug || ctx.Request.JobType == models.JobTypeTrain) && ctx.Request.ComputeSource.Name == models.GPU {
// //挂载一个文件夹保证容器内pretrainmodel目录提交镜像时不被打包
// uploader := storage_helper.SelectStorageHelperFromStorageType(entity.OBS)
// objectKey := path.Join(uploader.GetJobDefaultObjectKeyPrefix(form.JobName), "pretrain_model_mount")
// uploader.MKDIR(objectKey, "pretrain model folder")
// preTrainModelEntity = append(preTrainModelEntity, entity.ContainerData{
// Name: "pretrain_model_mount",
// Bucket: uploader.GetBucket(),
// EndPoint: uploader.GetEndpoint(),
// ObjectKey: objectKey + "/",
// ReadOnly: false,
// ContainerPath: b.Opts.ContainerPath,
// RealPath: uploader.GetRealPath(objectKey),
// S3DownloadUrl: uploader.GetS3DownloadUrl(objectKey),
// IsDir: true,
// IsOverwrite: true,
// IsNeedUnzip: false,
// })
//}

if b.Opts.Disable {
return preTrainModelEntity, nil
@@ -123,7 +123,7 @@ func (b *PretrainModelBuilder) buildModelData(m *models.AiModelManage, jobName s
Bucket: uploader.GetBucket(),
EndPoint: uploader.GetEndpoint(),
ObjectKey: preTrainModelPath,
ReadOnly: false,
ReadOnly: true,
ContainerPath: path.Join(b.Opts.ContainerPath, m.Name),
RealPath: uploader.GetRealPath(preTrainModelPath),
S3DownloadUrl: uploader.GetS3DownloadUrl(preTrainModelPath),


+ 1
- 1
web_src/js/features/clipboard.js View File

@@ -3,7 +3,7 @@ export default async function initClipboard(elements) {
if (!els || !els.length) return;

const { default: ClipboardJS } = await import(
/* webpackChunkName: "clipboardjs" */ "clipboard"
/* webpackChunkName: "clipboard" */ "clipboard"
);

const clipboard = new ClipboardJS(els);


+ 1
- 1
web_src/js/features/highlight.js View File

@@ -3,7 +3,7 @@ export default async function highlight(elementOrNodeList) {
const nodes = 'length' in elementOrNodeList ? elementOrNodeList : [elementOrNodeList];
if (!nodes.length) return;

const {default: Worker} = await import(/* webpackChunkName: "highlight.worker" */'./highlight.worker.js');
const {default: Worker} = await import(/* webpackChunkName: "highlight" */'./highlight.worker.js');
const worker = new Worker();

worker.addEventListener('message', ({data}) => {


Loading…
Cancel
Save