Commit Graph

498 Commits

Author SHA1 Message Date
chenzhihang 3d67f58e5b 新模型dvc管理 2024-09-03 16:35:32 +08:00
chenzhihang 975f5adf8c Merge remote-tracking branch 'origin/dev' 2024-09-03 15:53:28 +08:00
chenzhihang 9d99398fb2 Merge remote-tracking branch 'origin/dev-czh' into dev 2024-09-03 15:53:04 +08:00
chenzhihang 0bb008ae9f 用户管理gitlinkpassword取消加密 2024-09-03 15:52:03 +08:00
chenzhihang 7312b56df9 Merge remote-tracking branch 'origin/dev'
# Conflicts:
#	ruoyi-auth/src/main/resources/bootstrap.yml
#	ruoyi-gateway/src/main/resources/bootstrap.yml
#	ruoyi-modules/management-platform/src/main/resources/bootstrap.yml
#	ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
#	ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml
#	ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml
#	ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
2024-09-03 14:01:36 +08:00
chenzhihang 973ef2c851 Merge remote-tracking branch 'origin/dev-czh' into dev 2024-09-02 18:14:27 +08:00
chenzhihang 5b581dab77 1、优化运行环境方法 2024-09-02 18:14:06 +08:00
chenzhihang 86511836d7 1、优化保存镜像方法 2024-09-02 18:13:37 +08:00
chenzhihang 38d41fc73a Merge remote-tracking branch 'origin/dev-czh' into dev 2024-09-02 17:00:27 +08:00
chenzhihang 56c1f854c6 1、优化保存镜像方法 2024-09-02 16:56:54 +08:00
chenzhihang f6827de6da 1、优化保存镜像方法 2024-09-02 16:55:02 +08:00
chenzhihang 1c24c6ff12 Merge remote-tracking branch 'origin/dev-czh' into dev 2024-09-02 16:20:44 +08:00
chenzhihang 4b27ca173b 优化代码配置详情查询 2024-09-02 16:19:58 +08:00
chenzhihang f393b8883a 优化代码配置查询 2024-09-02 16:13:16 +08:00
chenzhihang 233671e995 Merge remote-tracking branch 'origin/dev-czh' into dev 2024-09-02 16:08:27 +08:00
chenzhihang 40f8a9d775 优化nacos配置监听 2024-09-02 16:06:45 +08:00
chenzhihang c80f965e7b Merge remote-tracking branch 'origin/dev-czh' into dev
# Conflicts:
#	react-ui/src/pages/Dataset/components/ResourceItem/index.less
#	react-ui/src/pages/Dataset/components/ResourceItem/index.tsx
2024-09-02 15:46:18 +08:00
chenzhihang d447a6f0f3 1、优化保存镜像方法
2、优化删除镜像方法
2024-09-02 15:23:14 +08:00
chenzhihang 37250cee31 Merge remote-tracking branch 'origin/dev-czh' into dev 2024-09-02 11:01:24 +08:00
chenzhihang 48e05b0397 优化代码配置,设置仓库名称唯一性 2024-09-02 10:58:15 +08:00
chenzhihang 17e8a157ee Merge remote-tracking branch 'origin/dev' into dev 2024-09-02 10:53:56 +08:00
fanshuai 6eab18c507 Update pom.xml 2024-09-02 10:49:36 +08:00
chenzhihang 36b13448fd 1、修改用户信息查询角色返回
2、修改代码配置,设置仓库名称唯一性
2024-09-02 10:37:18 +08:00
fanshuai 9df8e654a1 update pom version 2024-09-02 09:17:59 +08:00
fanshuai ae0632b090 Merge branch 'dev' of https://gitlink.org.cn/ci4s/ci4sManagement-cloud into dev 2024-08-30 13:58:07 +08:00
fanshuai 586f5aa2db Merge pull request '830' (#123) from dev into master 2024-08-30 13:58:06 +08:00
fanshuai 778df909bd dvc 2024-08-30 13:57:55 +08:00
chenzhihang 072686bfa0 1、修改用户信息查询 2024-08-30 11:15:36 +08:00
chenzhihang da671bb0c3 Merge branch 'dev-czh' into dev 2024-08-30 10:07:37 +08:00
fanshuai df87d16d8f dvc 2024-08-30 10:03:07 +08:00
chenzhihang e381f5a549 1、优化pod节点资源分配 2024-08-30 09:57:50 +08:00
chenzhihang b4672c5c86 1、配置pod节点亲和性和资源分配 2024-08-30 09:52:52 +08:00
chenzhihang 4d9f831cc9 1、配置pod请求限制资源 2024-08-29 17:37:58 +08:00
chenzhihang d2c6e9a77e 1、修改代码配置 2024-08-29 16:54:08 +08:00
chenzhihang e37dd1d0b5 1、修改代码配置bug 2024-08-29 16:17:01 +08:00
chenzhihang f24e764aaa 1、用户添加gitLink用户名密码字段 2024-08-29 16:11:52 +08:00
chenzhihang 85f06999b8 1、修改代码配置 2024-08-29 15:59:52 +08:00
chenzhihang 9ac99957ed 1、添加代码配置sshkey字段 2024-08-29 15:17:10 +08:00
chenzhihang d42b8e918d 1、添加GPU占用情况设置 2024-08-29 14:18:13 +08:00
chenzhihang 7011194adc 1、添加GPU占用情况设置 2024-08-29 14:02:18 +08:00
fanshuai c9a02ec2f5 Merge pull request '829CZH' (#122) from dev into master 2024-08-29 11:24:14 +08:00
fanshuai 5a27d79726 Update K8sClientUtil.java 2024-08-29 11:24:04 +08:00
chenzhihang f6db5d28eb Merge branch 'dev-czh' into dev 2024-08-29 11:12:16 +08:00
chenzhihang b571b2af91 1、添加代码配置增删改查接口 2024-08-29 11:11:50 +08:00
fanshuai 178ba71c34 Merge pull request '829' (#121) from dev into master 2024-08-29 10:10:13 +08:00
fanshuai 3babd3ab8c 新增dvc操作 2024-08-29 10:10:04 +08:00
fanshuai 43b78fefd5 新增dvc操作 2024-08-29 10:08:02 +08:00
fanshuai e20b00155f 新增dvc操作 2024-08-29 08:46:20 +08:00
fanshuai 9471158d54 新增dvc操作 2024-08-29 08:27:40 +08:00
chenzhihang cfeca85f6d 1、设置启动pod亲和性反亲和性 2024-08-28 14:27:19 +08:00
chenzhihang 88269061d9 1、保存镜像设为私人镜像 2024-08-28 09:37:52 +08:00
chenzhihang a73b83c97d 1、保存镜像,同时修改环境的镜像。 2024-08-28 08:51:58 +08:00
chenzhihang 88f4231459 1、保存镜像,同时保存数据库。
2、修改数据,模型挂载地址当前工作目录。
2024-08-27 17:40:33 +08:00
西大锐 c594dca0ec 1、添加选择镜像启动环境功能。
2、pod选择GPU节点部署。
3、增加保存镜像接口。
2024-08-27 15:55:13 +08:00
cp3hnu c6b8fff02f Merge pull request '合并dev' (#106) from dev into master 2024-07-19 09:35:20 +08:00
西大锐 9f2d2be545 fix:开发环境删除pod同时删除svc 2024-07-18 21:15:35 +08:00
西大锐 b544f9afbf fix:开发环境数据集模型挂载路径修复 2024-07-18 11:00:07 +08:00
西大锐 53b59fd26f fix:开发环境数据集模型挂载路径修复 2024-07-18 10:23:57 +08:00
cp3hnu 6b39f6d295 Merge pull request '合并dev' (#102) from dev into master 2024-07-11 10:21:44 +08:00
西大锐 fafa46b587 Merge remote-tracking branch 'origin/dev' into dev 2024-07-08 13:51:19 +08:00
西大锐 24898ee74e feat:工具类添加注释 2024-07-08 13:51:04 +08:00
cp3hnu 40a14ab588 Merge pull request '合并dev' (#100) from dev into master 2024-07-08 09:38:31 +08:00
fanshuai 51d1b77df6 修改存储地址BUG 2024-07-02 11:22:40 +08:00
fanshuai 67a6622440 Merge pull request '628' (#97) from dev into master 2024-06-28 14:15:51 +08:00
fanshuai 03ea2ef74a 指标对比去除脏数据 2024-06-28 14:15:12 +08:00
fanshuai ef16c5e0ce Merge remote-tracking branch 'origin/dev' into dev 2024-06-28 14:08:36 +08:00
fanshuai 4ccf5555e5 指标对比去除脏数据 2024-06-28 14:08:31 +08:00
西大锐 7a0b480b15 Merge remote-tracking branch 'origin/dev' into dev 2024-06-27 10:14:35 +08:00
西大锐 65e89edeed fix:镜像版本子查询修改 2024-06-27 10:14:26 +08:00
fanshuai 7dbc0d6881 Merge pull request '627' (#96) from dev into master 2024-06-27 10:04:21 +08:00
fanshuai 37b4e3d617 新增指标对比 2024-06-27 09:38:20 +08:00
fanshuai 5442982132 Merge pull request '2024626' (#95) from dev into master 2024-06-26 16:00:17 +08:00
fanshuai 884ad765bf 新增指标对比 2024-06-26 15:46:50 +08:00
西大锐 75d7b5b739 Merge remote-tracking branch 'origin/dev' into dev 2024-06-26 14:17:34 +08:00
西大锐 7f8219d369 feat:jupyter返回状态查询 2024-06-26 14:17:20 +08:00
fanshuai 0e6c7ce5e8 新增指标对比 2024-06-26 09:14:41 +08:00
fanshuai 01e1f7e951 新增指标对比 2024-06-24 19:24:55 +08:00
cp3hnu a15d654ce0 Merge pull request '合并dev' (#87) from dev into master 2024-06-24 09:05:28 +08:00
西大锐 3261418ab5 feat:jupyter返回状态查询 2024-06-21 17:01:28 +08:00
西大锐 e6530ea9a5 feat:jupyter返回状态查询 2024-06-21 15:38:18 +08:00
西大锐 3385fbc0d9 修改pod状态查询 2024-06-21 11:52:13 +08:00
cp3hnu 142273a2d1 Merge pull request '合并dev' (#83) from dev into master 2024-06-21 08:42:18 +08:00
西大锐 6cbf361302 修改k8s工具类配置,挂载minio PVC 2024-06-20 17:24:15 +08:00
西大锐 595fa4f2f7 修改k8s工具类配置,挂载minio PVC 2024-06-20 14:50:10 +08:00
西大锐 cfc04268f0 修改k8s工具类配置,挂载minio PVC 2024-06-20 11:50:59 +08:00
西大锐 d43b5020e7 初始状态设置 2024-06-20 10:00:16 +08:00
西大锐 ccfc293029 修改pod构造名称 2024-06-20 09:45:55 +08:00
西大锐 34792a7397 feat:开发环境新增接口联调完成 2024-06-20 09:38:30 +08:00
fanshuai 9e140d1944 新增字段参数记录 2024-06-19 14:07:12 +08:00
西大锐 2ddfb77be5 feat:新增jupyter查询状态接口 2024-06-18 09:41:16 +08:00
西大锐 7beadd4132 Merge remote-tracking branch 'origin/dev' into dev 2024-06-17 10:22:58 +08:00
西大锐 350bff0c46 feat:新增jupyter查询状态接口 2024-06-17 10:22:49 +08:00
cp3hnu a5570045e7 Merge pull request '合并dev' (#81) from dev into master 2024-06-14 16:44:29 +08:00
fanshuai 077e1a2504 Merge branch 'dev' of https://gitlink.org.cn/ci4s/ci4sManagement-cloud into dev 2024-06-14 16:34:01 +08:00
fanshuai f8f4c2a245 修改状态更新 2024-06-14 16:33:51 +08:00
cp3hnu 3b45e3befc Merge pull request '合并dev' (#75) from dev into master 2024-06-14 11:02:02 +08:00
西大锐 55eeb0a126 Merge remote-tracking branch 'origin/dev' into dev 2024-06-13 17:23:29 +08:00
西大锐 603a91db9e feat:新增jupyter查询状态接口 2024-06-13 17:22:51 +08:00
fanshuai a67f5ff5ba Merge pull request '612145' (#68) from dev into master 2024-06-12 15:07:53 +08:00
fanshuai da2c5491d2 模型演化改造 2024-06-12 15:00:29 +08:00
fanshuai 08edd10881 Merge pull request '6125' (#61) from dev into master 2024-06-12 10:01:53 +08:00
fanshuai bdb79fd869 模型演化改造 2024-06-12 09:58:35 +08:00
fanshuai 0f4edd8bfd Merge pull request '61211' (#60) from dev into master 2024-06-12 09:21:46 +08:00
fanshuai 48841a19e8 Merge branch 'dev' of https://gitlink.org.cn/ci4s/ci4sManagement-cloud into dev 2024-06-12 09:18:29 +08:00
fanshuai 6e5fedb103 模型演化改造 2024-06-12 09:18:09 +08:00
西大锐 a864f0bd2a Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/aim/AimController.java
2024-06-12 09:12:43 +08:00
西大锐 1216694204 feat:新增jupyter查询状态接口 2024-06-12 09:12:00 +08:00
fanshuai 1b21cfda14 Merge pull request '612' (#59) from dev into master 2024-06-12 09:10:14 +08:00
fanshuai 6f3175f305 模型演化改造 2024-06-12 09:06:08 +08:00
fanshuai 7bf979c053 Merge pull request '611-1' (#58) from dev into master 2024-06-11 16:24:04 +08:00
fanshuai 9b6d416ba0 Merge pull request '611' (#57) from dev into master 2024-06-11 16:23:05 +08:00
fanshuai 7527b3a5da Merge branch 'dev' of https://gitlink.org.cn/ci4s/ci4sManagement-cloud into dev 2024-06-11 16:20:55 +08:00
fanshuai b2f2d8d45f 模型演化改造 2024-06-11 16:20:47 +08:00
西大锐 737964478d Merge remote-tracking branch 'origin/dev' into dev 2024-06-11 16:18:57 +08:00
西大锐 9b41b66d7d fix:修改循环依赖bug,添加懒加载注解 2024-06-11 16:18:36 +08:00
fanshuai 735dcbd9bc Merge branch 'dev' of https://gitlink.org.cn/ci4s/ci4sManagement-cloud into dev 2024-06-11 16:16:50 +08:00
fanshuai d8e3e98a95 模型演化改造 2024-06-11 16:16:45 +08:00
西大锐 877dd0ac3e fix:修改循环依赖bug,添加懒加载注解 2024-06-11 16:12:02 +08:00
西大锐 b0fcc9200a fix:修改mapper文件 2024-06-11 09:43:25 +08:00
fanshuai 1bcdda2866 模型演化改造 2024-06-11 08:47:03 +08:00
西大锐 e84beac4c6 feat:开发环境数据集模型可配置一阶段 2024-06-07 11:39:11 +08:00
cp3hnu 299cf582c5 Merge pull request '合并dev' (#56) from dev into master 2024-06-07 11:29:22 +08:00
西大锐 960242f237 Merge remote-tracking branch 'origin/dev' into dev 2024-06-06 17:13:13 +08:00
西大锐 c25e811376 feat:开发环境数据集模型可配置一阶段 2024-06-06 17:12:57 +08:00
fanshuai 3d3113506b 模型演化改造 2024-06-06 16:34:59 +08:00
fanshuai 257c4d704c 模型演化改造 2024-06-06 16:04:27 +08:00
fanshuai ea6400bb4b 模型演化改造 2024-06-05 15:07:12 +08:00
西大锐 8e03aab445 fix:模型依赖改名 2024-06-04 14:15:29 +08:00
西大锐 40a340c7e5 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelDependencyServiceImpl.java
2024-06-04 14:14:37 +08:00
西大锐 79101d4587 feat:开发环境后端框架搭建,增删改查接口实现 2024-06-04 14:11:55 +08:00
fanshuai 83c531069b Merge remote-tracking branch 'origin/dev' into dev 2024-06-04 08:50:44 +08:00
fanshuai f65f8849a4 新增name 2024-06-04 08:50:37 +08:00
西大锐 db42744c97 Merge remote-tracking branch 'origin/dev' into dev 2024-06-03 16:57:18 +08:00
西大锐 b7b92ce701 feat:开发环境后端框架搭建,增删改查接口实现 2024-06-03 16:57:07 +08:00
fanshuai ae13606635 修改转换工具的判断 2024-06-03 16:09:51 +08:00
fanshuai 4b1c8bf3e5 修改依赖关系图谱~ 2024-06-03 11:53:08 +08:00
fanshuai ae0b5b05bf 修改依赖关系图谱~ 2024-06-03 11:25:05 +08:00
fanshuai c67a4bfe70 注释依赖关系图谱~ 2024-06-03 08:58:05 +08:00
fanshuai b6baa46598 Merge remote-tracking branch 'origin/dev' into dev 2024-05-31 17:59:50 +08:00
fanshuai e71b3f8e84 到处依赖关系图谱~ 2024-05-31 17:58:54 +08:00
西大锐 ada8b8f447 fix:修复bug 2024-05-31 17:18:02 +08:00
fanshuai dd1cc23010 Merge remote-tracking branch 'origin/dev' into dev 2024-05-31 10:35:07 +08:00
西大锐 bd1089c6a4 feat:模型依赖增加根据对象查询接口 2024-05-31 10:33:49 +08:00
fanshuai 1e5ab63d9e Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelDependency.java
2024-05-31 09:55:57 +08:00
西大锐 12effaf354 模型依赖增加字段 2024-05-31 09:48:02 +08:00
fanshuai eea3008bb1 Merge remote-tracking branch 'origin/dev' into dev 2024-05-31 08:39:34 +08:00
西大锐 12b91800b9 fix:修复模型依赖插入bug 2024-05-30 19:20:41 +08:00
西大锐 4ac23e086b fix:修复模型依赖插入bug 2024-05-30 16:52:13 +08:00
fanshuai b8dc8f64b6 记录依赖关系~ 2024-05-30 16:06:38 +08:00
西大锐 1e7bfbc8a7 fix:修复bug 2024-05-30 11:25:20 +08:00