Skip to content

Commit 540dea2

Browse files
qyh111Lijiachen1018lijiachen19mag1c-hFangRun2
committed
[feat]Merge develop to dev-ucm-v1 and fix code style (ModelEngine-Group#428)
* [fix] fix sparse attention (ModelEngine-Group#397) fix ascend attention Co-authored-by: lijiachen19 <lijiachen19@huawei.com> * [opt] Share Infra implementation and unify status codes (ModelEngine-Group#399) share infra module Co-authored-by: Fang Run <Fang_Run@126.com> * [bugfix] Fix ESA to be compatible with the latest NFSStore. (ModelEngine-Group#401) fix esa to adapt latest NFSStore * release v0.1.0rc4 (ModelEngine-Group#402) Co-authored-by: lijiachen19 <lijiachen19@huawei.com> * [opt] Remove unused cc impl of dramstore (ModelEngine-Group#406) remove unused cc impl of dramstore * [Fix]remove dram docs and modify quick-start doc (ModelEngine-Group#411) * [Fix]remove dram docs and modify quick-start doc * modify index.md --------- Co-authored-by: t00939662 <tianxuehan@huawei.com> * [Feature] Added performance testing tool based on the PyTest testing framework (ModelEngine-Group#295) Performance testing tool based on the PyTest testing framework. * [Misc] Add cpp-linter.yml (ModelEngine-Group#422) * [docs]add metrics doc (ModelEngine-Group#416) * [docs]add metrics doc * modify metrics.md * modify metrics.md --------- Co-authored-by: t00939662 <tianxuehan@huawei.com> * [perf] Modify CUDA SIMD and add Triton hash encoder (ModelEngine-Group#408) * fix cpp code style --------- Co-authored-by: Lijiachen1018 <30387633+Lijiachen1018@users.noreply.github.com> Co-authored-by: lijiachen19 <lijiachen19@huawei.com> Co-authored-by: Mag1c.H <hemajun815@163.com> Co-authored-by: Fang Run <Fang_Run@126.com> Co-authored-by: MaxWang <wangwenxin21@huawei.com> Co-authored-by: hero0307 <tianxuehan0307@163.com> Co-authored-by: t00939662 <tianxuehan@huawei.com> Co-authored-by: ML <85485147+Menglths@users.noreply.github.com> Co-authored-by: ShiXiaolei <indirashi@163.com>
1 parent 2980249 commit 540dea2

File tree

13 files changed

+231
-345
lines changed

13 files changed

+231
-345
lines changed

docs/source/user-guide/prefix-cache/dram_store.md

Lines changed: 0 additions & 132 deletions
This file was deleted.

ucm/shared/metrics/cc/stats/conn_stats.cc

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,27 @@
2424
#include "conn_stats.h"
2525

2626
namespace UC::Metrics {
27-
27+
2828
ConnStats::ConnStats() = default;
2929

30-
std::string ConnStats::Name() const {
31-
return "ConnStats";
32-
}
30+
std::string ConnStats::Name() const { return "ConnStats"; }
3331

34-
void ConnStats::Reset() {
32+
void ConnStats::Reset()
33+
{
3534
for (auto& v : data_) v.clear();
3635
}
3736

38-
void ConnStats::Update(const std::unordered_map<std::string, double>& params) {
37+
void ConnStats::Update(const std::unordered_map<std::string, double>& params)
38+
{
3939
for (const auto& [k, v] : params) {
4040
Key id = KeyFromString(k);
4141
if (id == Key::COUNT) continue;
4242
EmplaceBack(id, v);
4343
}
4444
}
4545

46-
std::unordered_map<std::string, std::vector<double>> ConnStats::Data() {
46+
std::unordered_map<std::string, std::vector<double>> ConnStats::Data()
47+
{
4748
std::unordered_map<std::string, std::vector<double>> result;
4849
result["save_requests_num"] = data_[static_cast<std::size_t>(Key::save_requests_num)];
4950
result["save_blocks_num"] = data_[static_cast<std::size_t>(Key::save_blocks_num)];
@@ -53,27 +54,30 @@ std::unordered_map<std::string, std::vector<double>> ConnStats::Data() {
5354
result["load_blocks_num"] = data_[static_cast<std::size_t>(Key::load_blocks_num)];
5455
result["load_duration"] = data_[static_cast<std::size_t>(Key::load_duration)];
5556
result["load_speed"] = data_[static_cast<std::size_t>(Key::load_speed)];
56-
result["interval_lookup_hit_rates"] = data_[static_cast<std::size_t>(Key::interval_lookup_hit_rates)];
57+
result["interval_lookup_hit_rates"] =
58+
data_[static_cast<std::size_t>(Key::interval_lookup_hit_rates)];
5759
return result;
5860
}
5961

60-
Key ConnStats::KeyFromString(const std::string& k) {
61-
if (k == "save_requests_num") return Key::save_requests_num;
62-
if (k == "save_blocks_num") return Key::save_blocks_num;
63-
if (k == "save_duration") return Key::save_duration;
64-
if (k == "save_speed") return Key::save_speed;
65-
if (k == "load_requests_num") return Key::load_requests_num;
66-
if (k == "load_blocks_num") return Key::load_blocks_num;
67-
if (k == "load_duration") return Key::load_duration;
68-
if (k == "load_speed") return Key::load_speed;
69-
if (k == "interval_lookup_hit_rates")return Key::interval_lookup_hit_rates;
62+
Key ConnStats::KeyFromString(const std::string& k)
63+
{
64+
if (k == "save_requests_num") return Key::save_requests_num;
65+
if (k == "save_blocks_num") return Key::save_blocks_num;
66+
if (k == "save_duration") return Key::save_duration;
67+
if (k == "save_speed") return Key::save_speed;
68+
if (k == "load_requests_num") return Key::load_requests_num;
69+
if (k == "load_blocks_num") return Key::load_blocks_num;
70+
if (k == "load_duration") return Key::load_duration;
71+
if (k == "load_speed") return Key::load_speed;
72+
if (k == "interval_lookup_hit_rates") return Key::interval_lookup_hit_rates;
7073
return Key::COUNT;
7174
}
7275

73-
void ConnStats::EmplaceBack(Key id, double value) {
76+
void ConnStats::EmplaceBack(Key id, double value)
77+
{
7478
data_[static_cast<std::size_t>(id)].push_back(value);
7579
}
7680

7781
static Registrar registrar;
7882

79-
}
83+
} // namespace UC::Metrics

ucm/shared/metrics/cc/stats/conn_stats.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,21 @@
2424
#ifndef UNIFIEDCACHE_CONNSTATS_H
2525
#define UNIFIEDCACHE_CONNSTATS_H
2626

27-
#include "istats.h"
28-
#include "stats_registry.h"
2927
#include <array>
30-
#include <vector>
31-
#include <unordered_map>
32-
#include <string>
3328
#include <cstdint>
29+
#include <string>
30+
#include <unordered_map>
31+
#include <vector>
32+
#include "istats.h"
33+
#include "stats_registry.h"
3434

35-
namespace UC::Metrics {
35+
namespace UC::Metrics {
3636

3737
enum class Key : uint8_t {
3838
interval_lookup_hit_rates = 0,
3939
save_requests_num,
4040
save_blocks_num,
41-
save_duration ,
41+
save_duration,
4242
save_speed,
4343
load_requests_num,
4444
load_blocks_num,
@@ -66,13 +66,13 @@ class ConnStats : public IStats {
6666
};
6767

6868
struct Registrar {
69-
Registrar() {
70-
StatsRegistry::RegisterStats("ConnStats", []()->std::unique_ptr<IStats> {
71-
return std::make_unique<ConnStats>();
72-
});
69+
Registrar()
70+
{
71+
StatsRegistry::RegisterStats(
72+
"ConnStats", []() -> std::unique_ptr<IStats> { return std::make_unique<ConnStats>(); });
7373
}
7474
};
7575

76-
}
76+
} // namespace UC::Metrics
7777

78-
#endif // UNIFIEDCACHE_CONNSTATS_H
78+
#endif // UNIFIEDCACHE_CONNSTATS_H

ucm/shared/metrics/cc/stats/istats.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
#ifndef UNIFIEDCACHE_ISTATS_H
2525
#define UNIFIEDCACHE_ISTATS_H
2626

27-
#include <string>
2827
#include <memory>
28+
#include <string>
2929
#include <unordered_map>
3030
#include <vector>
3131

@@ -40,6 +40,6 @@ class IStats {
4040
virtual std::unordered_map<std::string, std::vector<double>> Data() = 0;
4141
};
4242

43-
}
43+
} // namespace UC::Metrics
4444

45-
#endif
45+
#endif

ucm/shared/metrics/cc/stats_monitor.cc

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,60 +21,62 @@
2121
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2222
* SOFTWARE.
2323
* */
24-
#include "stats/istats.h"
25-
#include "stats_registry.h"
2624
#include "stats_monitor.h"
2725
#include <mutex>
2826
#include <vector>
27+
#include "stats/istats.h"
28+
#include "stats_registry.h"
2929

3030
namespace UC::Metrics {
3131

32-
StatsMonitor::StatsMonitor() {
32+
StatsMonitor::StatsMonitor()
33+
{
3334
auto& registry = StatsRegistry::GetInstance();
3435
for (const auto& name : registry.GetRegisteredStatsNames()) {
3536
stats_map_[name] = registry.CreateStats(name);
3637
}
3738
}
3839

39-
void StatsMonitor::CreateStats(const std::string& name) {
40+
void StatsMonitor::CreateStats(const std::string& name)
41+
{
4042
std::lock_guard<std::mutex> lock(mutex_);
4143
auto& registry = StatsRegistry::GetInstance();
4244
stats_map_[name] = registry.CreateStats(name);
4345
}
4446

45-
std::unordered_map<std::string, std::vector<double>> StatsMonitor::GetStats(const std::string& name) {
47+
std::unordered_map<std::string, std::vector<double>> StatsMonitor::GetStats(const std::string& name)
48+
{
4649
std::lock_guard<std::mutex> lock(mutex_);
4750
return stats_map_[name]->Data();
4851
}
4952

50-
void StatsMonitor::ResetStats(const std::string& name) {
53+
void StatsMonitor::ResetStats(const std::string& name)
54+
{
5155
std::lock_guard<std::mutex> lock(mutex_);
5256
stats_map_[name]->Reset();
5357
}
5458

55-
std::unordered_map<std::string, std::vector<double>> StatsMonitor::GetStatsAndClear(const std::string& name) {
59+
std::unordered_map<std::string, std::vector<double>>
60+
StatsMonitor::GetStatsAndClear(const std::string& name)
61+
{
5662
std::lock_guard<std::mutex> lock(mutex_);
5763
auto result = stats_map_[name]->Data();
5864
stats_map_[name]->Reset();
5965
return result;
6066
}
6167

62-
void StatsMonitor::UpdateStats(
63-
const std::string& name,
64-
const std::unordered_map<std::string, double>& params)
68+
void StatsMonitor::UpdateStats(const std::string& name,
69+
const std::unordered_map<std::string, double>& params)
6570
{
6671
std::lock_guard<std::mutex> lock(mutex_);
6772
auto it = stats_map_.find(name);
68-
if (it != stats_map_.end()) {
69-
it->second->Update(params);
70-
}
73+
if (it != stats_map_.end()) { it->second->Update(params); }
7174
}
7275

73-
void StatsMonitor::ResetAllStats() {
76+
void StatsMonitor::ResetAllStats()
77+
{
7478
std::lock_guard<std::mutex> lock(mutex_);
75-
for (auto& [n, ptr] : stats_map_) {
76-
ptr->Reset();
77-
}
79+
for (auto& [n, ptr] : stats_map_) { ptr->Reset(); }
7880
}
7981

80-
}
82+
} // namespace UC::Metrics

0 commit comments

Comments
 (0)