From 1ba31abad2e8d8d3bf1a8978a3a6b7e5632f8393 Mon Sep 17 00:00:00 2001 From: jiang Date: Fri, 1 Apr 2022 14:46:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=96=B0=E5=A2=9Etadl=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BF=AE=E6=94=B9patch=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E4=B8=ADmenu=E6=96=B0=E5=A2=9E=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dubhe-server/sql/09-Dubhe-Patch.sql | 12 +++++--- dubhe-server/yaml/dubhe-tadl.yaml | 48 +++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 dubhe-server/yaml/dubhe-tadl.yaml diff --git a/dubhe-server/sql/09-Dubhe-Patch.sql b/dubhe-server/sql/09-Dubhe-Patch.sql index 3dfe9e4..d0aae3e 100644 --- a/dubhe-server/sql/09-Dubhe-Patch.sql +++ b/dubhe-server/sql/09-Dubhe-Patch.sql @@ -1,10 +1,12 @@ use `dubhe-cloud-prod`; -INSERT INTO `menu` VALUES (1085, 0, 0, '自动机器学习', 'jinhangzhongshiyan', 'tadl', NULL, NULL, NULL, 'TADL', b'0', b'0', 35, 1, 3, '2021-03-31 08:09:20', '2021-09-14 10:18:05', b'0', NULL, NULL); -INSERT INTO `menu` VALUES (1086, 1085, 1, '实验详情', NULL, 'experiment/:experimentId', 'tadl/detail', 'ExperimentDetail', 'DetailLayout', NULL, b'1', b'0', 999, 1, 1, '2021-03-31 08:23:56', '2021-03-31 08:36:36', b'0', NULL, '{}'); -INSERT INTO `menu` VALUES (1087, 1085, 1, '实验管理', NULL, 'list', 'tadl/list/index', 'TadlList', 'BaseLayout', 'tadl', b'0', b'0', 36, 3, 14, '2021-03-31 09:51:04', '2021-09-14 10:18:29', b'0', NULL, '{}'); -INSERT INTO `menu` VALUES (1088, 1085, 1, 'TadlForm', NULL, 'form', 'tadl/formPage', 'TadlForm', 'SubpageLayout', 'tadl', b'1', b'0', 999, 3, 3, '2021-03-31 09:51:59', '2021-03-31 09:52:04', b'0', NULL, '{}'); -INSERT INTO `menu` VALUES (1089, 1085, 1, '搜索策略', 'zoom', 'searchstrategy', 'tadl/strategy/index', 'SearchStrategy', 'BaseLayout', 'tadl', b'0', b'0', 37, 14, 14, '2021-03-31 10:40:50', '2021-03-31 11:39:59', b'0', NULL, '{}'); +INSERT INTO `menu` (`id`, `pid`, `type`, `name`, `icon` , `path`, `component`, `component_name`, `layout`, `permission` , `back_to`, `ext_config`, `hidden`, `cache`, `sort` , `create_user_id`, `update_user_id`, `deleted`) VALUES +(1085, 0, 0, '自动机器学习', 'jinhangzhongshiyan' , 'tadl', NULL, NULL, NULL, 'TADL' , NULL, NULL, b'0', b'0', 35 , 1, 3, b'0'), +(1086, 1085, 1, '实验详情', NULL , 'experiment/:experimentId', 'tadl/detail', 'ExperimentDetail', 'DetailLayout', NULL , NULL, '{}', b'1', b'0', 999 , 1, 1, b'0'), +(1087, 1085, 1, '实验管理', NULL, 'list', 'tadl/list/index', 'TadlList', 'BaseLayout', 'tadl', NULL, '{}', b'0', b'0', 36, 3, 14, b'0'), +(1088, 1085, 1, 'TadlForm', NULL, 'form', 'tadl/formPage', 'TadlForm', 'SubpageLayout', 'tadl',NULL, '{}', b'1', b'0', 999, 3, 3, b'0'), +(1089, 1085, 1, '搜索策略', 'zoom', 'searchstrategy', 'tadl/strategy/index', 'SearchStrategy', 'BaseLayout', 'tadl', NULL, '{}', b'0', b'0', 37, 14, 14, b'0'); + UPDATE menu SET menu.name ='云端部署' WHERE menu.name = '云端Serving' INSERT INTO `dict_detail`(`dict_id`, `label`, `value`, `sort`) VALUES (9, '自动机器学习', '4', 5); diff --git a/dubhe-server/yaml/dubhe-tadl.yaml b/dubhe-server/yaml/dubhe-tadl.yaml new file mode 100644 index 0000000..2982327 --- /dev/null +++ b/dubhe-server/yaml/dubhe-tadl.yaml @@ -0,0 +1,48 @@ +#开启超时熔断 +feign: + hystrix: + enabled: true + client: + config: + default: + connectTimeout: 10000 + readTimeout: 20000 +tadl: + # 镜像配置 + image: "harbor.dubhe.ai/automl/tadl:latest" + # docker 中数据集路径 + docker-dataset-path: "/dataset" + # docker 中算法路径 + docker-algorithm-path: "/algorithm" + # docker 中实验路径 + docker-experiment-path: "/experiment" + path: + # tadl任务实验相关路径 + experiment: + experimentPath: "%s/TADL/experiment/%s" + algorithm: + algorithm: "%s/TADL/experiment/%s/algorithm/TADL" + yaml: "%s/TADL/experiment/%s/algorithm/yaml/" + systemLogs: "%s/TADL/experiment/%s/systemLogs/" + # tadl任务实验阶段及trail相关路径 + stage: + trial: + selectSpace: "%s/TADL/experiment/%s/%s/%s/model_selected_space/" + result: "%s/TADL/experiment/%s/%s/%s/result/" + log: "%s/TADL/experiment/%s/%s/%s/log/" + searchSpace: "%s/TADL/experiment/%s/" + bestSelectedSpace: "%s/TADL/experiment/%s/" + bestCheckpoint: "%s/TADL/experiment/%s/" + experimentConfig: "%s/TADL/experiment/%s/" + # tadl算法相关路径 + algorithm: + algorithmPath: "%s/TADL/algorithm/%s" + parentYaml: "%s/TADL/algorithm/%s/TADL/pytorch/%s/yaml/" + yaml: "%s/TADL/algorithm/%s/yaml/%s" + pytorch: + algorithm: + yaml: "TADL/pytorch/%s/yaml/" +# 可匿名访问路径 +security: + permitAll: + matchers: /api/k8s/callback/pod/tadl