Commit Graph

1373 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
zhangweiii 3a456348e4 Merge pull request 'Modify path' (#179) from zhangweiii/pcm-coordinator:master into master
Former-commit-id: ce774c69e0f355f7f4609d067753cb3570cb3ca2
2024-05-16 16:50:26 +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 32b4c340be Merge pull request 'modify ai replicas' (#178) from master-wq into master
Former-commit-id: 1fe43cd8eff3a1986305a3d02fad93df149ace9e
2024-05-16 16:08:21 +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 7101925e9c Merge pull request 'fix aitasklist bugs' (#177) from tzwang/pcm-coordinator:master into master
Former-commit-id: e174a7654e0328eeb354e4da3e797abdc20eb6fe
2024-05-16 11:24:40 +08:00
tzwang c8d0f54f5c fix aitasklist bugs
Former-commit-id: b955cc404935f0e733b2eb5904ce4654d347d088
2024-05-16 11:20:26 +08:00
tzwang ab187a3579 Merge pull request 'updated scheduleResult' (#176) from tzwang/pcm-coordinator:master into master
Former-commit-id: 7398d71826b76f7c5971992e6b8ffe862fd8b953
2024-05-15 18:34:54 +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 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
zhouqunjie 85fda53847 ADD file via upload
Former-commit-id: f77949496a2ef488614ea0d56640c413d881ad17
2024-05-15 10:54:09 +08:00
zhouqunjie 942ff0af82 Delete deploy/pcm.sql
Former-commit-id: 8176da185e34eb15224227246dd2803b8fecae1e
2024-05-15 10:53:25 +08:00
zhouqunjie e5f7296c43 ADD file via upload
Former-commit-id: 2e540a0c1c3171f5e3682ae054d8b4f1d6e8d341
2024-05-15 10:32:30 +08:00
zhouqunjie 8bfd6d54d6 Delete deploy/pcm-yaml.zip
Former-commit-id: 4bfedc3b22414fa1d940391b987fabbe06941492
2024-05-15 10:32:18 +08:00
tzwang 8f5d161236 Merge pull request 'fix aitask status' (#174) from tzwang/pcm-coordinator:master into master
Former-commit-id: a67aa626fc6d38b2670a6062beb55bbfd9653916
2024-05-14 17:51:35 +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
zhouqunjie 91d27d99c4 Merge pull request 'fix' (#173) from zhouqunjie/pcm-coordinator:master into master
Former-commit-id: 4ba4128e94cab96a4c5d4a48e3bfb9402409f48d
2024-05-14 17:41: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
tzwang 564380be1a Merge remote-tracking branch 'origin/master'
Former-commit-id: 1a42880f2615021e71045f7f808cdd75c5af8f44
2024-05-14 10:49:41 +08:00
tzwang 06aea0b26a updated aitask model
Former-commit-id: c6d375391a43e300ad5fe23757ca972f71bf492b
2024-05-14 10:49:09 +08:00
zhouqunjie 1127b2edd3 Merge pull request 'merge conflict' (#171) from zhouqunjie/pcm-coordinator:master into master
Former-commit-id: a05b4cc310d2b08ac7d3a4e81f2fb7aeaffcc7df
2024-05-14 10:47:04 +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 e4d9f0a5dd Merge pull request 'fix task list bugs' (#170) from tzwang/pcm-coordinator:master into master
Former-commit-id: 2e5c1028a1ae174b64648d61d0e6fe3de1f216b4
2024-05-14 08:50:21 +08:00
tzwang dd1142245c fix task list bugs
Former-commit-id: c71b8802cd2d99a628175171ca2149e5a870c137
2024-05-14 08:46:47 +08:00
tzwang 075f3cab09 Merge pull request 'fix ai task time bugs' (#169) from tzwang/pcm-coordinator:master into master
Former-commit-id: 8908c540c224842bd33d2f4c812a5be9e24552a9
2024-05-13 15:29:52 +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
zhouqunjie 25ea887815 ADD file via upload
Former-commit-id: 657362611cca51134350126428b9dc49b56d5a60
2024-05-13 10:06:08 +08:00
zhouqunjie b6606bc890 Delete deploy/pcm.sql
Former-commit-id: 3dec75bd71e8eb0d1245ed38e96a03e0503ecde6
2024-05-13 10:05:45 +08:00
zhouqunjie ffc0f11fee ADD file via upload
Former-commit-id: 3b9ec36ca724903ebb74d7165b4cea7a5db52c64
2024-05-13 10:04:19 +08:00
zhouqunjie 6aa80d91c5 Delete deploy/pcm.sql
Former-commit-id: 778b99e2943ab58c9ce30ce6682d2e58dc39b8ee
2024-05-13 10:02:48 +08:00
zhouqunjie a6b17dd36d ADD file via upload
Former-commit-id: a02377cee6d7f3fa91d43842f774f049dc10ac7d
2024-05-13 09:45:14 +08:00
zhouqunjie 48807f3eef Delete deploy/pcm-yaml.zip
Former-commit-id: 9473e8df7ac80a8ff848bb7ef6230030cb0caa29
2024-05-13 09:45:14 +08:00