Commit Graph

259 Commits

Author SHA1 Message Date
zhangwei 3825703ede modify path
Former-commit-id: e65fecbe3d93ddbc8787e23a2fea7f83fd3b2ea5
2024-05-16 16:46:02 +08:00
qiwang 961ec2d790 Merge remote-tracking branch 'origin/master' into master-wq
# Conflicts:
#	api/internal/logic/schedule/schedulesubmitlogic.go
#	api/internal/scheduler/database/aiStorage.go


Former-commit-id: dd876d4244717e948b9ec8cef12e5c243fa982cc
2024-05-16 15:58:34 +08:00
qiwang b2eb0a6156 fix: update ai Replicas
Former-commit-id: f08e733c5be93758e45a19808851d12569a4f2d3
2024-05-16 15:49:53 +08:00
tzwang 3f9e814e88 added jobid to scheduleResult api
Former-commit-id: 3a2e77a99adb0cfca2e80183ba0cce7264311f2d
2024-05-15 17:34:02 +08:00
tzwang a64dc47c9c updated aioption api
Former-commit-id: 4f975cb2660461eb2ed1dd5937d4e0ed02ce9cef
2024-05-15 16:48:43 +08:00
tzwang cda53ae916 updated scheduleResult
Former-commit-id: 38db46a22a099b0e54dd59168860503774f144a3
2024-05-15 16:13:00 +08:00
qiwang a2342261f5 Merge pull request 'create vm task' (#175) from master-wq into master
Former-commit-id: 495d29591d470a244a2eaa4c8e47b2dc575c0137
2024-05-15 15:52:03 +08:00
qiwang e4df9839ad Merge remote-tracking branch 'origin/master' into master-wq
Former-commit-id: b92e02d0b7afafc67ff0d73c565208e4d6607fec
2024-05-15 15:47:48 +08:00
qiwang 2a478ef3ab fix: create vm task
Former-commit-id: 0686e64ffc1a5889d37e33059b725a3fa5ba5539
2024-05-15 15:47:01 +08:00
Jake 896aa2c5ab fix
Former-commit-id: a9e47ada3f20619fd1df0eadbb59822901a87b8f
2024-05-14 17:36:37 +08:00
tzwang e2fc3b8b87 fix task time bugs
Former-commit-id: ee55e0cc23f74218579a00960f599b60da5cdb04
2024-05-13 11:34:45 +08:00
zhangwei c14b67d312 delete alertrule
Former-commit-id: dcff95ad60288cbcb62998aa849909fdbd543a8c
2024-05-11 18:28:07 +08:00
zhangwei 81f81d209e Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
# Conflicts:
#	api/desc/pcm.api


Former-commit-id: 9163707ba3f4c77f3fef173cec2491f1edfd2a94
2024-05-11 18:25:47 +08:00
zhangwei 256da70aaf delete alertrule
Former-commit-id: 22a1225ebfa1b0a350fe022b26dcfd3507fa0d6b
2024-05-11 18:24:04 +08:00
zhouqunjie 3eb71a7bf5 multiple adapters for hps task submit
Former-commit-id: 27cbca8bf1eec9807636b541ed1c68741e85e043
2024-05-11 15:15:46 +08:00
qiwang 4047bc98dd fix:update vm network
Former-commit-id: 3195ae6397c24bda209c7c7a3fd61ee582076f1f
2024-05-11 10:17:06 +08:00
qiwang f01a0c6354 Merge remote-tracking branch 'upstream/master' into upmaster_wq
# Conflicts:
#	pkg/models/taskvmmodel_gen.go


Former-commit-id: f857097a067622235adfccfdc5631f8efc3d2062
2024-05-11 09:18:02 +08:00
qiwang 54dd6a7eb2 fix:create vm server
Former-commit-id: d45c7c3228f7cedeaac94d7175d220855cf39c46
2024-05-11 08:58:57 +08:00
tzwang 3392fa01ac updated downloadalgorithmcode logic
Former-commit-id: 75272c3ecdea08e482f3f78125ec3019a833095e
2024-05-10 21:50:03 +08:00
tzwang 2be17617f2 Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
Former-commit-id: ed4726637c538da25773bbac76d13a3a42ced8d0
2024-05-10 19:48:55 +08:00
jagger c5def7491f fix
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: 5e50a3782fbd4227fc7d107f34f2a7cc570b3f7a
2024-05-10 17:28:02 +08:00
tzwang 3c4e18f8d4 updated api desc
Former-commit-id: 1fcf13a7f363e7e200f560873e3faa62826bce8d
2024-05-10 17:20:52 +08:00
tzwang fb957526e5 added getComputeCards api
Former-commit-id: 78b5fa73e9106a813df8d05e57c1e5dfd0a219a4
2024-05-09 18:54:25 +08:00
tzwang c3486ec099 Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
Former-commit-id: 24c55d85e333fa974545a84f855e41bc0e19c854
2024-05-09 16:01:03 +08:00
tzwang 0e155cb657 added algorithmscode api
Former-commit-id: 60b3ed6bb4c24d801afeec3b4cee108788cd2bea
2024-05-09 16:00:40 +08:00
qiwang a57e0b7ba8 Merge remote-tracking branch 'upstream/master' into upmaster_wq
# Conflicts:
#	api/desc/pcm.api
#	api/internal/handler/routes.go


Former-commit-id: e8916b1c9f9f0f56463a8395bae80bb159c0d065
2024-05-09 15:16:23 +08:00
qiwang e6f213bd8e fix:public interface
Former-commit-id: f214352aa45024203c71d58622fbc292dc682fdd
2024-05-09 15:09:29 +08:00
jagger eedc344b40 fix
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: 7fa31bdee9f6e6b578ab698024cd3ec432c7076b
2024-05-08 18:38:54 +08:00
jagger 9253222152 fix
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: ab7b8cfac57c4efd3f76090d1f85dc43f2b51293
2024-05-08 17:19:51 +08:00
zhangweiii 53576b752f Merge pull request 'schedule situation' (#138) from zhangweiii/pcm-coordinator:master into master
Former-commit-id: 90832ead729d001184c3b20c8d6045dc57bbf991
2024-05-07 18:04:17 +08:00
jagger 576df04079 fix
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: 74bdba75d1474724857fd31f7ff7f97853ce7905
2024-05-07 17:55:43 +08:00
zhangwei d678f52b1f Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
Former-commit-id: 35b75b870b33edb488aea997810c5f36277f625f
2024-05-07 09:46:58 +08:00
qiwang f4d1b72c17 fix:Create virtual machine task
Former-commit-id: 86a445db5f8b53773486ebe0fa866ad3471b40a9
2024-05-06 14:52:46 +08:00
zhangwei 3539f6342d schedule situation
Former-commit-id: 502ab492f72cf1aec4347bcd1a8a067533d1326a
2024-05-06 08:39:35 +08:00
zhangwei 8078d94e35 schedule situation
Former-commit-id: ce8a1290894d1e17f1e46c254c53c2e383d232dd
2024-04-30 17:28:29 +08:00
zhangwei 96c044e273 Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
Former-commit-id: ec90c9fc2ece96a259510a9fa4c22717cac2ea52
2024-04-30 16:30:49 +08:00
zhangwei 27c0aa6fc4 schedule situation
Former-commit-id: 460875a761b3fad8b384c4bf5167ed24381e9d45
2024-04-30 16:29:16 +08:00
jagger dd5d975df2 impl cloud Scheduling Algorithm
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: 7f60b2093407bb7ce871fba74f86a817dc0c756e
2024-04-29 21:46:07 +08:00
tzwang 16a23a8d77 Merge pull request 'updated scheduler submit function' (#130) from tzwang/pcm-coordinator:master into master
Former-commit-id: 340a25e6729207ab132ba1e13a5e6c795f354220
2024-04-29 17:56:11 +08:00
jagger 8aba7624a6 Add task details
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: 570946ed4885c23913cc81e64098437e338f8f23
2024-04-29 11:03:50 +08:00
jagger 9a369dc329 Merge remote-tracking branch 'upstream/master' into upstream
# Conflicts:
#	api/desc/pcm.api
#	api/internal/handler/routes.go


Former-commit-id: 3af5fcc802746329e5e770f7fa995fcd77b1abfc
2024-04-29 10:56:54 +08:00
qiwang b794b9d16f Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
# Conflicts:
#	api/desc/pcm.api


Former-commit-id: 683c0fa4f8ec772254f969f39f8d9fb0c5c8d894
2024-04-29 10:42:38 +08:00
qiwang f6f30ad61f fix:add home overview
Former-commit-id: 157b474d9e50d62c83ca396a3d0ee9f5e7227ef7
2024-04-29 10:33:47 +08:00
tzwang c151c8db07 added ai task db model
Former-commit-id: b81c68d0f5d6fdbd137c0a4c5531e23fae81c502
2024-04-29 10:10:15 +08:00
tzwang 46913fb677 generate ai center overview logic
Former-commit-id: 1f661622ed2630972e98a283c9020a9e0fa18dad
2024-04-28 18:21:26 +08:00
tzwang 9bd725380e added ai center overview apis
Former-commit-id: 02ea4ae3c93275c3c76f29aecba6ac7be32ef555
2024-04-28 18:02:29 +08:00
jagger 2bdc7b866d fix
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: b3cd5cb160fb5edc92142ef3f1bc7614dd252347
2024-04-26 18:50:09 +08:00
zhangweiii 4453d4ae55 Merge pull request 'alert' (#124) from zhangweiii/pcm-coordinator:master into master
Former-commit-id: 15540513ed115027887c5804a21a05b30b11dcc0
2024-04-26 17:23:19 +08:00
zhangwei 2210db4d3c adapter info
Former-commit-id: c717f0f1d0eabd7121ed7d43a8e22e82603b8d64
2024-04-26 16:27:26 +08:00
tzwang 10c719fc01 updated getAiJobLog handler
Former-commit-id: caaa3466f447309bf339b31ad8cf3323ffd9f9b1
2024-04-25 18:28:30 +08:00