Commit Graph

658 Commits

Author SHA1 Message Date
qiwang daa41d1dbc Merge remote-tracking branch 'origin/master' into master-wq
Former-commit-id: 86383667420e1d060a95a517dcea17a3c8163b2b
2024-06-21 10:32:12 +08:00
qiwang e845c2dde1 fix: update vm 0621
Former-commit-id: a41b7b42765bd24cb9ddbe29f595900e1cfd2ecb
2024-06-21 10:31:56 +08:00
qiwang 421afa3839 fix: update vm 0621
Former-commit-id: 2a4cc6725659fc021933a2c287860d84ea4a4bb2
2024-06-21 10:28:06 +08:00
tzwang 734280ea00 added imageinfer api
Former-commit-id: 96ae7d54f30190581c662c5f8519efc5d92b555b
2024-06-20 20:39:10 +08:00
tzwang bee590f969 updated imageinference api
Former-commit-id: f8b560cea1c26f05353800af2e2c0f16a885cc85
2024-06-20 17:16:06 +08:00
tzwang 99d96327ac updated imageinference api
Former-commit-id: f02b83693b1989f34e6b67c019ed3599ae64305f
2024-06-20 11:31:29 +08:00
tzwang 0a0182a1bb updated imageinference api
Former-commit-id: 87a8f48882340c5df98f7cd1724bf3fd74836dc6
2024-06-19 19:35:01 +08:00
tzwang eb4ca38875 updated imageinference api
Former-commit-id: cb39280dcc921074722e34f0387b613fbef4e2c6
2024-06-19 19:30:09 +08:00
tzwang 5a0d3a9428 updated imageinference api
Former-commit-id: 37f69eb747ca83ea4f303a71d77c9621efd05472
2024-06-19 19:22:46 +08:00
tzwang cfecebc3b8 added imageinference api
Former-commit-id: 88cfe68d5d660c181f200719ea65c03eddce33b4
2024-06-19 16:24:51 +08:00
tzwang b4b93d2c09 added imageinference api
Former-commit-id: 8bf23cca01d6b82ea5fa1f1078d608e83b206362
2024-06-19 16:06:47 +08:00
qiwang 877433d224 fix: update modelarts 0618
Former-commit-id: 6c41d56380e40bda3370eb8274c838da3797da0c
2024-06-18 17:00:47 +08:00
qiwang d09b872f42 Merge remote-tracking branch 'origin/master' into master-wq
Former-commit-id: a81094f3b6baefef77f8a9cc45f4254e563c7abe
2024-06-14 17:26:48 +08:00
qiwang a16f9fc13d fix: update modelarts 0614
Former-commit-id: d7c0b75c051ed6ed44142ca3d109232f9f17f80c
2024-06-14 17:16:55 +08:00
zhangwei 7a9578cd52 移除多余代码
Former-commit-id: bda0bf7f31c6c6977d2c740845ddc8251f6889ee
2024-06-11 10:46:32 +08:00
zhangwei 83fa3218ab Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
# Conflicts:
#	api/internal/cron/cron.go
#	api/internal/scheduler/database/aiStorage.go


