From 36bda5ece70eeab453920acc1a3ca4ad5864ea62 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 28 Feb 2024 17:36:25 +0800 Subject: [PATCH 1/3] fix issue --- .../urfs_client/objectstorage/mocks/objectstorage_mock.go | 6 +++++- web_src/js/features/clipboard.js | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/urfs_client/objectstorage/mocks/objectstorage_mock.go b/modules/urfs_client/objectstorage/mocks/objectstorage_mock.go index baa34f437e..0b09403dd9 100644 --- a/modules/urfs_client/objectstorage/mocks/objectstorage_mock.go +++ b/modules/urfs_client/objectstorage/mocks/objectstorage_mock.go @@ -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" +) diff --git a/web_src/js/features/clipboard.js b/web_src/js/features/clipboard.js index 8ca939f0bc..b46427b690 100644 --- a/web_src/js/features/clipboard.js +++ b/web_src/js/features/clipboard.js @@ -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); -- 2.34.1 From 9c0b23fbd5f11ec4e65aabc9e46a1a69013f20f3 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 28 Feb 2024 17:57:45 +0800 Subject: [PATCH 2/3] fix issue --- web_src/js/features/highlight.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/js/features/highlight.js b/web_src/js/features/highlight.js index 123955a5b0..d3f6ba71b8 100644 --- a/web_src/js/features/highlight.js +++ b/web_src/js/features/highlight.js @@ -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}) => { -- 2.34.1 From 16e5f1b3f590a9838dffaba532df55bb40e307ff Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Mon, 4 Mar 2024 09:48:05 +0800 Subject: [PATCH 3/3] fix bug --- .../container_builder/pre_model_builder.go | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/services/ai_task_service/container_builder/pre_model_builder.go b/services/ai_task_service/container_builder/pre_model_builder.go index 51fd27acf0..3d5ee4113d 100644 --- a/services/ai_task_service/container_builder/pre_model_builder.go +++ b/services/ai_task_service/container_builder/pre_model_builder.go @@ -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), -- 2.34.1