Commit Graph

507 Commits

Author SHA1 Message Date
tzwang f8a4656d83 fix aischeduler bugs
Former-commit-id: 4df953f2a614800510376210d69f82a646cae02f
2024-05-16 18:17:57 +08:00
tzwang fffc3b9718 Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
Former-commit-id: 8deb2ba33ca4c8f8a553679600217eaf137b04ee
2024-05-16 16:54:57 +08:00
tzwang 62ecd4e2e4 fix aischeduler bugs
Former-commit-id: 887857a40bd3492ac3a412902893cb3990048677
2024-05-16 16:49:50 +08:00
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 c8d0f54f5c fix aitasklist bugs
Former-commit-id: b955cc404935f0e733b2eb5904ce4654d347d088
2024-05-16 11:20:26 +08:00
tzwang 9764c139bb updated resourcetype
Former-commit-id: 349f96c869214b144c03b86d840adfbfb4ed4e96
2024-05-15 18:31:36 +08:00
tzwang a336b737f0 updated scheduleResult
Former-commit-id: 5158fe0420e1921b63fce8b21c6477341801d243
2024-05-15 18:29:20 +08:00
tzwang 95b2258e2c updated types
Former-commit-id: 4e459de0331e4ea2587aafcd2cd93d94b94ecfd7
2024-05-15 17:41:57 +08:00
tzwang 3f9e814e88 added jobid to scheduleResult api
Former-commit-id: 3a2e77a99adb0cfca2e80183ba0cce7264311f2d
2024-05-15 17:34:02 +08:00
tzwang 120dbecc1d updated aioption protobuf
Former-commit-id: 1e23b5326cb6c616c8d20fa64b789ef68fbafcbf
2024-05-15 16:57:40 +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
tzwang 9b518d0182 Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
Former-commit-id: b8f86f8afbca80fac35424a62b8ca72f7aad047d
2024-05-14 17:48:13 +08:00
tzwang 3b5295a08e fix aitask status bugs
Former-commit-id: 4f8466962405557bd85d51573dd79d86984cafce
2024-05-14 17:46:00 +08:00
Jake 896aa2c5ab fix
Former-commit-id: a9e47ada3f20619fd1df0eadbb59822901a87b8f
2024-05-14 17:36:37 +08:00
tzwang fcd12bbe61 Merge pull request 'fix db bugs' (#172) from tzwang/pcm-coordinator:master into master
Former-commit-id: 91e8e0532cbd60ec7a5ea4b7419515a49fe0aaf4
2024-05-14 15:07:48 +08:00
tzwang bd3f60d62e fix db bugs
Former-commit-id: 3e372dc02fb4f2a4e4f9ab14922abaa51dbc7eea
2024-05-14 15:03:31 +08:00
Jake 7d067b0082 merge conflict
Former-commit-id: b6a6a7c963182194e03b9673f5b2e47fe47952f4
2024-05-14 10:43:58 +08:00
Jake 6304fee876 Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
# Conflicts:
#	api/internal/logic/hpc/commithpctasklogic.go


Former-commit-id: b2c609dfe260b2149c6f50e38140561f88a1e619
2024-05-14 10:41:23 +08:00
Jake 374bb1a5ad change log level
Former-commit-id: f8155160b352fb6602fd34ca8efff37659ceab65
2024-05-14 10:40:06 +08:00
tzwang dd1142245c fix task list bugs
Former-commit-id: c71b8802cd2d99a628175171ca2149e5a870c137
2024-05-14 08:46:47 +08:00
tzwang 520cfc00d9 updated aitask apis
Former-commit-id: 3b5a3d75f23fc82c31f3ab84866c5ebc64ff5b36
2024-05-13 15:22:21 +08:00
tzwang e2fc3b8b87 fix task time bugs
Former-commit-id: ee55e0cc23f74218579a00960f599b60da5cdb04
2024-05-13 11:34:45 +08:00
qiwang a48a44a05a fix: create vm task
Former-commit-id: 62cd00915314b280231809d0b6d7b7cffc1966ee
2024-05-13 10:32:15 +08:00
tzwang 99985ec130 updated octopus cardname
Former-commit-id: a62d3350bd21690be3f75a11bfed6518fc23b0a8
2024-05-12 22:50:48 +08:00
tzwang e12f80725e fix log bugs
Former-commit-id: 92a183cafaea2973d5d0fe5c868537c9cd69e4b2
2024-05-11 19:25:33 +08:00
tzwang 8ccb51cab0 Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
Former-commit-id: e31d516e8d87623c8471fb45c383834cb6ad21b3
2024-05-11 18:40:26 +08:00
tzwang c4d4e74d33 fix status bugs
Former-commit-id: 547178d1d6f7af5c8b0745ad04885402a1da68b0
2024-05-11 18:40:06 +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
tzwang a779216f68 fix convert bugs
Former-commit-id: 8e1dae6f6d88c44b821e75557f3cba48074449d3
2024-05-11 18:04:19 +08:00
tzwang 52aa14c613 fix convert bugs
Former-commit-id: 3cb8e750a3fb55017152108be812b37dff510095
2024-05-11 17:59:03 +08:00
qiwang f264ac5124 Merge pull request 'create vm server' (#164) from master-wq into master
Former-commit-id: f8d87615e7566df187a11fbd23000d618a591a34
2024-05-11 16:51:49 +08:00
qiwang e07106841f fix:update create vm task
Former-commit-id: f8c57df90c9d6c9992712433cc854b4b1a89da98
2024-05-11 16:31:42 +08:00
jagger 9722801813 fix bug
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: 1ef360be0c89fdf57fe54497296380fbe068cb95
2024-05-11 16:18:09 +08:00
zhouqunjie 91c38d66fd fix bug
Former-commit-id: a32dab848d0e2055a62190de1461d4ba7be83ca5
2024-05-11 15:42:52 +08:00
zhouqunjie 3eb71a7bf5 multiple adapters for hps task submit
Former-commit-id: 27cbca8bf1eec9807636b541ed1c68741e85e043
2024-05-11 15:15:46 +08:00
qiwang 935af66c47 Merge pull request 'modify interface' (#160) from qiwang/pcm-coordinator:upmaster_wq into master
Former-commit-id: b385a66a6920c111b9474d6167234afb77ccd6c8
2024-05-11 15:15:59 +08:00
qiwang 8660032d12 fix:update vm network
Former-commit-id: ae5fdf0aa190fb666b64f97f7e77d9abb47bbe25
2024-05-11 15:09:38 +08:00
qiwang 7fe42f6f5a Merge pull request 'modify interface' (#159) from qiwang/pcm-coordinator:upmaster_wq into master
Former-commit-id: 3fda1514b577107fdc2b8614b6c72ffcdf7332c4
2024-05-11 14:45:55 +08:00
qiwang ce25b1da6b fix:update vm network
Former-commit-id: 4220ea329aea451d15df4b786bbe3403166e2ba0
2024-05-11 14:42:22 +08:00
tzwang 6e82702876 added api getcomputecards
Former-commit-id: 4514161574188e63305fe9066ef4ddad473a56b2
2024-05-11 11:22:29 +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