Commit Graph

1899 Commits

Author SHA1 Message Date
qiwang 1d1b024e09 Merge remote-tracking branch 'origin/master' into upmaster
# Conflicts:
#	api/internal/types/types.go


Former-commit-id: 844ae53a2ede50fd681dfc373b97ca50c07ec24d
2024-03-22 15:56:35 +08:00
qiwang c6ad5637be fix:Modify configuration file fields
Former-commit-id: b3e7609f704e567a9501719fe9ca56d81f9bc4f4
2024-03-22 15:53:31 +08:00
tzwang 1cb0a39320 modified shuguangai getResourceStats
Former-commit-id: a108e00353ec13e300772ebbaa2a40a46e376377
2024-03-21 18:02:45 +08:00
zhangweiii d5dc85dca5 Merge pull request 'monitoring' (#63) from zhangweiii/pcm-coordinator:master into master
Former-commit-id: 416bd0e54c6dd7c7ed35affa6f2c13ceda4ee1e3
2024-03-21 16:28:22 +08:00
zhangwei 09c070b483 Providing metrics information to Prometheus
Former-commit-id: 62e24cde4ff7120a879b5d15e70010fd88a1acdb
2024-03-21 16:25:30 +08:00
devad 93ecc639c4 Merge pull request 'fix bug' (#62) from devad/pcm-coordinator:master into master
Former-commit-id: e9294decee1830595cc1742dbc1fa15790f43c84
2024-03-21 15:21:26 +08:00
jagger 5d90bbad1f 🐛 fix bugs
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: 29128e0ca2063bc6aeb6b12a91cf5c535e3fa113
2024-03-21 15:16:38 +08:00
devad 0f88808bf6 Merge pull request 'fix bugs' (#61) from devad/pcm-coordinator:master into master
Former-commit-id: ab0b39f4ed0b29d2e6af028eb3925aef5648db3e
2024-03-21 14:39:41 +08:00
jagger f685ce4045 Merge remote-tracking branch 'upstream/master'
Former-commit-id: 145e24a917b6bf77bf6759dc4bd340c506f18d44
2024-03-21 09:18:21 +08:00
jagger cac72a9fe3 🐛 fix bugs
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: 9a5898242bef4338203ee9b798eb8488844bd3b3
2024-03-21 09:17:41 +08:00
zhangweiii e40a9bb2d0 Merge pull request 'monitoring' (#60) from zhangweiii/pcm-coordinator:master into master
Former-commit-id: f2536eb942c6131d21462d110d1ef2010a412865
2024-03-21 09:16:03 +08:00
zhangweiii 3839579c94 Merge pull request 'monitoring' (#59) from zhangweiii/pcm-coordinator:master into master
Former-commit-id: 6bbc009e180c7550de44c95837eba07778e9a20e
2024-03-21 09:14:26 +08:00
zhangwei 7b6c0223d9 Providing metrics information to Prometheus
Former-commit-id: c4ccd504af0ba70f287951a7fa1f3637d231e661
2024-03-21 09:13:17 +08:00
zhangwei 021092b6b4 Providing metrics information to Prometheus
Former-commit-id: fcca6c8438877872d6c6e65bde522039f1a8668d
2024-03-21 09:11:12 +08:00
tzwang 918d95ad72 Merge pull request 'added dynamic resources strategy for the ai scheduler' (#58) from tzwang/pcm-coordinator:master into master
Former-commit-id: 3a8e24cd0647d6ff347f20cc55e3c1a4aa5b691f
2024-03-20 17:41:03 +08:00
tzwang c807d544ca modified ai platform getResourcestats methods and dynamicResources strategy
Former-commit-id: ee8836b10b362b2d74596f5dcc5f3ec8a81d78ce
2024-03-20 17:35:41 +08:00
zhouqunjie 9ab14b2f01 Merge pull request 'add pull and push task api' (#57) from zhouqunjie/pcm-coordinator:master into master
Former-commit-id: 6ae13da052557fb501bfff6367c3e99178092905
2024-03-19 09:52:39 +08:00
zhouqunjie f7bc50869e Merge remote-tracking branch 'zhouqunjie/master'
Former-commit-id: f413ad93b7bf2d7329d4e275ba76012c28d12798
2024-03-19 09:49:16 +08:00
zhouqunjie d3ff595ea1 add pull and push task api
Former-commit-id: 40540a6dd07fa468ceeb2e6f3e3790032b05bed4
2024-03-19 09:47:55 +08:00
qiwang 6998787fbd Merge pull request 'Statistics on the number of new virtual machine networks and mirror networks' (#56) from qiwang/pcm-coordinator:master into master
Former-commit-id: 5c9909161a93087816fa8d5394a4477acbc7d17d
2024-03-19 09:41:32 +08:00
qiwang 88c674e0b9 Merge remote-tracking branch 'origin/master' into master0312
# Conflicts:
#	api/etc/pcm.yaml


Former-commit-id: 8f9cd14748e6097b98692efe3449154186a65f96
2024-03-19 09:22:51 +08:00
qiwang 93df06ada0 fix:Statistics on the number of new virtual machine networks and mirror networks
Former-commit-id: 22e384a381516868d9d85cf3c94f965d63dc5a02
2024-03-19 09:21:49 +08:00
tzwang fd71bfba72 modified ai option and dynamicResource strategy
Former-commit-id: 98ae246782e73cca61ee5946d1c85f03ddba4304
2024-03-15 17:34:49 +08:00
devad 3279fde8c4 Merge pull request 'fix bugs' (#55) from devad/pcm-coordinator:master into master
Former-commit-id: 5f5fe61f2b7c9e8c8cb039d9b9df348730a1091c
2024-03-15 15:32:30 +08:00
jagger b831ff2204 🐛 fix bugs
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: f030b1c53b5f3a208c6b15d978ad988e0f2ef3db
2024-03-15 15:27:13 +08:00
tzwang f2cf784a7d modified shuguangai and octopus task submit options for empty algorithmname
Former-commit-id: a5e9379e51b049114753623f610c61b2afe9a312
2024-03-14 17:19:08 +08:00
devad 2d6bd7f6a1 Merge pull request 'fix bugs' (#54) from devad/pcm-coordinator:master into master
Former-commit-id: 65563958179b1221638d91618b4a90a90b711e8e
2024-03-14 17:15:23 +08:00
jagger 5f76de52a3 Merge branch 'upmaster'
# Conflicts:
#	api/desc/core/pcm-core.api


Former-commit-id: 83f9081ed9e7ec3f943460f4eb29afd4914025a3
2024-03-14 17:11:05 +08:00
jagger 1bd68400ce 🐛 fix bugs
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: 53a7c41f3f2d4bb67da7c6593893d63d1d4ea189
2024-03-14 17:06:43 +08:00
zhouqunjie a9eb0bf5a2 Merge pull request 'add clusterType info for hpc task' (#53) from zhouqunjie/pcm-coordinator:master into master
Former-commit-id: f5d398397a0dfa8ca8f86d13e2b22c1779612b24
2024-03-14 17:05:56 +08:00
zhangweiii 6dcb3862d1 Providing metrics information to Prometheus
Former-commit-id: 5d84c61c35ecba3aaf7f63f59e6efdf4e2752f99
2024-03-14 17:04:32 +08:00
zhouqunjie 7c18ceb63c add clusterType info for hpc task
Former-commit-id: bfc1b11eb5673c989ba33e09dc2e569ece7f14aa
2024-03-14 17:02:35 +08:00
zhangwei 43bd51ce09 Providing metrics information to Prometheus
Former-commit-id: f3afc76fa6e855dfa3861424d062f9d629d7b0a8
2024-03-14 16:57:12 +08:00
zhouqunjie eaba4e8c55 Merge pull request 'change hpc model structure' (#51) from zhouqunjie/pcm-coordinator:master into master
Former-commit-id: 51843d2899d769ba4e1c1c4c437d9fc9351c4479
2024-03-14 11:24:37 +08:00
zhouqunjie 7cb535a739 change hpc model structure
Former-commit-id: e1c2ea6e8441d0ccba5e26160a59ee44cc5fbd8f
2024-03-14 11:21:28 +08:00
devad 8abba1912b Merge pull request 'Dictionary data lists support paging queries Signed-off-by' (#50) from devad/pcm-coordinator:master into master
Former-commit-id: e9baacfc140ae7552d32eff8230089a801cc848a
2024-03-14 10:45:33 +08:00
jagger 5a314f4cf8 Dictionary data lists support paging queries
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: bd79becb758037abb2338825453e13760cd15580
2024-03-14 10:41:06 +08:00
zhouqunjie 9e3188afe6 Merge pull request 'pcm-client for participant to pull and push task info' (#49) from zhouqunjie/pcm-coordinator:master into master
Former-commit-id: d86cc9d52945499286a4a4656993ba8943443da3
2024-03-13 20:53:00 +08:00
zhouqunjie cbc4674662 pcm-client for participant to pull and push task info
Former-commit-id: 9e0057609cdd0c9aa60a1c97d23a8012254fadd1
2024-03-13 20:49:10 +08:00
tzwang 05cfa23329 Merge pull request 'updated aitask submit implementations' (#48) from tzwang/pcm-coordinator:master into master
Former-commit-id: d9cd1d41ac76d168a46afa70a289e7dc748a34da
2024-03-13 17:37:34 +08:00
tzwang a32ff30ff0 modified aitask submit options
Former-commit-id: 1eb8398a899ff5bb1129dfdf6b2559cf1ec0130c
2024-03-13 17:33:09 +08:00
tzwang 2f9462965e modified submit shuguangai implementation
Former-commit-id: 840111b6bb589bec04417f70e3d943f2fa999025
2024-03-12 17:47:00 +08:00
qiwang 9781b44f88 Merge pull request 'modify parameters' (#47) from qiwang/pcm-coordinator:master into master
Former-commit-id: 3987ef138059d0c4be8e3ec8f72362f4faab69b8
2024-03-12 17:06:41 +08:00
qiwang 24ff6528ab Merge branch 'upmaster'
# Conflicts:
#	api/etc/pcm.yaml


Former-commit-id: b11a7b51f795dff04dcb5e57b71eeffb682c44bf
2024-03-12 17:03:19 +08:00
qiwang dff5870e3e fix:modify virtual machine interfaces
Former-commit-id: 565a4a6b574a8515cd33becd8e06d7f0980289e9
2024-03-12 16:58:11 +08:00
zhouqunjie 1dfff160ae Merge pull request 'missing submit to delete routes' (#46) from zhouqunjie/pcm-coordinator:master into master
Former-commit-id: bd1a46df12d93131ecc2f491efb498d82eddc5a4
2024-03-12 16:56:29 +08:00
zhouqunjie aa6b343f34 missing submit to delete routes
Former-commit-id: a624db840186bdaa2a7237421e01a96d96e5e27e
2024-03-12 16:53:50 +08:00
qiwang bda5f58086 fix:modify virtual machine interfaces
Former-commit-id: 36de12f7eabd1df67329d8b8c22a1c25430d5a3e
2024-03-12 16:50:22 +08:00
tzwang 0ab53fa6ca Merge remote-tracking branch 'origin/master'
Former-commit-id: c2e19df4b8281893d5774b55754547b12e3e5ec9
2024-03-12 15:55:24 +08:00
zhouqunjie 0e2e6ff3c1 Merge pull request 'hpc job submit' (#44) from zhouqunjie/pcm-coordinator:master into master
Former-commit-id: 3f9d10aa4d73c5a2a1bed3437d30c6209c5ad7d7
2024-03-12 15:17:34 +08:00