Former-commit-id: 30a9579debd6cd3803bd423c958d0b670625cc7c
2024-06-11 09:05:45 +08:00
zhangwei 8ba618bfdd 移除多余代码
Former-commit-id: 94004d05b18036a47773a3d4906aceb86e61e142
2024-06-11 09:03:53 +08:00
tzwang b0de44251b fix noticeinfo bugs
Former-commit-id: fb2dfbd4d7f0beafd92a783868504536f7cda644
2024-06-07 18:52:24 +08:00
tzwang ed6cf043d0 fix clusterResouces bugs
Former-commit-id: 4a96ca733136179cca1284f3b68a7aa59bd98d8e
2024-06-07 14:51:48 +08:00
tzwang 11e01683a2 Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
Former-commit-id: 7b49a92d6af20441eb109b7340f15f8e61400d8b
2024-06-07 14:48:30 +08:00
tzwang 813e25fb3b fix clusterResouces bugs
Former-commit-id: d9dc30e4262df90c75bdbb5c671f296915fae1a7
2024-06-07 14:48:16 +08:00
qiwang e84cb0463b Merge pull request 'update vminfo 0607' (#219) from master-wq into master
Former-commit-id: d60022f2e54be7f47663beb993062940d4021222
2024-06-07 11:00:48 +08:00
tzwang 8bd0fcac07 Merge pull request 'fix clusterResouces bugs' (#218) from tzwang/pcm-coordinator:master into master
Former-commit-id: 065653b186be3b52ac45b2b5f36f3e574b501b38
2024-06-07 10:48:41 +08:00
tzwang 226fd9a7bd fix clusterResouces bugs
Former-commit-id: 390a0d67629c0bb7f8c0dee0cf329c2958248aa5
2024-06-07 10:45:26 +08:00
tzwang 7bfbed0ce9 Merge pull request 'fix clusterResouces bugs' (#217) from tzwang/pcm-coordinator:master into master
Former-commit-id: dd2de7fa06b567190ee40dbe20b58188d4c4af25
2024-06-07 10:42:39 +08:00
tzwang e53e9d5800 fix clusterResouces bugs
Former-commit-id: da9b51cd929ee055b9623b9a94be3dd545c67a19
2024-06-07 10:38:10 +08:00
qiwang e851b16c0e fix: update vmInfo 0607
Former-commit-id: 029eeaba931df0f426144aecd537bad26aea03fc
2024-06-07 09:53:19 +08:00
qiwang f2fb6bb4ec fix: update vmInfo 060601
Former-commit-id: ccb597154a3af953b990f07aaac678966730cc44
2024-06-07 09:12:05 +08:00
jagger 2f45fef202 fix bug
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: 7ea30faf0152e15a9058fd8da894e5b6d993eb8d
2024-06-06 20:59:58 +08:00
tzwang ccbf2a00f1 fix clusterResouces bugs
Former-commit-id: 52c5b84d8957dd7f2529ce3dd5416ee7ffd9b07d
2024-06-06 19:08:51 +08:00
tzwang 8ffc0106d7 fix clusterResouces bugs
Former-commit-id: c977dc87486fd72df375a92d71c185fac668cb2c
2024-06-06 17:10:06 +08:00
qiwang 5db1db5bea Merge pull request 'update vminfo 060601' (#214) from master-wq into master
Former-commit-id: 5c1c0d40d899aca9eb06b0d08a570656b8a629cc
2024-06-06 12:28:10 +08:00
qiwang c2a3b77aff fix: update vmInfo 060601
Former-commit-id: 8d2c4ce27e51ef178a07f6361d5bb7ecb2e0837b
2024-06-06 12:24:11 +08:00
tzwang b61e434f75 added cron updateClusterResources
Former-commit-id: f38bd68df8012cb81ba9866a0c8b0310511c2427
2024-06-06 10:53:48 +08:00
qiwang 04f0eae608 Merge pull request 'update vminfo 0606' (#212) from master-wq into master
Former-commit-id: b0960aa18e7cc2fdf05762733d86806ab7b1038c
2024-06-06 10:51:13 +08:00
qiwang a1d6951493 fix: update vmInfo 0606
Former-commit-id: 98a2d9812255789f94ed2c859f7b486e3934a6e5
2024-06-06 10:47:28 +08:00
qiwang bf0ae0877d Merge pull request 'update vminfo 0606' (#211) from master-wq into master
Former-commit-id: 1299105095f70f4a210fa8288f59dcb5d88495b7
2024-06-06 10:37:46 +08:00
qiwang db9fe273d8 fix: update vmInfo 0606
Former-commit-id: a1711e74b84d91e661c7e6d4257f8967c17cf573
2024-06-06 10:30:48 +08:00
devad 8de946e139 Merge pull request 'fix bug' (#209) from devad/pcm-coordinator:master into master
Former-commit-id: c354ec6d0aab9ee47275353734258214fbe10fa5
2024-06-05 18:36:37 +08:00
tzwang da4c0e4717 Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
Former-commit-id: f4d1ca4412d8250a8d4c5ac528707edbb5e4adb8
2024-06-05 18:29:53 +08:00
tzwang cdcbc84372 added cron updateadapters
Former-commit-id: 00c5b593ca264313e9848ff214bed1bf350dfff5
2024-06-05 18:29:30 +08:00
jagger 255643d246 Merge remote-tracking branch 'upstream/master' into upstream
Former-commit-id: b6ced17038c09bc2700532036b2927d658cb3ec8
2024-06-05 17:57:27 +08:00
jagger ba84c312a3 fix bug
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: ac8e28da5b7851f03b2fe1207fcbc83f0eee255e
2024-06-05 17:56:59 +08:00
qiwang f66138afa0 Merge remote-tracking branch 'origin/master' into master-wq
Former-commit-id: e150842727f39e6ad9eb4b83db0197c97af108ea
2024-06-05 17:25:22 +08:00
qiwang c227103dbd fix: update vmInfo
Former-commit-id: 2bfc197d20297aac19e32ae1d3fa71e4647eedcc
2024-06-05 17:25:03 +08:00
zhangwei 68e497760f 移除多余代码
Former-commit-id: 6e245fdcda9efae192ad676ac3f6c2510df129a3
2024-06-05 15:54:25 +08:00
jagger e29002b4d6 fix bug
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: a6d78147813b92708df308d1c24f717af41168bd
2024-06-04 17:36:24 +08:00
jagger d8e8370e5b fix bug
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: 53039ebcdb46e353f2dcec112389cad7c3b91432
2024-06-04 15:23:16 +08:00
jagger 321a054df2 fix bug
Signed-off-by: jagger <cossjie@foxmail.com>

Former-commit-id: afd3e450e10a2fc1d7779633540d4f1bf8b8478f
2024-05-31 17:09:00 +08:00
qiwang 641a762620 fix: update vmInfo
Former-commit-id: fbc9276038394ddf3c0bfb27a216eaa2f96c6abe
2024-05-26 17:25:56 +08:00