mirror of
https://github.com/ClusterCockpit/cc-backend
synced 2024-12-25 04:49:05 +01:00
Cleanup
Use external cc-units Lint code Fix import tests
This commit is contained in:
parent
b878b31de5
commit
d9b18d1763
1
go.mod
1
go.mod
@ -4,6 +4,7 @@ go 1.18
|
|||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/99designs/gqlgen v0.17.24
|
github.com/99designs/gqlgen v0.17.24
|
||||||
|
github.com/ClusterCockpit/cc-units v0.3.0
|
||||||
github.com/Masterminds/squirrel v1.5.3
|
github.com/Masterminds/squirrel v1.5.3
|
||||||
github.com/go-ldap/ldap/v3 v3.4.4
|
github.com/go-ldap/ldap/v3 v3.4.4
|
||||||
github.com/go-sql-driver/mysql v1.7.0
|
github.com/go-sql-driver/mysql v1.7.0
|
||||||
|
|||||||
2
go.sum
2
go.sum
@ -81,6 +81,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
|
|||||||
github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
|
github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
|
||||||
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
|
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
|
||||||
github.com/ClickHouse/clickhouse-go v1.4.3/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
|
github.com/ClickHouse/clickhouse-go v1.4.3/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
|
||||||
|
github.com/ClusterCockpit/cc-units v0.3.0 h1:JEKgEyvN4GABheKIReW2siDXgpYf2zf4STXV2ip418Y=
|
||||||
|
github.com/ClusterCockpit/cc-units v0.3.0/go.mod h1:3S3PAhAayS3pbgcT4q9Vn9VJw22Op51X0YimtG77zBw=
|
||||||
github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
|
github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
|
||||||
github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
|
github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
|
||||||
github.com/Masterminds/squirrel v1.5.3 h1:YPpoceAcxuzIljlr5iWpNKaql7hLeG1KLSrhvdHpkZc=
|
github.com/Masterminds/squirrel v1.5.3 h1:YPpoceAcxuzIljlr5iWpNKaql7hLeG1KLSrhvdHpkZc=
|
||||||
|
|||||||
@ -68,7 +68,7 @@ func HandleImportFlag(flag string) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
//checkJobData(&jobData)
|
// checkJobData(&jobData)
|
||||||
// SanityChecks(&jobMeta.BaseJob)
|
// SanityChecks(&jobMeta.BaseJob)
|
||||||
jobMeta.MonitoringStatus = schema.MonitoringStatusArchivingSuccessful
|
jobMeta.MonitoringStatus = schema.MonitoringStatusArchivingSuccessful
|
||||||
if _, err = r.Find(&jobMeta.JobID, &jobMeta.Cluster, &jobMeta.StartTime); err != sql.ErrNoRows {
|
if _, err = r.Find(&jobMeta.JobID, &jobMeta.Cluster, &jobMeta.StartTime); err != sql.ErrNoRows {
|
||||||
|
|||||||
@ -15,7 +15,7 @@ import (
|
|||||||
"github.com/ClusterCockpit/cc-backend/pkg/archive"
|
"github.com/ClusterCockpit/cc-backend/pkg/archive"
|
||||||
"github.com/ClusterCockpit/cc-backend/pkg/log"
|
"github.com/ClusterCockpit/cc-backend/pkg/log"
|
||||||
"github.com/ClusterCockpit/cc-backend/pkg/schema"
|
"github.com/ClusterCockpit/cc-backend/pkg/schema"
|
||||||
"github.com/ClusterCockpit/cc-backend/pkg/units"
|
ccunits "github.com/ClusterCockpit/cc-units"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Delete the tables "job", "tag" and "jobtag" from the database and
|
// Delete the tables "job", "tag" and "jobtag" from the database and
|
||||||
@ -173,11 +173,28 @@ func getNormalizationFactor(v float64) (float64, int) {
|
|||||||
return math.Pow10(count * scale), count * scale
|
return math.Pow10(count * scale), count * scale
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func getExponent(p float64) int {
|
||||||
|
count := 0
|
||||||
|
|
||||||
|
for p > 1.0 {
|
||||||
|
p = p / 1000.0
|
||||||
|
count++
|
||||||
|
}
|
||||||
|
|
||||||
|
return count * 3
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewPrefixFromFactor(op ccunits.Prefix, e int) ccunits.Prefix {
|
||||||
|
f := float64(op)
|
||||||
|
exp := math.Pow10(getExponent(f) - e)
|
||||||
|
return ccunits.Prefix(exp)
|
||||||
|
}
|
||||||
|
|
||||||
func normalize(avg float64, p string) (float64, string) {
|
func normalize(avg float64, p string) (float64, string) {
|
||||||
f, e := getNormalizationFactor(avg)
|
f, e := getNormalizationFactor(avg)
|
||||||
|
|
||||||
if e != 0 {
|
if e != 0 {
|
||||||
np := units.NewPrefixFromFactor(units.NewPrefix(p), e)
|
np := NewPrefixFromFactor(ccunits.NewPrefix(p), e)
|
||||||
return f, np.Prefix()
|
return f, np.Prefix()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -8,7 +8,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/ClusterCockpit/cc-backend/pkg/units"
|
ccunits "github.com/ClusterCockpit/cc-units"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestNormalizeFactor(t *testing.T) {
|
func TestNormalizeFactor(t *testing.T) {
|
||||||
@ -27,11 +27,11 @@ func TestNormalizeFactor(t *testing.T) {
|
|||||||
|
|
||||||
fmt.Printf("Factor %e Count %d\n", f, e)
|
fmt.Printf("Factor %e Count %d\n", f, e)
|
||||||
|
|
||||||
np := units.NewPrefix("")
|
np := ccunits.NewPrefix("")
|
||||||
|
|
||||||
fmt.Printf("Prefix %e Short %s\n", float64(np), np.Prefix())
|
fmt.Printf("Prefix %e Short %s\n", float64(np), np.Prefix())
|
||||||
|
|
||||||
p := units.NewPrefixFromFactor(np, e)
|
p := NewPrefixFromFactor(np, e)
|
||||||
|
|
||||||
if p.Prefix() != "G" {
|
if p.Prefix() != "G" {
|
||||||
t.Errorf("Failed Prefix or unit: Want G, Got %s", p.Prefix())
|
t.Errorf("Failed Prefix or unit: Want G, Got %s", p.Prefix())
|
||||||
@ -52,11 +52,11 @@ func TestNormalizeKeep(t *testing.T) {
|
|||||||
|
|
||||||
fmt.Printf("Factor %e Count %d\n", f, e)
|
fmt.Printf("Factor %e Count %d\n", f, e)
|
||||||
|
|
||||||
np := units.NewPrefix("G")
|
np := ccunits.NewPrefix("G")
|
||||||
|
|
||||||
fmt.Printf("Prefix %e Short %s\n", float64(np), np.Prefix())
|
fmt.Printf("Prefix %e Short %s\n", float64(np), np.Prefix())
|
||||||
|
|
||||||
p := units.NewPrefixFromFactor(np, e)
|
p := NewPrefixFromFactor(np, e)
|
||||||
|
|
||||||
if p.Prefix() != "G" {
|
if p.Prefix() != "G" {
|
||||||
t.Errorf("Failed Prefix or unit: Want G, Got %s", p.Prefix())
|
t.Errorf("Failed Prefix or unit: Want G, Got %s", p.Prefix())
|
||||||
|
|||||||
496
internal/importer/testdata/data-taurus.json
vendored
496
internal/importer/testdata/data-taurus.json
vendored
@ -1,496 +0,0 @@
|
|||||||
{
|
|
||||||
"cpu_used": {
|
|
||||||
"core": {
|
|
||||||
"unit": {
|
|
||||||
"base": ""
|
|
||||||
},
|
|
||||||
"timestep": 30,
|
|
||||||
"series": [
|
|
||||||
{
|
|
||||||
"hostname": "taurusi6489",
|
|
||||||
"id": "0",
|
|
||||||
"statistics": {
|
|
||||||
"min": 0.09090909090909093,
|
|
||||||
"avg": 0.9173553719008265,
|
|
||||||
"max": 1.0000000000000002
|
|
||||||
},
|
|
||||||
"data": [
|
|
||||||
0.09090909090909093,
|
|
||||||
0.9999999999999999,
|
|
||||||
1.0,
|
|
||||||
1.0000000000000002,
|
|
||||||
1.0,
|
|
||||||
1.0000000000000002,
|
|
||||||
0.9999999999999999,
|
|
||||||
1.0,
|
|
||||||
1.0,
|
|
||||||
1.0,
|
|
||||||
1.0
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"hostname": "taurusi6489",
|
|
||||||
"id": "1",
|
|
||||||
"statistics": {
|
|
||||||
"min": 0.03694102397926118,
|
|
||||||
"avg": 0.045968409230268584,
|
|
||||||
"max": 0.08809840425531917
|
|
||||||
},
|
|
||||||
"data": [
|
|
||||||
0.08809840425531917,
|
|
||||||
0.05710659898477157,
|
|
||||||
0.04034861200774694,
|
|
||||||
0.037962362102530824,
|
|
||||||
0.03976721629485936,
|
|
||||||
0.04163976759199483,
|
|
||||||
0.03694102397926118,
|
|
||||||
0.03821243523316062,
|
|
||||||
0.03851132686084142,
|
|
||||||
0.044752092723760455,
|
|
||||||
0.04231266149870802
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"hostname": "taurusi6490",
|
|
||||||
"id": "10",
|
|
||||||
"statistics": {
|
|
||||||
"min": 0.10505319148936171,
|
|
||||||
"avg": 0.9186411992263056,
|
|
||||||
"max": 1.0000000000000002
|
|
||||||
},
|
|
||||||
"data": [
|
|
||||||
0.10505319148936171,
|
|
||||||
1.0000000000000002,
|
|
||||||
1.0,
|
|
||||||
1.0,
|
|
||||||
1.0,
|
|
||||||
0.9999999999999999,
|
|
||||||
1.0,
|
|
||||||
0.9999999999999999,
|
|
||||||
1.0,
|
|
||||||
1.0,
|
|
||||||
1.0
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"hostname": "taurusi6490",
|
|
||||||
"id": "11",
|
|
||||||
"statistics": {
|
|
||||||
"min": 0.05286048845767815,
|
|
||||||
"avg": 0.07053823838706144,
|
|
||||||
"max": 0.075148113501715
|
|
||||||
},
|
|
||||||
"data": [
|
|
||||||
0.05286048845767815,
|
|
||||||
0.06936597614563718,
|
|
||||||
0.07254534083802376,
|
|
||||||
0.075148113501715,
|
|
||||||
0.06909547738693468,
|
|
||||||
0.07372696032489846,
|
|
||||||
0.07077983088005012,
|
|
||||||
0.07082419304293325,
|
|
||||||
0.07424812030075188,
|
|
||||||
0.07285803627267043,
|
|
||||||
0.07446808510638298
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"statisticsSeries": null
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"ipc": {
|
|
||||||
"core": {
|
|
||||||
"unit": {
|
|
||||||
"base": "IPC"
|
|
||||||
},
|
|
||||||
"timestep": 60,
|
|
||||||
"series": [
|
|
||||||
{
|
|
||||||
"hostname": "taurusi6489",
|
|
||||||
"id": "0",
|
|
||||||
"statistics": {
|
|
||||||
"min": 1.3808406263195592,
|
|
||||||
"avg": 1.3960848578375105,
|
|
||||||
"max": 1.4485575599350569
|
|
||||||
},
|
|
||||||
"data": [
|
|
||||||
1.4485575599350569,
|
|
||||||
1.3808406263195592,
|
|
||||||
1.3830284413690626,
|
|
||||||
1.3836692663348698,
|
|
||||||
1.3843283952290035
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"hostname": "taurusi6489",
|
|
||||||
"id": "1",
|
|
||||||
"statistics": {
|
|
||||||
"min": 0.30469640475234366,
|
|
||||||
"avg": 0.8816944294664065,
|
|
||||||
"max": 1.797623522191001
|
|
||||||
},
|
|
||||||
"data": [
|
|
||||||
1.797623522191001,
|
|
||||||
0.954395633726228,
|
|
||||||
1.0019972349956185,
|
|
||||||
0.30469640475234366,
|
|
||||||
0.3497593516668412
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"hostname": "taurusi6490",
|
|
||||||
"id": "10",
|
|
||||||
"statistics": {
|
|
||||||
"min": 1.3791232173760588,
|
|
||||||
"avg": 1.3850247295506815,
|
|
||||||
"max": 1.386710405495511
|
|
||||||
},
|
|
||||||
"data": [
|
|
||||||
1.3791232173760588,
|
|
||||||
1.38619977419787,
|
|
||||||
1.386397917938246,
|
|
||||||
1.3866923327457215,
|
|
||||||
1.386710405495511
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"hostname": "taurusi6490",
|
|
||||||
"id": "11",
|
|
||||||
"statistics": {
|
|
||||||
"min": 0.6424094604392216,
|
|
||||||
"avg": 0.9544442638400293,
|
|
||||||
"max": 1.2706704244636826
|
|
||||||
},
|
|
||||||
"data": [
|
|
||||||
1.2706704244636826,
|
|
||||||
0.6424094604392216,
|
|
||||||
0.9249973908234796,
|
|
||||||
0.6940110823242276,
|
|
||||||
1.2401329611495353
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"statisticsSeries": null
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flops_any": {
|
|
||||||
"core": {
|
|
||||||
"unit": {
|
|
||||||
"base": "F/s"
|
|
||||||
},
|
|
||||||
"timestep": 60,
|
|
||||||
"series": [
|
|
||||||
{
|
|
||||||
"hostname": "taurusi6489",
|
|
||||||
"id": "0",
|
|
||||||
"statistics": {
|
|
||||||
"min": 0.0,
|
|
||||||
"avg": 184.2699002412084,
|
|
||||||
"max": 921.3495012060421
|
|
||||||
},
|
|
||||||
"data": [
|
|
||||||
921.3495012060421,
|
|
||||||
0.0,
|
|
||||||
0.0,
|
|
||||||
0.0,
|
|
||||||
0.0
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"hostname": "taurusi6489",
|
|
||||||
"id": "1",
|
|
||||||
"statistics": {
|
|
||||||
"min": 0.13559227208748068,
|
|
||||||
"avg": 273.2997868356056,
|
|
||||||
"max": 1355.9227390817396
|
|
||||||
},
|
|
||||||
"data": [
|
|
||||||
1355.9227390817396,
|
|
||||||
8.94908797747172,
|
|
||||||
0.6779613312519499,
|
|
||||||
0.13559227208748068,
|
|
||||||
0.8135535154771758
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"hostname": "taurusi6490",
|
|
||||||
"id": "10",
|
|
||||||
"statistics": {
|
|
||||||
"min": 0.0,
|
|
||||||
"avg": 1678.8419461262179,
|
|
||||||
"max": 4346.591400350933
|
|
||||||
},
|
|
||||||
"data": [
|
|
||||||
4346.591400350933,
|
|
||||||
0.0,
|
|
||||||
578.4248288199713,
|
|
||||||
0.0,
|
|
||||||
3469.193501460185
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"hostname": "taurusi6490",
|
|
||||||
"id": "11",
|
|
||||||
"statistics": {
|
|
||||||
"min": 45.28689133054866,
|
|
||||||
"avg": 609.6644949204072,
|
|
||||||
"max": 2582.7080822873186
|
|
||||||
},
|
|
||||||
"data": [
|
|
||||||
2582.7080822873186,
|
|
||||||
45.28689133054866,
|
|
||||||
48.67663233623293,
|
|
||||||
47.591911855555026,
|
|
||||||
324.0589567923803
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"statisticsSeries": null
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"mem_bw": {
|
|
||||||
"socket": {
|
|
||||||
"unit": {
|
|
||||||
"base": "B/s"
|
|
||||||
},
|
|
||||||
"timestep": 60,
|
|
||||||
"series": [
|
|
||||||
{
|
|
||||||
"hostname": "taurusi6489",
|
|
||||||
"id": "0",
|
|
||||||
"statistics": {
|
|
||||||
"min": 653671812.1661415,
|
|
||||||
"avg": 1637585527.5854635,
|
|
||||||
"max": 2614718291.9554267
|
|
||||||
},
|
|
||||||
"data": [
|
|
||||||
653671812.1661415,
|
|
||||||
2614718291.9554267,
|
|
||||||
1732453371.7073724,
|
|
||||||
1612865229.8704093,
|
|
||||||
1574218932.2279677
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"hostname": "taurusi6490",
|
|
||||||
"id": "0",
|
|
||||||
"statistics": {
|
|
||||||
"min": 1520190251.61048,
|
|
||||||
"avg": 1572477682.3850098,
|
|
||||||
"max": 1688960732.2760606
|
|
||||||
},
|
|
||||||
"data": [
|
|
||||||
1688960732.2760606,
|
|
||||||
1580140679.8216474,
|
|
||||||
1520190251.61048,
|
|
||||||
1541841829.6250021,
|
|
||||||
1531254918.591859
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"statisticsSeries": null
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"file_bw": {
|
|
||||||
"node": {
|
|
||||||
"unit": {
|
|
||||||
"base": "B/s"
|
|
||||||
},
|
|
||||||
"timestep": 30,
|
|
||||||
"series": [
|
|
||||||
{
|
|
||||||
"hostname": "taurusi6489",
|
|
||||||
"statistics": {
|
|
||||||
"min": 0.0,
|
|
||||||
"avg": 190352.6328851857,
|
|
||||||
"max": 2093878.361723524
|
|
||||||
},
|
|
||||||
"data": [
|
|
||||||
0.0,
|
|
||||||
0.0,
|
|
||||||
0.0,
|
|
||||||
0.6000135186380174,
|
|
||||||
0.0,
|
|
||||||
0.0,
|
|
||||||
2093878.361723524,
|
|
||||||
0.0,
|
|
||||||
0.0,
|
|
||||||
0.0,
|
|
||||||
0.0
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"hostname": "taurusi6490",
|
|
||||||
"statistics": {
|
|
||||||
"min": 0.0,
|
|
||||||
"avg": 1050832.4509396513,
|
|
||||||
"max": 11559156.360352296
|
|
||||||
},
|
|
||||||
"data": [
|
|
||||||
0.0,
|
|
||||||
0.0,
|
|
||||||
0.0,
|
|
||||||
0.0,
|
|
||||||
0.0,
|
|
||||||
0.0,
|
|
||||||
11559156.360352296,
|
|
||||||
0.0,
|
|
||||||
0.5999838690326298,
|
|
||||||
0.0,
|
|
||||||
0.0
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"statisticsSeries": null
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"net_bw": {
|
|
||||||
"node": {
|
|
||||||
"unit": {
|
|
||||||
"base": "B/s"
|
|
||||||
},
|
|
||||||
"timestep": 30,
|
|
||||||
"series": [
|
|
||||||
{
|
|
||||||
"hostname": "taurusi6489",
|
|
||||||
"statistics": {
|
|
||||||
"min": 126779.89655880642,
|
|
||||||
"avg": 653834.5091507058,
|
|
||||||
"max": 1285639.5107541133
|
|
||||||
},
|
|
||||||
"data": [
|
|
||||||
1158202.7403032137,
|
|
||||||
126779.89655880642,
|
|
||||||
419017.91939583793,
|
|
||||||
345766.3974972795,
|
|
||||||
645419.3296982117,
|
|
||||||
644667.7333333333,
|
|
||||||
1285639.5107541133,
|
|
||||||
643481.2108874657,
|
|
||||||
640025.3562553325,
|
|
||||||
643241.4875354709,
|
|
||||||
639938.0184386979
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"hostname": "taurusi6490",
|
|
||||||
"statistics": {
|
|
||||||
"min": 640156.9862985397,
|
|
||||||
"avg": 872367.6551257868,
|
|
||||||
"max": 1916309.7075416835
|
|
||||||
},
|
|
||||||
"data": [
|
|
||||||
1774843.146788355,
|
|
||||||
643218.3646426039,
|
|
||||||
641681.1031071587,
|
|
||||||
644690.1512268113,
|
|
||||||
647183.5650609672,
|
|
||||||
644439.3303402043,
|
|
||||||
1916309.7075416835,
|
|
||||||
643748.3241006166,
|
|
||||||
757189.8273227927,
|
|
||||||
642583.6999539217,
|
|
||||||
640156.9862985397
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"statisticsSeries": null
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"mem_used": {
|
|
||||||
"node": {
|
|
||||||
"unit": {
|
|
||||||
"base": "B"
|
|
||||||
},
|
|
||||||
"timestep": 30,
|
|
||||||
"series": [
|
|
||||||
{
|
|
||||||
"hostname": "taurusi6489",
|
|
||||||
"statistics": {
|
|
||||||
"min": 2779066368.0,
|
|
||||||
"avg": 9282117259.636364,
|
|
||||||
"max": 10202595328.0
|
|
||||||
},
|
|
||||||
"data": [
|
|
||||||
2779066368.0,
|
|
||||||
8518217728.0,
|
|
||||||
9852760064.0,
|
|
||||||
9979805696.0,
|
|
||||||
10039619584.0,
|
|
||||||
10087104512.0,
|
|
||||||
10136084480.0,
|
|
||||||
10202595328.0,
|
|
||||||
10154196992.0,
|
|
||||||
10177409024.0,
|
|
||||||
10176430080.0
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"hostname": "taurusi6490",
|
|
||||||
"statistics": {
|
|
||||||
"min": 9993277440.0,
|
|
||||||
"avg": 10013080110.545454,
|
|
||||||
"max": 10039676928.0
|
|
||||||
},
|
|
||||||
"data": [
|
|
||||||
10001317888.0,
|
|
||||||
10013028352.0,
|
|
||||||
10006728704.0,
|
|
||||||
10039676928.0,
|
|
||||||
10035838976.0,
|
|
||||||
10033356800.0,
|
|
||||||
10006577152.0,
|
|
||||||
10005659648.0,
|
|
||||||
9993277440.0,
|
|
||||||
9993564160.0,
|
|
||||||
10014855168.0
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"statisticsSeries": null
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"cpu_power": {
|
|
||||||
"socket": {
|
|
||||||
"unit": {
|
|
||||||
"base": "W"
|
|
||||||
},
|
|
||||||
"timestep": 60,
|
|
||||||
"series": [
|
|
||||||
{
|
|
||||||
"hostname": "taurusi6489",
|
|
||||||
"id": "0",
|
|
||||||
"statistics": {
|
|
||||||
"min": 35.50647456742635,
|
|
||||||
"avg": 72.08313211552377,
|
|
||||||
"max": 83.33799371150049
|
|
||||||
},
|
|
||||||
"data": [
|
|
||||||
35.50647456742635,
|
|
||||||
75.65022009482759,
|
|
||||||
83.33799371150049,
|
|
||||||
83.00405043233219,
|
|
||||||
82.9169217715322
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"hostname": "taurusi6490",
|
|
||||||
"id": "0",
|
|
||||||
"statistics": {
|
|
||||||
"min": 83.8466923147859,
|
|
||||||
"avg": 85.18572681122097,
|
|
||||||
"max": 85.83909286117324
|
|
||||||
},
|
|
||||||
"data": [
|
|
||||||
83.8466923147859,
|
|
||||||
85.58816979864088,
|
|
||||||
85.31266819129794,
|
|
||||||
85.83909286117324,
|
|
||||||
85.34201089020692
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"statisticsSeries": null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"jobId": 398764,
|
"jobId": 398955,
|
||||||
"cluster": "fritz",
|
"cluster": "fritz",
|
||||||
"startTime": 1675954353,
|
"startTime": 1675956725,
|
||||||
"duration": 3400
|
"duration": 260
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2,5 +2,5 @@
|
|||||||
"jobId": 398764,
|
"jobId": 398764,
|
||||||
"cluster": "fritz",
|
"cluster": "fritz",
|
||||||
"startTime": 1675954353,
|
"startTime": 1675954353,
|
||||||
"duration": 3400
|
"duration": 177
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
{"jobId":398764,"user":"k106eb10","project":"k106eb","cluster":"fritz","subCluster":"main","partition":"singlenode","arrayJobId":0,"numNodes":1,"numHwthreads":72,"numAcc":0,"exclusive":1,"monitoringStatus":1,"smt":0,"jobState":"completed","duration":177,"walltime":86340,"resources":[{"hostname":"f0649"}],"metaData":{"jobName":"ams_pipeline","jobScript":"#!/bin/bash -l\n#SBATCH --job-name=ams_pipeline\n#SBATCH --time=23:59:00\n#SBATCH --partition=singlenode\n#SBATCH --ntasks=72\n#SBATCH --hint=multithread\n#SBATCH --chdir=/home/atuin/k106eb/k106eb10/ACE/Ni-Al/DFT/VASP_PBE_500_0.125_0.1_NM/AlNi/binaries/bulk/moreprototypesYury/gen_131_CuTe/cfg/Ni2Al2\n#SBATCH --export=NONE\nunset SLURM_EXPORT_ENV\nuss=$(whoami)\nfind /dev/shm/ -user $uss -type f -mmin +30 -delete\ncd \"/home/atuin/k106eb/k106eb10/ACE/Ni-Al/DFT/VASP_PBE_500_0.125_0.1_NM/AlNi/binaries/bulk/moreprototypesYury/gen_131_CuTe/cfg/Ni2Al2\"\nams_pipeline pipeline.json \u003e \"/home/atuin/k106eb/k106eb10/ACE/Ni-Al/DFT/VASP_PBE_500_0.125_0.1_NM/AlNi/binaries/bulk/moreprototypesYury/gen_131_CuTe/cfg/Ni2Al2/ams_pipeline_job.sh.out\" 2\u003e \"/home/atuin/k106eb/k106eb10/ACE/Ni-Al/DFT/VASP_PBE_500_0.125_0.1_NM/AlNi/binaries/bulk/moreprototypesYury/gen_131_CuTe/cfg/Ni2Al2/ams_pipeline_job.sh.err\"\n","slurmInfo":"\nJobId=398764 JobName=ams_pipeline\n UserId=k106eb10(210387) GroupId=80111\n Account=k106eb QOS=normal \n Requeue=False Restarts=0 BatchFlag=True \n TimeLimit=1439\n SubmitTime=2023-02-09T14:10:20\n Partition=singlenode \n NodeList=f0649\n NumNodes=1 NumCPUs=72 NumTasks=72 CPUs/Task=1\n NTasksPerNode:Socket:Core=0:None:None\n TRES_req=cpu=72,mem=250000M,node=1,billing=72\n TRES_alloc=cpu=72,node=1,billing=72\n Command=/home/atuin/k106eb/k106eb10/ACE/Ni-Al/DFT/VASP_PBE_500_0.125_0.1_NM/AlNi/binaries/bulk/moreprototypesYury/gen_131_CuTe/cfg/Ni2Al2/ams_pipeline_job.sh\n WorkDir=/home/atuin/k106eb/k106eb10/ACE/Ni-Al/DFT/VASP_PBE_500_0.125_0.1_NM/AlNi/binaries/bulk/moreprototypesYury/gen_131_CuTe/cfg/Ni2Al2\n StdErr=\n StdOut=ams_pipeline.o%j\n"},"startTime":1675954353,"statistics":{"clock":{"unit":{"base":"Hz","prefix":"M"},"avg":1336.519,"min":801.564,"max":2348.215},"cpu_load":{"unit":{"base":""},"avg":31.64,"min":17.36,"max":45.54},"cpu_power":{"unit":{"base":"W"},"avg":150.018,"min":93.672,"max":261.592},"cpu_user":{"unit":{"base":""},"avg":28.518,"min":0.09,"max":57.343},"flops_any":{"unit":{"base":"F/s","prefix":"G"},"avg":45.012,"min":0,"max":135.037},"flops_dp":{"unit":{"base":"F/s","prefix":"G"},"avg":22.496,"min":0,"max":67.488},"flops_sp":{"unit":{"base":"F/s","prefix":"G"},"avg":0.02,"min":0,"max":0.061},"ib_recv":{"unit":{"base":"B/s"},"avg":14442.82,"min":219.998,"max":42581.368},"ib_recv_pkts":{"unit":{"base":"packets/s"},"avg":201.532,"min":1.25,"max":601.345},"ib_xmit":{"unit":{"base":"B/s"},"avg":282.098,"min":56.2,"max":569.363},"ib_xmit_pkts":{"unit":{"base":"packets/s"},"avg":1.228,"min":0.433,"max":2},"ipc":{"unit":{"base":"IPC"},"avg":0.77,"min":0.564,"max":0.906},"mem_bw":{"unit":{"base":"B/s","prefix":"G"},"avg":4.872,"min":0.025,"max":14.552},"mem_power":{"unit":{"base":"W"},"avg":7.725,"min":6.286,"max":10.556},"mem_used":{"unit":{"base":"B","prefix":"G"},"avg":6.162,"min":6.103,"max":6.226},"nfs4_read":{"unit":{"base":"B/s","prefix":"M"},"avg":1045.333,"min":311,"max":1525},"nfs4_total":{"unit":{"base":"B/s","prefix":"M"},"avg":6430,"min":2796,"max":11518},"nfs4_write":{"unit":{"base":"B/s","prefix":"M"},"avg":24.333,"min":0,"max":38},"vectorization_ratio":{"unit":{"base":"%"},"avg":25.528,"min":0,"max":76.585}}}
|
{"jobId":398764,"user":"k106eb10","project":"k106eb","cluster":"fritz","subCluster":"main","numNodes":1,"exclusive":1,"jobState":"completed","duration":177,"resources":[{"hostname":"f0649"}],"startTime":1675954353,"statistics":{"clock":{"unit":{"base":"Hz","prefix":"M"},"avg":1336.519,"min":801.564,"max":2348.215},"cpu_load":{"unit":{"base":""},"avg":31.64,"min":17.36,"max":45.54},"cpu_power":{"unit":{"base":"W"},"avg":150.018,"min":93.672,"max":261.592},"cpu_user":{"unit":{"base":""},"avg":28.518,"min":0.09,"max":57.343},"flops_any":{"unit":{"base":"F/s","prefix":"G"},"avg":45.012,"min":0,"max":135.037},"flops_dp":{"unit":{"base":"F/s","prefix":"G"},"avg":22.496,"min":0,"max":67.488},"flops_sp":{"unit":{"base":"F/s","prefix":"G"},"avg":0.02,"min":0,"max":0.061},"ib_recv":{"unit":{"base":"B/s"},"avg":14442.82,"min":219.998,"max":42581.368},"ib_recv_pkts":{"unit":{"base":"packets/s"},"avg":201.532,"min":1.25,"max":601.345},"ib_xmit":{"unit":{"base":"B/s"},"avg":282.098,"min":56.2,"max":569.363},"ib_xmit_pkts":{"unit":{"base":"packets/s"},"avg":1.228,"min":0.433,"max":2},"ipc":{"unit":{"base":"IPC"},"avg":0.77,"min":0.564,"max":0.906},"mem_bw":{"unit":{"base":"B/s","prefix":"G"},"avg":4.872,"min":0.025,"max":14.552},"mem_power":{"unit":{"base":"W"},"avg":7.725,"min":6.286,"max":10.556},"mem_used":{"unit":{"base":"B","prefix":"G"},"avg":6.162,"min":6.103,"max":6.226},"nfs4_read":{"unit":{"base":"B/s","prefix":"M"},"avg":1045.333,"min":311,"max":1525},"nfs4_total":{"unit":{"base":"B/s","prefix":"M"},"avg":6430,"min":2796,"max":11518},"nfs4_write":{"unit":{"base":"B/s","prefix":"M"},"avg":24.333,"min":0,"max":38},"vectorization_ratio":{"unit":{"base":"%"},"avg":25.528,"min":0,"max":76.585}}}
|
||||||
|
|||||||
98
internal/importer/testdata/meta-taurus.input
vendored
98
internal/importer/testdata/meta-taurus.input
vendored
@ -1,98 +0,0 @@
|
|||||||
{
|
|
||||||
"jobId": 20639587,
|
|
||||||
"user": "s3804552",
|
|
||||||
"project": "p_speichersysteme",
|
|
||||||
"cluster": "taurus",
|
|
||||||
"subCluster": "haswell",
|
|
||||||
"partition": "haswell64",
|
|
||||||
"numNodes": 2,
|
|
||||||
"numHwthreads": 4,
|
|
||||||
"exclusive": 0,
|
|
||||||
"startTime": 1635856524,
|
|
||||||
"jobState": "completed",
|
|
||||||
"duration": 310,
|
|
||||||
"walltime": 3600,
|
|
||||||
"smt": 0,
|
|
||||||
"resources": [
|
|
||||||
{
|
|
||||||
"hostname": "taurusi6489",
|
|
||||||
"hwthreads": [
|
|
||||||
0,
|
|
||||||
1
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"hostname": "taurusi6490",
|
|
||||||
"hwthreads": [
|
|
||||||
10,
|
|
||||||
11
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"statistics": {
|
|
||||||
"cpu_used": {
|
|
||||||
"min": 0.03694102397926118,
|
|
||||||
"avg": 0.48812580468611544,
|
|
||||||
"max": 1.0000000000000002,
|
|
||||||
"unit": {
|
|
||||||
"base": ""
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"ipc": {
|
|
||||||
"min": 0.30469640475234366,
|
|
||||||
"avg": 1.154312070173657,
|
|
||||||
"max": 1.797623522191001,
|
|
||||||
"unit": {
|
|
||||||
"base": "IPC"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flops_any": {
|
|
||||||
"min": 0.0,
|
|
||||||
"avg": 686.5190320308598,
|
|
||||||
"max": 4346.591400350933,
|
|
||||||
"unit": {
|
|
||||||
"base": "F/s"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"mem_bw": {
|
|
||||||
"min": 653671812.1661415,
|
|
||||||
"avg": 1605031604.9852366,
|
|
||||||
"max": 2614718291.9554267,
|
|
||||||
"unit": {
|
|
||||||
"base": "B/s"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"file_bw": {
|
|
||||||
"min": 0.0,
|
|
||||||
"avg": 620592.5419124186,
|
|
||||||
"max": 11559156.360352296,
|
|
||||||
"unit": {
|
|
||||||
"base": "B/s"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"net_bw": {
|
|
||||||
"min": 126779.89655880642,
|
|
||||||
"avg": 763101.082138246,
|
|
||||||
"max": 1916309.7075416835,
|
|
||||||
"unit": {
|
|
||||||
"base": "B/s"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"mem_used": {
|
|
||||||
"min": 2779066368.0,
|
|
||||||
"avg": 9647598685.09091,
|
|
||||||
"max": 10202595328.0,
|
|
||||||
"unit": {
|
|
||||||
"base": "B"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"cpu_power": {
|
|
||||||
"min": 35.50647456742635,
|
|
||||||
"avg": 78.63442946337237,
|
|
||||||
"max": 85.83909286117324,
|
|
||||||
"unit": {
|
|
||||||
"base": "W"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
{
|
|
||||||
"jobId": 398764,
|
|
||||||
"cluster": "fritz",
|
|
||||||
"startTime": 1675954353,
|
|
||||||
"duration": 3400
|
|
||||||
}
|
|
||||||
@ -96,6 +96,19 @@ func scanJob(row interface{ Scan(...interface{}) error }) (*schema.Job, error) {
|
|||||||
return job, nil
|
return job, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (r *JobRepository) Flush() error {
|
||||||
|
var err error
|
||||||
|
|
||||||
|
switch r.driver {
|
||||||
|
case "sqlite3":
|
||||||
|
_, err = r.DB.Exec(`DELETE FROM job`)
|
||||||
|
case "mysql":
|
||||||
|
_, err = r.DB.Exec(`TRUNCATE TABLE job`)
|
||||||
|
}
|
||||||
|
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
func (r *JobRepository) FetchJobName(job *schema.Job) (*string, error) {
|
func (r *JobRepository) FetchJobName(job *schema.Job) (*string, error) {
|
||||||
start := time.Now()
|
start := time.Now()
|
||||||
cachekey := fmt.Sprintf("metadata:%d", job.ID)
|
cachekey := fmt.Sprintf("metadata:%d", job.ID)
|
||||||
@ -695,9 +708,10 @@ func (r *JobRepository) JobsStatistics(ctx context.Context,
|
|||||||
stats := map[string]*model.JobsStatistics{}
|
stats := map[string]*model.JobsStatistics{}
|
||||||
var castType string
|
var castType string
|
||||||
|
|
||||||
if r.driver == "sqlite3" {
|
switch r.driver {
|
||||||
|
case "sqlite3":
|
||||||
castType = "int"
|
castType = "int"
|
||||||
} else if r.driver == "mysql" {
|
case "mysql":
|
||||||
castType = "unsigned"
|
castType = "unsigned"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -24,8 +24,8 @@ var migrationFiles embed.FS
|
|||||||
func checkDBVersion(backend string, db *sql.DB) error {
|
func checkDBVersion(backend string, db *sql.DB) error {
|
||||||
var m *migrate.Migrate
|
var m *migrate.Migrate
|
||||||
|
|
||||||
if backend == "sqlite3" {
|
switch backend {
|
||||||
|
case "sqlite3":
|
||||||
driver, err := sqlite3.WithInstance(db, &sqlite3.Config{})
|
driver, err := sqlite3.WithInstance(db, &sqlite3.Config{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@ -39,7 +39,7 @@ func checkDBVersion(backend string, db *sql.DB) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
} else if backend == "mysql" {
|
case "mysql":
|
||||||
driver, err := mysql.WithInstance(db, &mysql.Config{})
|
driver, err := mysql.WithInstance(db, &mysql.Config{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@ -65,11 +65,11 @@ func checkDBVersion(backend string, db *sql.DB) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if v < Version {
|
if v < Version {
|
||||||
return fmt.Errorf("Unsupported database version %d, need %d.\nPlease backup your database file and run cc-backend --migrate-db", v, Version)
|
return fmt.Errorf("unsupported database version %d, need %d.\nPlease backup your database file and run cc-backend --migrate-db", v, Version)
|
||||||
}
|
}
|
||||||
|
|
||||||
if v > Version {
|
if v > Version {
|
||||||
return fmt.Errorf("Unsupported database version %d, need %d.\nPlease refer to documentation how to downgrade db with external migrate tool!", v, Version)
|
return fmt.Errorf("unsupported database version %d, need %d.\nPlease refer to documentation how to downgrade db with external migrate tool", v, Version)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
@ -78,7 +78,8 @@ func checkDBVersion(backend string, db *sql.DB) error {
|
|||||||
func MigrateDB(backend string, db string) error {
|
func MigrateDB(backend string, db string) error {
|
||||||
var m *migrate.Migrate
|
var m *migrate.Migrate
|
||||||
|
|
||||||
if backend == "sqlite3" {
|
switch backend {
|
||||||
|
case "sqlite3":
|
||||||
d, err := iofs.New(migrationFiles, "migrations/sqlite3")
|
d, err := iofs.New(migrationFiles, "migrations/sqlite3")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
@ -88,7 +89,7 @@ func MigrateDB(backend string, db string) error {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
} else if backend == "mysql" {
|
case "mysql":
|
||||||
d, err := iofs.New(migrationFiles, "migrations/mysql")
|
d, err := iofs.New(migrationFiles, "migrations/mysql")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|||||||
@ -34,11 +34,13 @@ func (r *JobRepository) QueryJobs(
|
|||||||
|
|
||||||
if order != nil {
|
if order != nil {
|
||||||
field := toSnakeCase(order.Field)
|
field := toSnakeCase(order.Field)
|
||||||
if order.Order == model.SortDirectionEnumAsc {
|
|
||||||
|
switch order.Order {
|
||||||
|
case model.SortDirectionEnumAsc:
|
||||||
query = query.OrderBy(fmt.Sprintf("job.%s ASC", field))
|
query = query.OrderBy(fmt.Sprintf("job.%s ASC", field))
|
||||||
} else if order.Order == model.SortDirectionEnumDesc {
|
case model.SortDirectionEnumDesc:
|
||||||
query = query.OrderBy(fmt.Sprintf("job.%s DESC", field))
|
query = query.OrderBy(fmt.Sprintf("job.%s DESC", field))
|
||||||
} else {
|
default:
|
||||||
return nil, errors.New("REPOSITORY/QUERY > invalid sorting order")
|
return nil, errors.New("REPOSITORY/QUERY > invalid sorting order")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -117,7 +119,7 @@ func SecurityCheck(ctx context.Context, query sq.SelectBuilder) (queryOut sq.Sel
|
|||||||
return query.Where("job.user = ?", user.Username), nil
|
return query.Where("job.user = ?", user.Username), nil
|
||||||
} else { // Unauthorized : Error
|
} else { // Unauthorized : Error
|
||||||
var qnil sq.SelectBuilder
|
var qnil sq.SelectBuilder
|
||||||
return qnil, errors.New(fmt.Sprintf("User '%s' with unknown roles! [%#v]\n", user.Username, user.Roles))
|
return qnil, fmt.Errorf("user '%s' with unknown roles [%#v]", user.Username, user.Roles)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,175 +0,0 @@
|
|||||||
# cc-units - A unit system for ClusterCockpit
|
|
||||||
|
|
||||||
When working with metrics, the problem comes up that they may use different unit name but have the same unit in fact.
|
|
||||||
There are a lot of real world examples like 'kB' and 'Kbyte'. In [cc-metric-collector](https://github.com/ClusterCockpit/cc-metric-collector), the collectors read data from different sources which may use different units or the programmer specifies a unit for a metric by hand. The cc-units system is not comparable with the SI unit system. If you are looking for a package for the SI units, see [here](https://pkg.go.dev/github.com/gurre/si).
|
|
||||||
|
|
||||||
In order to enable unit comparison and conversion, the ccUnits package provides some helpers:
|
|
||||||
```go
|
|
||||||
NewUnit(unit string) Unit // create a new unit from some string like 'GHz', 'Mbyte' or 'kevents/s'
|
|
||||||
func GetUnitUnitFactor(in Unit, out Unit) (func(value float64) float64, error) // Get conversion function between two units
|
|
||||||
func GetPrefixFactor(in Prefix, out Prefix) func(value float64) float64 // Get conversion function between two prefixes
|
|
||||||
func GetUnitPrefixFactor(in Unit, out Prefix) (func(value float64) float64, Unit) // Get conversion function for prefix changes and the new unit for further use
|
|
||||||
|
|
||||||
type Unit interface {
|
|
||||||
Valid() bool
|
|
||||||
String() string
|
|
||||||
Short() string
|
|
||||||
AddUnitDenominator(div Measure)
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
In order to get the "normalized" string unit back or test for validity, you can use:
|
|
||||||
```go
|
|
||||||
u := NewUnit("MB")
|
|
||||||
fmt.Println(u.Valid()) // true
|
|
||||||
fmt.Printf("Long string %q", u.String()) // MegaBytes
|
|
||||||
fmt.Printf("Short string %q", u.Short()) // MBytes
|
|
||||||
v := NewUnit("foo")
|
|
||||||
fmt.Println(v.Valid()) // false
|
|
||||||
```
|
|
||||||
|
|
||||||
If you have two units or other components and need the conversion function:
|
|
||||||
```go
|
|
||||||
// Get conversion functions for 'kB' to 'MBytes'
|
|
||||||
u1 := NewUnit("kB")
|
|
||||||
u2 := NewUnit("MBytes")
|
|
||||||
convFunc, err := GetUnitUnitFactor(u1, u2) // Returns an error if the units have different measures
|
|
||||||
if err == nil {
|
|
||||||
v2 := convFunc(v1)
|
|
||||||
fmt.Printf("%f %s\n", v2, u2.Short())
|
|
||||||
}
|
|
||||||
// Get conversion function for 'kB' -> 'G' prefix.
|
|
||||||
// Returns the function and the new unit 'GBytes'
|
|
||||||
p1 := NewPrefix("G")
|
|
||||||
convFunc, u_p1 := GetUnitPrefixFactor(u1, p1)
|
|
||||||
// or
|
|
||||||
// convFunc, u_p1 := GetUnitPrefixStringFactor(u1, "G")
|
|
||||||
if convFunc != nil {
|
|
||||||
v2 := convFunc(v1)
|
|
||||||
fmt.Printf("%f %s\n", v2, u_p1.Short())
|
|
||||||
}
|
|
||||||
// Get conversion function for two prefixes: 'G' -> 'T'
|
|
||||||
p2 := NewPrefix("T")
|
|
||||||
convFunc = GetPrefixPrefixFactor(p1, p2)
|
|
||||||
if convFunc != nil {
|
|
||||||
v2 := convFunc(v1)
|
|
||||||
fmt.Printf("%f %s -> %f %s\n", v1, p1.Prefix(), v2, p2.Prefix())
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
```
|
|
||||||
|
|
||||||
(In the ClusterCockpit ecosystem the separation between values and units if useful since they are commonly not stored as a single entity but the value is a field in the CCMetric while unit is a tag or a meta information).
|
|
||||||
|
|
||||||
If you have a metric and want the derivation to a bandwidth or events per second, you can use the original unit:
|
|
||||||
|
|
||||||
```go
|
|
||||||
in_unit, err := metric.GetMeta("unit")
|
|
||||||
if err == nil {
|
|
||||||
value, ok := metric.GetField("value")
|
|
||||||
if ok {
|
|
||||||
out_unit = NewUnit(in_unit)
|
|
||||||
out_unit.AddUnitDenominator("seconds")
|
|
||||||
seconds := timeDiff.Seconds()
|
|
||||||
y, err := lp.New(metric.Name()+"_bw",
|
|
||||||
metric.Tags(),
|
|
||||||
metric.Meta(),
|
|
||||||
map[string]interface{"value": value/seconds},
|
|
||||||
metric.Time())
|
|
||||||
if err == nil {
|
|
||||||
y.AddMeta("unit", out_unit.Short())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
## Special unit detection
|
|
||||||
|
|
||||||
Some used measures like Bytes and Flops are non-dividable. Consequently there prefixes like Milli, Micro and Nano are not useful. This is quite handy since a unit `mb` for `MBytes` is not uncommon but would by default be parsed as "MilliBytes".
|
|
||||||
|
|
||||||
Special parsing rules for the following measures: iff `prefix==Milli`, use `prefix==Mega`
|
|
||||||
- `Bytes`
|
|
||||||
- `Flops`
|
|
||||||
- `Packets`
|
|
||||||
- `Events`
|
|
||||||
- `Cycles`
|
|
||||||
- `Requests`
|
|
||||||
|
|
||||||
This means the prefixes `Micro` (like `ubytes`) and `Nano` like (`nflops/sec`) are not allowed and return an invalid unit. But you can specify `mflops` and `mb`.
|
|
||||||
|
|
||||||
Prefixes for `%` or `percent` are ignored.
|
|
||||||
|
|
||||||
## Supported prefixes
|
|
||||||
|
|
||||||
```go
|
|
||||||
const (
|
|
||||||
Base Prefix = 1
|
|
||||||
Exa = 1e18
|
|
||||||
Peta = 1e15
|
|
||||||
Tera = 1e12
|
|
||||||
Giga = 1e9
|
|
||||||
Mega = 1e6
|
|
||||||
Kilo = 1e3
|
|
||||||
Milli = 1e-3
|
|
||||||
Micro = 1e-6
|
|
||||||
Nano = 1e-9
|
|
||||||
Kibi = 1024
|
|
||||||
Mebi = 1024 * 1024
|
|
||||||
Gibi = 1024 * 1024 * 1024
|
|
||||||
Tebi = 1024 * 1024 * 1024 * 1024
|
|
||||||
)
|
|
||||||
```
|
|
||||||
|
|
||||||
The prefixes are detected using a regular expression `^([kKmMgGtTpP]?[i]?)(.*)` that splits the prefix from the measure. You probably don't need to deal with the prefixes in the code.
|
|
||||||
|
|
||||||
## Supported measures
|
|
||||||
|
|
||||||
```go
|
|
||||||
const (
|
|
||||||
None Measure = iota
|
|
||||||
Bytes
|
|
||||||
Flops
|
|
||||||
Percentage
|
|
||||||
TemperatureC
|
|
||||||
TemperatureF
|
|
||||||
Rotation
|
|
||||||
Hertz
|
|
||||||
Time
|
|
||||||
Watt
|
|
||||||
Joule
|
|
||||||
Cycles
|
|
||||||
Requests
|
|
||||||
Packets
|
|
||||||
Events
|
|
||||||
)
|
|
||||||
```
|
|
||||||
|
|
||||||
There a regular expression for each of the measures like `^([bB][yY]?[tT]?[eE]?[sS]?)` for the `Bytes` measure.
|
|
||||||
|
|
||||||
|
|
||||||
## New units
|
|
||||||
|
|
||||||
If the selected units are not suitable for your metric, feel free to send a PR.
|
|
||||||
|
|
||||||
### New prefix
|
|
||||||
|
|
||||||
For a new prefix, add it to the big `const` in `ccUnitPrefix.go` and adjust the prefix-unit-splitting regular expression. Afterwards, you have to add cases to the three functions `String()`, `Prefix()` and `NewPrefix()`. `NewPrefix()` contains the parser (`k` or `K` -> `Kilo`). The other one are used for output. `String()` outputs a longer version of the prefix (`Kilo`), while `Prefix()` returns only the short notation (`K`).
|
|
||||||
|
|
||||||
### New measure
|
|
||||||
|
|
||||||
Adding new prefixes is probably rare but adding a new measure is a more common task. At first, add it to the big `const` in `ccUnitMeasure.go`. Moreover, create a regular expression matching the measure (and pre-compile it like the others). Add the expression matching to `NewMeasure()`. The `String()` and `Short()` functions return descriptive strings for the measure in long form (like `Hertz`) and short form (like `Hz`).
|
|
||||||
|
|
||||||
If there are special conversation rules between measures and you want to convert one measure to another, like temperatures in Celsius to Fahrenheit, a special case in `GetUnitPrefixFactor()` is required.
|
|
||||||
|
|
||||||
### Special parsing rules
|
|
||||||
|
|
||||||
The two parsers for prefix and measure are called under the hood by `NewUnit()` and there might some special rules apply. Like in the above section about 'special unit detection', special rules for your new measure might be required. Currently there are two special cases:
|
|
||||||
|
|
||||||
- Measures that are non-dividable like Flops, Bytes, Events, ... cannot use `Milli`, `Micro` and `Nano`. The prefix `m` is forced to `M` for these measures
|
|
||||||
- If the prefix is `p`/`P` (`Peta`) or `e`/`E` (`Exa`) and the measure is not detectable, it retries detection with the prefix. So first round it tries, for example, prefix `p` and measure `ackets` which fails, so it retries the detection with measure `packets` and `<empty>` prefix (resolves to `Base` prefix).
|
|
||||||
|
|
||||||
## Limitations
|
|
||||||
|
|
||||||
The `ccUnits` package is a simple implemtation of a unit system and comes with some limitations:
|
|
||||||
|
|
||||||
- The unit denominator (like `s` in `Mbyte/s`) can only have the `Base` prefix, you cannot specify `Byte/ms` for "Bytes per milli second".
|
|
||||||
@ -1,134 +0,0 @@
|
|||||||
package units
|
|
||||||
|
|
||||||
import "regexp"
|
|
||||||
|
|
||||||
type Measure int
|
|
||||||
|
|
||||||
const (
|
|
||||||
InvalidMeasure Measure = iota
|
|
||||||
Bytes
|
|
||||||
Flops
|
|
||||||
Percentage
|
|
||||||
TemperatureC
|
|
||||||
TemperatureF
|
|
||||||
Rotation
|
|
||||||
Frequency
|
|
||||||
Time
|
|
||||||
Watt
|
|
||||||
Joule
|
|
||||||
Cycles
|
|
||||||
Requests
|
|
||||||
Packets
|
|
||||||
Events
|
|
||||||
)
|
|
||||||
|
|
||||||
type MeasureData struct {
|
|
||||||
Long string
|
|
||||||
Short string
|
|
||||||
Regex string
|
|
||||||
}
|
|
||||||
|
|
||||||
// Different names and regex used for input and output
|
|
||||||
var InvalidMeasureLong string = "Invalid"
|
|
||||||
var InvalidMeasureShort string = "inval"
|
|
||||||
var MeasuresMap map[Measure]MeasureData = map[Measure]MeasureData{
|
|
||||||
Bytes: {
|
|
||||||
Long: "byte",
|
|
||||||
Short: "B",
|
|
||||||
Regex: "^([bB][yY]?[tT]?[eE]?[sS]?)",
|
|
||||||
},
|
|
||||||
Flops: {
|
|
||||||
Long: "Flops",
|
|
||||||
Short: "F",
|
|
||||||
Regex: "^([fF][lL]?[oO]?[pP]?[sS]?)",
|
|
||||||
},
|
|
||||||
Percentage: {
|
|
||||||
Long: "Percent",
|
|
||||||
Short: "%",
|
|
||||||
Regex: "^(%|[pP]ercent)",
|
|
||||||
},
|
|
||||||
TemperatureC: {
|
|
||||||
Long: "DegreeC",
|
|
||||||
Short: "degC",
|
|
||||||
Regex: "^(deg[Cc]|°[cC])",
|
|
||||||
},
|
|
||||||
TemperatureF: {
|
|
||||||
Long: "DegreeF",
|
|
||||||
Short: "degF",
|
|
||||||
Regex: "^(deg[fF]|°[fF])",
|
|
||||||
},
|
|
||||||
Rotation: {
|
|
||||||
Long: "RPM",
|
|
||||||
Short: "RPM",
|
|
||||||
Regex: "^([rR][pP][mM])",
|
|
||||||
},
|
|
||||||
Frequency: {
|
|
||||||
Long: "Hertz",
|
|
||||||
Short: "Hz",
|
|
||||||
Regex: "^([hH][eE]?[rR]?[tT]?[zZ])",
|
|
||||||
},
|
|
||||||
Time: {
|
|
||||||
Long: "Seconds",
|
|
||||||
Short: "s",
|
|
||||||
Regex: "^([sS][eE]?[cC]?[oO]?[nN]?[dD]?[sS]?)",
|
|
||||||
},
|
|
||||||
Cycles: {
|
|
||||||
Long: "Cycles",
|
|
||||||
Short: "cyc",
|
|
||||||
Regex: "^([cC][yY][cC]?[lL]?[eE]?[sS]?)",
|
|
||||||
},
|
|
||||||
Watt: {
|
|
||||||
Long: "Watts",
|
|
||||||
Short: "W",
|
|
||||||
Regex: "^([wW][aA]?[tT]?[tT]?[sS]?)",
|
|
||||||
},
|
|
||||||
Joule: {
|
|
||||||
Long: "Joules",
|
|
||||||
Short: "J",
|
|
||||||
Regex: "^([jJ][oO]?[uU]?[lL]?[eE]?[sS]?)",
|
|
||||||
},
|
|
||||||
Requests: {
|
|
||||||
Long: "Requests",
|
|
||||||
Short: "requests",
|
|
||||||
Regex: "^([rR][eE][qQ][uU]?[eE]?[sS]?[tT]?[sS]?)",
|
|
||||||
},
|
|
||||||
Packets: {
|
|
||||||
Long: "Packets",
|
|
||||||
Short: "packets",
|
|
||||||
Regex: "^([pP][aA]?[cC]?[kK][eE]?[tT][sS]?)",
|
|
||||||
},
|
|
||||||
Events: {
|
|
||||||
Long: "Events",
|
|
||||||
Short: "events",
|
|
||||||
Regex: "^([eE][vV]?[eE]?[nN][tT][sS]?)",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
// String returns the long string for the measure like 'Percent' or 'Seconds'
|
|
||||||
func (m *Measure) String() string {
|
|
||||||
if data, ok := MeasuresMap[*m]; ok {
|
|
||||||
return data.Long
|
|
||||||
}
|
|
||||||
return InvalidMeasureLong
|
|
||||||
}
|
|
||||||
|
|
||||||
// Short returns the short string for the measure like 'B' (Bytes), 's' (Time) or 'W' (Watt). Is is recommened to use Short() over String().
|
|
||||||
func (m *Measure) Short() string {
|
|
||||||
if data, ok := MeasuresMap[*m]; ok {
|
|
||||||
return data.Short
|
|
||||||
}
|
|
||||||
return InvalidMeasureShort
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewMeasure creates a new measure out of a string representing a measure like 'Bytes', 'Flops' and 'precent'.
|
|
||||||
// It uses regular expressions for matching.
|
|
||||||
func NewMeasure(unit string) Measure {
|
|
||||||
for m, data := range MeasuresMap {
|
|
||||||
regex := regexp.MustCompile(data.Regex)
|
|
||||||
match := regex.FindStringSubmatch(unit)
|
|
||||||
if match != nil {
|
|
||||||
return m
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return InvalidMeasure
|
|
||||||
}
|
|
||||||
@ -1,192 +0,0 @@
|
|||||||
package units
|
|
||||||
|
|
||||||
import (
|
|
||||||
"math"
|
|
||||||
"regexp"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Prefix float64
|
|
||||||
|
|
||||||
const (
|
|
||||||
InvalidPrefix Prefix = iota
|
|
||||||
Base = 1
|
|
||||||
Yotta = 1e24
|
|
||||||
Zetta = 1e21
|
|
||||||
Exa = 1e18
|
|
||||||
Peta = 1e15
|
|
||||||
Tera = 1e12
|
|
||||||
Giga = 1e9
|
|
||||||
Mega = 1e6
|
|
||||||
Kilo = 1e3
|
|
||||||
Milli = 1e-3
|
|
||||||
Micro = 1e-6
|
|
||||||
Nano = 1e-9
|
|
||||||
Kibi = 1024
|
|
||||||
Mebi = 1024 * 1024
|
|
||||||
Gibi = 1024 * 1024 * 1024
|
|
||||||
Tebi = 1024 * 1024 * 1024 * 1024
|
|
||||||
Pebi = 1024 * 1024 * 1024 * 1024 * 1024
|
|
||||||
Exbi = 1024 * 1024 * 1024 * 1024 * 1024 * 1024
|
|
||||||
Zebi = 1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024
|
|
||||||
Yobi = 1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024
|
|
||||||
)
|
|
||||||
const PrefixUnitSplitRegexStr = `^([kKmMgGtTpPeEzZyY]?[i]?)(.*)`
|
|
||||||
|
|
||||||
var prefixUnitSplitRegex = regexp.MustCompile(PrefixUnitSplitRegexStr)
|
|
||||||
|
|
||||||
type PrefixData struct {
|
|
||||||
Long string
|
|
||||||
Short string
|
|
||||||
Regex string
|
|
||||||
}
|
|
||||||
|
|
||||||
// Different names and regex used for input and output
|
|
||||||
var InvalidPrefixLong string = "Invalid"
|
|
||||||
var InvalidPrefixShort string = "inval"
|
|
||||||
var PrefixDataMap map[Prefix]PrefixData = map[Prefix]PrefixData{
|
|
||||||
Base: {
|
|
||||||
Long: "",
|
|
||||||
Short: "",
|
|
||||||
Regex: "^$",
|
|
||||||
},
|
|
||||||
Kilo: {
|
|
||||||
Long: "Kilo",
|
|
||||||
Short: "K",
|
|
||||||
Regex: "^[kK]$",
|
|
||||||
},
|
|
||||||
Mega: {
|
|
||||||
Long: "Mega",
|
|
||||||
Short: "M",
|
|
||||||
Regex: "^[M]$",
|
|
||||||
},
|
|
||||||
Giga: {
|
|
||||||
Long: "Giga",
|
|
||||||
Short: "G",
|
|
||||||
Regex: "^[gG]$",
|
|
||||||
},
|
|
||||||
Tera: {
|
|
||||||
Long: "Tera",
|
|
||||||
Short: "T",
|
|
||||||
Regex: "^[tT]$",
|
|
||||||
},
|
|
||||||
Peta: {
|
|
||||||
Long: "Peta",
|
|
||||||
Short: "P",
|
|
||||||
Regex: "^[pP]$",
|
|
||||||
},
|
|
||||||
Exa: {
|
|
||||||
Long: "Exa",
|
|
||||||
Short: "E",
|
|
||||||
Regex: "^[eE]$",
|
|
||||||
},
|
|
||||||
Zetta: {
|
|
||||||
Long: "Zetta",
|
|
||||||
Short: "Z",
|
|
||||||
Regex: "^[zZ]$",
|
|
||||||
},
|
|
||||||
Yotta: {
|
|
||||||
Long: "Yotta",
|
|
||||||
Short: "Y",
|
|
||||||
Regex: "^[yY]$",
|
|
||||||
},
|
|
||||||
Milli: {
|
|
||||||
Long: "Milli",
|
|
||||||
Short: "m",
|
|
||||||
Regex: "^[m]$",
|
|
||||||
},
|
|
||||||
Micro: {
|
|
||||||
Long: "Micro",
|
|
||||||
Short: "u",
|
|
||||||
Regex: "^[u]$",
|
|
||||||
},
|
|
||||||
Nano: {
|
|
||||||
Long: "Nano",
|
|
||||||
Short: "n",
|
|
||||||
Regex: "^[n]$",
|
|
||||||
},
|
|
||||||
Kibi: {
|
|
||||||
Long: "Kibi",
|
|
||||||
Short: "Ki",
|
|
||||||
Regex: "^[kK][i]$",
|
|
||||||
},
|
|
||||||
Mebi: {
|
|
||||||
Long: "Mebi",
|
|
||||||
Short: "Mi",
|
|
||||||
Regex: "^[M][i]$",
|
|
||||||
},
|
|
||||||
Gibi: {
|
|
||||||
Long: "Gibi",
|
|
||||||
Short: "Gi",
|
|
||||||
Regex: "^[gG][i]$",
|
|
||||||
},
|
|
||||||
Tebi: {
|
|
||||||
Long: "Tebi",
|
|
||||||
Short: "Ti",
|
|
||||||
Regex: "^[tT][i]$",
|
|
||||||
},
|
|
||||||
Pebi: {
|
|
||||||
Long: "Pebi",
|
|
||||||
Short: "Pi",
|
|
||||||
Regex: "^[pP][i]$",
|
|
||||||
},
|
|
||||||
Exbi: {
|
|
||||||
Long: "Exbi",
|
|
||||||
Short: "Ei",
|
|
||||||
Regex: "^[eE][i]$",
|
|
||||||
},
|
|
||||||
Zebi: {
|
|
||||||
Long: "Zebi",
|
|
||||||
Short: "Zi",
|
|
||||||
Regex: "^[zZ][i]$",
|
|
||||||
},
|
|
||||||
Yobi: {
|
|
||||||
Long: "Yobi",
|
|
||||||
Short: "Yi",
|
|
||||||
Regex: "^[yY][i]$",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
// String returns the long string for the prefix like 'Kilo' or 'Mega'
|
|
||||||
func (p *Prefix) String() string {
|
|
||||||
if data, ok := PrefixDataMap[*p]; ok {
|
|
||||||
return data.Long
|
|
||||||
}
|
|
||||||
return InvalidMeasureLong
|
|
||||||
}
|
|
||||||
|
|
||||||
// Prefix returns the short string for the prefix like 'K', 'M' or 'G'. Is is recommened to use Prefix() over String().
|
|
||||||
func (p *Prefix) Prefix() string {
|
|
||||||
if data, ok := PrefixDataMap[*p]; ok {
|
|
||||||
return data.Short
|
|
||||||
}
|
|
||||||
return InvalidMeasureShort
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewPrefix creates a new prefix out of a string representing a unit like 'k', 'K', 'M' or 'G'.
|
|
||||||
func NewPrefix(prefix string) Prefix {
|
|
||||||
for p, data := range PrefixDataMap {
|
|
||||||
regex := regexp.MustCompile(data.Regex)
|
|
||||||
match := regex.FindStringSubmatch(prefix)
|
|
||||||
if match != nil {
|
|
||||||
return p
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return InvalidPrefix
|
|
||||||
}
|
|
||||||
|
|
||||||
func getExponent(p float64) int {
|
|
||||||
count := 0
|
|
||||||
|
|
||||||
for p > 1.0 {
|
|
||||||
p = p / 1000.0
|
|
||||||
count++
|
|
||||||
}
|
|
||||||
|
|
||||||
return count * 3
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewPrefixFromFactor(op Prefix, e int) Prefix {
|
|
||||||
f := float64(op)
|
|
||||||
exp := math.Pow10(getExponent(f) - e)
|
|
||||||
return Prefix(exp)
|
|
||||||
}
|
|
||||||
@ -1,339 +0,0 @@
|
|||||||
// Unit system for cluster monitoring metrics like bytes, flops and events
|
|
||||||
package units
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"math"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/ClusterCockpit/cc-backend/pkg/schema"
|
|
||||||
)
|
|
||||||
|
|
||||||
type unit struct {
|
|
||||||
prefix Prefix
|
|
||||||
measure Measure
|
|
||||||
divMeasure Measure
|
|
||||||
}
|
|
||||||
|
|
||||||
type Unit interface {
|
|
||||||
Valid() bool
|
|
||||||
String() string
|
|
||||||
Short() string
|
|
||||||
AddUnitDenominator(div Measure)
|
|
||||||
getPrefix() Prefix
|
|
||||||
getMeasure() Measure
|
|
||||||
getUnitDenominator() Measure
|
|
||||||
setPrefix(p Prefix)
|
|
||||||
}
|
|
||||||
|
|
||||||
var INVALID_UNIT = NewUnit("foobar")
|
|
||||||
|
|
||||||
// Valid checks whether a unit is a valid unit.
|
|
||||||
// A unit is valid if it has at least a prefix and a measure.
|
|
||||||
// The unit denominator is optional.
|
|
||||||
func (u *unit) Valid() bool {
|
|
||||||
return u.prefix != InvalidPrefix && u.measure != InvalidMeasure
|
|
||||||
}
|
|
||||||
|
|
||||||
// String returns the long string for the unit like 'KiloHertz' or 'MegaBytes'
|
|
||||||
func (u *unit) String() string {
|
|
||||||
if u.divMeasure != InvalidMeasure {
|
|
||||||
return fmt.Sprintf("%s%s/%s", u.prefix.String(), u.measure.String(), u.divMeasure.String())
|
|
||||||
} else {
|
|
||||||
return fmt.Sprintf("%s%s", u.prefix.String(), u.measure.String())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Short returns the short string for the unit like 'kHz' or 'MByte'. Is is recommened to use Short() over String().
|
|
||||||
func (u *unit) Short() string {
|
|
||||||
if u.divMeasure != InvalidMeasure {
|
|
||||||
return fmt.Sprintf("%s%s/%s", u.prefix.Prefix(), u.measure.Short(), u.divMeasure.Short())
|
|
||||||
} else {
|
|
||||||
return fmt.Sprintf("%s%s", u.prefix.Prefix(), u.measure.Short())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// AddUnitDenominator adds a unit denominator to an exising unit. Can be used if you want to derive e.g. data volume to bandwidths.
|
|
||||||
// The data volume is in a Byte unit like 'kByte' and by dividing it by the runtime in seconds, we get the bandwidth. We can use the
|
|
||||||
// data volume unit and add 'Second' as unit denominator
|
|
||||||
func (u *unit) AddUnitDenominator(div Measure) {
|
|
||||||
u.divMeasure = div
|
|
||||||
}
|
|
||||||
|
|
||||||
func (u *unit) getPrefix() Prefix {
|
|
||||||
return u.prefix
|
|
||||||
}
|
|
||||||
|
|
||||||
func (u *unit) setPrefix(p Prefix) {
|
|
||||||
u.prefix = p
|
|
||||||
}
|
|
||||||
|
|
||||||
func (u *unit) getMeasure() Measure {
|
|
||||||
return u.measure
|
|
||||||
}
|
|
||||||
|
|
||||||
func (u *unit) getUnitDenominator() Measure {
|
|
||||||
return u.divMeasure
|
|
||||||
}
|
|
||||||
|
|
||||||
func ConvertValue(v *float64, from string, to string) {
|
|
||||||
uf := NewUnit(from)
|
|
||||||
ut := NewUnit(to)
|
|
||||||
factor := float64(uf.getPrefix()) / float64(ut.getPrefix())
|
|
||||||
*v = math.Ceil(*v * factor)
|
|
||||||
}
|
|
||||||
|
|
||||||
func ConvertSeries(s []float64, from string, to string) {
|
|
||||||
uf := NewUnit(from)
|
|
||||||
ut := NewUnit(to)
|
|
||||||
factor := float64(uf.getPrefix()) / float64(ut.getPrefix())
|
|
||||||
|
|
||||||
for i := 0; i < len(s); i++ {
|
|
||||||
s[i] = math.Ceil(s[i] * factor)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func getNormalizationFactor(v float64) (float64, int) {
|
|
||||||
count := 0
|
|
||||||
scale := -3
|
|
||||||
|
|
||||||
if v > 1000.0 {
|
|
||||||
for v > 1000.0 {
|
|
||||||
v *= 1e-3
|
|
||||||
count++
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
for v < 1.0 {
|
|
||||||
v *= 1e3
|
|
||||||
count++
|
|
||||||
}
|
|
||||||
scale = 3
|
|
||||||
}
|
|
||||||
return math.Pow10(count * scale), count * scale
|
|
||||||
}
|
|
||||||
|
|
||||||
func NormalizeValue(v *float64, us string) string {
|
|
||||||
u := NewUnit(us)
|
|
||||||
f, e := getNormalizationFactor((*v))
|
|
||||||
*v = math.Ceil(*v * f)
|
|
||||||
p := NewPrefixFromFactor(u.getPrefix(), e)
|
|
||||||
return p.Prefix()
|
|
||||||
}
|
|
||||||
|
|
||||||
func NormalizeSeries(s []float64, avg float64, us string, nu *string) {
|
|
||||||
u := NewUnit(us)
|
|
||||||
f, e := getNormalizationFactor(avg)
|
|
||||||
|
|
||||||
for i := 0; i < len(s); i++ {
|
|
||||||
s[i] *= f
|
|
||||||
s[i] = math.Ceil(s[i])
|
|
||||||
}
|
|
||||||
u.setPrefix(NewPrefixFromFactor(u.getPrefix(), e))
|
|
||||||
fmt.Printf("Prefix: %e \n", u.getPrefix())
|
|
||||||
*nu = u.Short()
|
|
||||||
}
|
|
||||||
|
|
||||||
func ConvertUnitString(us string) schema.Unit {
|
|
||||||
var nu schema.Unit
|
|
||||||
|
|
||||||
if us == "CPI" ||
|
|
||||||
us == "IPC" ||
|
|
||||||
us == "load" ||
|
|
||||||
us == "" {
|
|
||||||
nu.Base = us
|
|
||||||
return nu
|
|
||||||
}
|
|
||||||
u := NewUnit(us)
|
|
||||||
p := u.getPrefix()
|
|
||||||
if p.Prefix() != "" {
|
|
||||||
prefix := p.Prefix()
|
|
||||||
nu.Prefix = prefix
|
|
||||||
}
|
|
||||||
m := u.getMeasure()
|
|
||||||
d := u.getUnitDenominator()
|
|
||||||
if d.Short() != "inval" {
|
|
||||||
nu.Base = fmt.Sprintf("%s/%s", m.Short(), d.Short())
|
|
||||||
} else {
|
|
||||||
nu.Base = m.Short()
|
|
||||||
}
|
|
||||||
|
|
||||||
return nu
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefixPrefixFactor creates the default conversion function between two prefixes.
|
|
||||||
// It returns a conversation function for the value.
|
|
||||||
func GetPrefixPrefixFactor(in Prefix, out Prefix) func(value interface{}) interface{} {
|
|
||||||
var factor = 1.0
|
|
||||||
var in_prefix = float64(in)
|
|
||||||
var out_prefix = float64(out)
|
|
||||||
factor = in_prefix / out_prefix
|
|
||||||
conv := func(value interface{}) interface{} {
|
|
||||||
switch v := value.(type) {
|
|
||||||
case float64:
|
|
||||||
return v * factor
|
|
||||||
case float32:
|
|
||||||
return float32(float64(v) * factor)
|
|
||||||
case int:
|
|
||||||
return int(float64(v) * factor)
|
|
||||||
case int32:
|
|
||||||
return int32(float64(v) * factor)
|
|
||||||
case int64:
|
|
||||||
return int64(float64(v) * factor)
|
|
||||||
case uint:
|
|
||||||
return uint(float64(v) * factor)
|
|
||||||
case uint32:
|
|
||||||
return uint32(float64(v) * factor)
|
|
||||||
case uint64:
|
|
||||||
return uint64(float64(v) * factor)
|
|
||||||
}
|
|
||||||
return value
|
|
||||||
}
|
|
||||||
return conv
|
|
||||||
}
|
|
||||||
|
|
||||||
// This is the conversion function between temperatures in Celsius to Fahrenheit
|
|
||||||
func convertTempC2TempF(value interface{}) interface{} {
|
|
||||||
switch v := value.(type) {
|
|
||||||
case float64:
|
|
||||||
return (v * 1.8) + 32
|
|
||||||
case float32:
|
|
||||||
return (v * 1.8) + 32
|
|
||||||
case int:
|
|
||||||
return int((float64(v) * 1.8) + 32)
|
|
||||||
case int32:
|
|
||||||
return int32((float64(v) * 1.8) + 32)
|
|
||||||
case int64:
|
|
||||||
return int64((float64(v) * 1.8) + 32)
|
|
||||||
case uint:
|
|
||||||
return uint((float64(v) * 1.8) + 32)
|
|
||||||
case uint32:
|
|
||||||
return uint32((float64(v) * 1.8) + 32)
|
|
||||||
case uint64:
|
|
||||||
return uint64((float64(v) * 1.8) + 32)
|
|
||||||
}
|
|
||||||
return value
|
|
||||||
}
|
|
||||||
|
|
||||||
// This is the conversion function between temperatures in Fahrenheit to Celsius
|
|
||||||
func convertTempF2TempC(value interface{}) interface{} {
|
|
||||||
switch v := value.(type) {
|
|
||||||
case float64:
|
|
||||||
return (v - 32) / 1.8
|
|
||||||
case float32:
|
|
||||||
return (v - 32) / 1.8
|
|
||||||
case int:
|
|
||||||
return int(((float64(v) - 32) / 1.8))
|
|
||||||
case int32:
|
|
||||||
return int32(((float64(v) - 32) / 1.8))
|
|
||||||
case int64:
|
|
||||||
return int64(((float64(v) - 32) / 1.8))
|
|
||||||
case uint:
|
|
||||||
return uint(((float64(v) - 32) / 1.8))
|
|
||||||
case uint32:
|
|
||||||
return uint32(((float64(v) - 32) / 1.8))
|
|
||||||
case uint64:
|
|
||||||
return uint64(((float64(v) - 32) / 1.8))
|
|
||||||
}
|
|
||||||
return value
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefixStringPrefixStringFactor is a wrapper for GetPrefixPrefixFactor with string inputs instead
|
|
||||||
// of prefixes. It also returns a conversation function for the value.
|
|
||||||
func GetPrefixStringPrefixStringFactor(in string, out string) func(value interface{}) interface{} {
|
|
||||||
var i Prefix = NewPrefix(in)
|
|
||||||
var o Prefix = NewPrefix(out)
|
|
||||||
return GetPrefixPrefixFactor(i, o)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetUnitPrefixFactor gets the conversion function and resulting unit for a unit and a prefix. This is
|
|
||||||
// the most common case where you have some input unit and want to convert it to the same unit but with
|
|
||||||
// a different prefix. The returned unit represents the value after conversation.
|
|
||||||
func GetUnitPrefixFactor(in Unit, out Prefix) (func(value interface{}) interface{}, Unit) {
|
|
||||||
outUnit := NewUnit(in.Short())
|
|
||||||
if outUnit.Valid() {
|
|
||||||
outUnit.setPrefix(out)
|
|
||||||
conv := GetPrefixPrefixFactor(in.getPrefix(), out)
|
|
||||||
return conv, outUnit
|
|
||||||
}
|
|
||||||
return nil, INVALID_UNIT
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetUnitPrefixStringFactor gets the conversion function and resulting unit for a unit and a prefix as string.
|
|
||||||
// It is a wrapper for GetUnitPrefixFactor
|
|
||||||
func GetUnitPrefixStringFactor(in Unit, out string) (func(value interface{}) interface{}, Unit) {
|
|
||||||
var o Prefix = NewPrefix(out)
|
|
||||||
return GetUnitPrefixFactor(in, o)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetUnitStringPrefixStringFactor gets the conversion function and resulting unit for a unit and a prefix when both are only string representations.
|
|
||||||
// This is just a wrapper for GetUnitPrefixFactor with the given input unit and the desired output prefix.
|
|
||||||
func GetUnitStringPrefixStringFactor(in string, out string) (func(value interface{}) interface{}, Unit) {
|
|
||||||
var i = NewUnit(in)
|
|
||||||
return GetUnitPrefixStringFactor(i, out)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetUnitUnitFactor gets the conversion function and (maybe) error for unit to unit conversion.
|
|
||||||
// It is basically a wrapper for GetPrefixPrefixFactor with some special cases for temperature
|
|
||||||
// conversion between Fahrenheit and Celsius.
|
|
||||||
func GetUnitUnitFactor(in Unit, out Unit) (func(value interface{}) interface{}, error) {
|
|
||||||
if in.getMeasure() == TemperatureC && out.getMeasure() == TemperatureF {
|
|
||||||
return convertTempC2TempF, nil
|
|
||||||
} else if in.getMeasure() == TemperatureF && out.getMeasure() == TemperatureC {
|
|
||||||
return convertTempF2TempC, nil
|
|
||||||
} else if in.getMeasure() != out.getMeasure() || in.getUnitDenominator() != out.getUnitDenominator() {
|
|
||||||
return func(value interface{}) interface{} { return 1.0 }, fmt.Errorf("UNITS/UNITS > invalid measures in in and out Unit")
|
|
||||||
}
|
|
||||||
return GetPrefixPrefixFactor(in.getPrefix(), out.getPrefix()), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewUnit creates a new unit out of a string representing a unit like 'Mbyte/s' or 'GHz'.
|
|
||||||
// It uses regular expressions to detect the prefix, unit and (maybe) unit denominator.
|
|
||||||
func NewUnit(unitStr string) Unit {
|
|
||||||
u := &unit{
|
|
||||||
prefix: InvalidPrefix,
|
|
||||||
measure: InvalidMeasure,
|
|
||||||
divMeasure: InvalidMeasure,
|
|
||||||
}
|
|
||||||
matches := prefixUnitSplitRegex.FindStringSubmatch(unitStr)
|
|
||||||
if len(matches) > 2 {
|
|
||||||
pre := NewPrefix(matches[1])
|
|
||||||
measures := strings.Split(matches[2], "/")
|
|
||||||
m := NewMeasure(measures[0])
|
|
||||||
// Special case for prefix 'p' or 'P' (Peta) and measures starting with 'p' or 'P'
|
|
||||||
// like 'packets' or 'percent'. Same for 'e' or 'E' (Exa) for measures starting with
|
|
||||||
// 'e' or 'E' like 'events'
|
|
||||||
if m == InvalidMeasure {
|
|
||||||
switch pre {
|
|
||||||
case Peta, Exa:
|
|
||||||
t := NewMeasure(matches[1] + measures[0])
|
|
||||||
if t != InvalidMeasure {
|
|
||||||
m = t
|
|
||||||
pre = Base
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
div := InvalidMeasure
|
|
||||||
if len(measures) > 1 {
|
|
||||||
div = NewMeasure(measures[1])
|
|
||||||
}
|
|
||||||
|
|
||||||
switch m {
|
|
||||||
// Special case for 'm' as prefix for Bytes and some others as thers is no unit like MilliBytes
|
|
||||||
case Bytes, Flops, Packets, Events, Cycles, Requests:
|
|
||||||
if pre == Milli {
|
|
||||||
pre = Mega
|
|
||||||
}
|
|
||||||
// Special case for percentage. No/ignore prefix
|
|
||||||
case Percentage:
|
|
||||||
pre = Base
|
|
||||||
}
|
|
||||||
if pre != InvalidPrefix && m != InvalidMeasure {
|
|
||||||
u.prefix = pre
|
|
||||||
u.measure = m
|
|
||||||
if div != InvalidMeasure {
|
|
||||||
u.divMeasure = div
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return u
|
|
||||||
}
|
|
||||||
@ -1,307 +0,0 @@
|
|||||||
package units
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"reflect"
|
|
||||||
"regexp"
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestUnitsExact(t *testing.T) {
|
|
||||||
testCases := []struct {
|
|
||||||
in string
|
|
||||||
want Unit
|
|
||||||
}{
|
|
||||||
{"b", NewUnit("Bytes")},
|
|
||||||
{"B", NewUnit("Bytes")},
|
|
||||||
{"byte", NewUnit("Bytes")},
|
|
||||||
{"bytes", NewUnit("Bytes")},
|
|
||||||
{"BYtes", NewUnit("Bytes")},
|
|
||||||
{"Mb", NewUnit("MBytes")},
|
|
||||||
{"MB", NewUnit("MBytes")},
|
|
||||||
{"Mbyte", NewUnit("MBytes")},
|
|
||||||
{"Mbytes", NewUnit("MBytes")},
|
|
||||||
{"MbYtes", NewUnit("MBytes")},
|
|
||||||
{"Gb", NewUnit("GBytes")},
|
|
||||||
{"GB", NewUnit("GBytes")},
|
|
||||||
{"Hz", NewUnit("Hertz")},
|
|
||||||
{"MHz", NewUnit("MHertz")},
|
|
||||||
{"GHz", NewUnit("GHertz")},
|
|
||||||
{"pkts", NewUnit("Packets")},
|
|
||||||
{"packets", NewUnit("Packets")},
|
|
||||||
{"packet", NewUnit("Packets")},
|
|
||||||
{"flop", NewUnit("Flops")},
|
|
||||||
{"flops", NewUnit("Flops")},
|
|
||||||
{"floPS", NewUnit("Flops")},
|
|
||||||
{"Mflop", NewUnit("MFlops")},
|
|
||||||
{"Gflop", NewUnit("GFlops")},
|
|
||||||
{"gflop", NewUnit("GFlops")},
|
|
||||||
{"%", NewUnit("Percent")},
|
|
||||||
{"percent", NewUnit("Percent")},
|
|
||||||
{"degc", NewUnit("degC")},
|
|
||||||
{"degC", NewUnit("degC")},
|
|
||||||
{"degf", NewUnit("degF")},
|
|
||||||
{"°f", NewUnit("degF")},
|
|
||||||
{"events", NewUnit("events")},
|
|
||||||
{"event", NewUnit("events")},
|
|
||||||
{"EveNts", NewUnit("events")},
|
|
||||||
{"reqs", NewUnit("requests")},
|
|
||||||
{"reQuEsTs", NewUnit("requests")},
|
|
||||||
{"Requests", NewUnit("requests")},
|
|
||||||
{"cyc", NewUnit("cycles")},
|
|
||||||
{"cy", NewUnit("cycles")},
|
|
||||||
{"Cycles", NewUnit("cycles")},
|
|
||||||
{"J", NewUnit("Joules")},
|
|
||||||
{"Joule", NewUnit("Joules")},
|
|
||||||
{"joule", NewUnit("Joules")},
|
|
||||||
{"W", NewUnit("Watt")},
|
|
||||||
{"Watts", NewUnit("Watt")},
|
|
||||||
{"watt", NewUnit("Watt")},
|
|
||||||
{"s", NewUnit("seconds")},
|
|
||||||
{"sec", NewUnit("seconds")},
|
|
||||||
{"secs", NewUnit("seconds")},
|
|
||||||
{"RPM", NewUnit("rpm")},
|
|
||||||
{"rPm", NewUnit("rpm")},
|
|
||||||
{"watt/byte", NewUnit("W/B")},
|
|
||||||
{"watts/bytes", NewUnit("W/B")},
|
|
||||||
{"flop/byte", NewUnit("flops/Bytes")},
|
|
||||||
{"F/B", NewUnit("flops/Bytes")},
|
|
||||||
}
|
|
||||||
compareUnitExact := func(in, out Unit) bool {
|
|
||||||
if in.getMeasure() == out.getMeasure() && in.getUnitDenominator() == out.getUnitDenominator() && in.getPrefix() == out.getPrefix() {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
for _, c := range testCases {
|
|
||||||
u := NewUnit(c.in)
|
|
||||||
if (!u.Valid()) || (!compareUnitExact(u, c.want)) {
|
|
||||||
t.Errorf("func NewUnit(%q) == %q, want %q", c.in, u.String(), c.want.String())
|
|
||||||
} else {
|
|
||||||
t.Logf("NewUnit(%q) == %q", c.in, u.String())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestUnitUnitConversion(t *testing.T) {
|
|
||||||
testCases := []struct {
|
|
||||||
in string
|
|
||||||
want Unit
|
|
||||||
prefixFactor float64
|
|
||||||
}{
|
|
||||||
{"kb", NewUnit("Bytes"), 1000},
|
|
||||||
{"Mb", NewUnit("Bytes"), 1000000},
|
|
||||||
{"Mb/s", NewUnit("Bytes/s"), 1000000},
|
|
||||||
{"Flops/s", NewUnit("MFlops/s"), 1e-6},
|
|
||||||
{"Flops/s", NewUnit("GFlops/s"), 1e-9},
|
|
||||||
{"MHz", NewUnit("Hertz"), 1e6},
|
|
||||||
{"kb", NewUnit("Kib"), 1000.0 / 1024},
|
|
||||||
{"Mib", NewUnit("MBytes"), (1024 * 1024.0) / (1e6)},
|
|
||||||
{"mb", NewUnit("MBytes"), 1.0},
|
|
||||||
}
|
|
||||||
compareUnitWithPrefix := func(in, out Unit, factor float64) bool {
|
|
||||||
if in.getMeasure() == out.getMeasure() && in.getUnitDenominator() == out.getUnitDenominator() {
|
|
||||||
if f := GetPrefixPrefixFactor(in.getPrefix(), out.getPrefix()); f(1.0) == factor {
|
|
||||||
return true
|
|
||||||
} else {
|
|
||||||
fmt.Println(f(1.0))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
for _, c := range testCases {
|
|
||||||
u := NewUnit(c.in)
|
|
||||||
if (!u.Valid()) || (!compareUnitWithPrefix(u, c.want, c.prefixFactor)) {
|
|
||||||
t.Errorf("GetPrefixPrefixFactor(%q, %q) invalid, want %q with factor %g", c.in, u.String(), c.want.String(), c.prefixFactor)
|
|
||||||
} else {
|
|
||||||
t.Logf("GetPrefixPrefixFactor(%q, %q) = %g", c.in, c.want.String(), c.prefixFactor)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestUnitPrefixConversion(t *testing.T) {
|
|
||||||
testCases := []struct {
|
|
||||||
in string
|
|
||||||
want string
|
|
||||||
prefixFactor float64
|
|
||||||
wantUnit Unit
|
|
||||||
}{
|
|
||||||
{"KBytes", "", 1000, NewUnit("Bytes")},
|
|
||||||
{"MBytes", "", 1e6, NewUnit("Bytes")},
|
|
||||||
{"MBytes", "G", 1e-3, NewUnit("GBytes")},
|
|
||||||
{"mb", "M", 1, NewUnit("MBytes")},
|
|
||||||
}
|
|
||||||
compareUnitPrefix := func(in Unit, out Prefix, factor float64, outUnit Unit) bool {
|
|
||||||
if in.Valid() {
|
|
||||||
conv, unit := GetUnitPrefixFactor(in, out)
|
|
||||||
value := conv(1.0)
|
|
||||||
if value == factor && unit.String() == outUnit.String() {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
for _, c := range testCases {
|
|
||||||
u := NewUnit(c.in)
|
|
||||||
p := NewPrefix(c.want)
|
|
||||||
if (!u.Valid()) || (!compareUnitPrefix(u, p, c.prefixFactor, c.wantUnit)) {
|
|
||||||
t.Errorf("GetUnitPrefixFactor(%q, %q) invalid, want %q with factor %g", c.in, p.Prefix(), c.wantUnit.String(), c.prefixFactor)
|
|
||||||
} else {
|
|
||||||
t.Logf("GetUnitPrefixFactor(%q, %q) = %g", c.in, c.wantUnit.String(), c.prefixFactor)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestPrefixPrefixConversion(t *testing.T) {
|
|
||||||
testCases := []struct {
|
|
||||||
in string
|
|
||||||
want string
|
|
||||||
prefixFactor float64
|
|
||||||
}{
|
|
||||||
{"K", "", 1000},
|
|
||||||
{"M", "", 1e6},
|
|
||||||
{"M", "G", 1e-3},
|
|
||||||
{"", "M", 1e-6},
|
|
||||||
{"", "m", 1e3},
|
|
||||||
{"m", "n", 1e6},
|
|
||||||
//{"", "n", 1e9}, //does not work because of IEEE rounding problems
|
|
||||||
}
|
|
||||||
for _, c := range testCases {
|
|
||||||
i := NewPrefix(c.in)
|
|
||||||
o := NewPrefix(c.want)
|
|
||||||
if i != InvalidPrefix && o != InvalidPrefix {
|
|
||||||
conv := GetPrefixPrefixFactor(i, o)
|
|
||||||
value := conv(1.0)
|
|
||||||
if value != c.prefixFactor {
|
|
||||||
t.Errorf("GetPrefixPrefixFactor(%q, %q) invalid, want %q with factor %g but got %g", c.in, c.want, o.Prefix(), c.prefixFactor, value)
|
|
||||||
} else {
|
|
||||||
t.Logf("GetPrefixPrefixFactor(%q, %q) = %g", c.in, c.want, c.prefixFactor)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestMeasureRegex(t *testing.T) {
|
|
||||||
for _, data := range MeasuresMap {
|
|
||||||
_, err := regexp.Compile(data.Regex)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("failed to compile regex '%s': %s", data.Regex, err.Error())
|
|
||||||
}
|
|
||||||
t.Logf("succussfully compiled regex '%s' for measure %s", data.Regex, data.Long)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestPrefixRegex(t *testing.T) {
|
|
||||||
for _, data := range PrefixDataMap {
|
|
||||||
_, err := regexp.Compile(data.Regex)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("failed to compile regex '%s': %s", data.Regex, err.Error())
|
|
||||||
}
|
|
||||||
t.Logf("succussfully compiled regex '%s' for prefix %s", data.Regex, data.Long)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestConvertValue(t *testing.T) {
|
|
||||||
v := float64(103456)
|
|
||||||
ConvertValue(&v, "MB/s", "GB/s")
|
|
||||||
|
|
||||||
if v != 104.00 {
|
|
||||||
t.Errorf("Failed ConvertValue: Want 103.456, Got %f", v)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestConvertValueUp(t *testing.T) {
|
|
||||||
v := float64(10.3456)
|
|
||||||
ConvertValue(&v, "GB/s", "MB/s")
|
|
||||||
|
|
||||||
if v != 10346.00 {
|
|
||||||
t.Errorf("Failed ConvertValue: Want 10346.00, Got %f", v)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
func TestConvertSeries(t *testing.T) {
|
|
||||||
s := []float64{2890031237, 23998994567, 389734042344, 390349424345}
|
|
||||||
r := []float64{3, 24, 390, 391}
|
|
||||||
ConvertSeries(s, "F/s", "GF/s")
|
|
||||||
|
|
||||||
if !reflect.DeepEqual(s, r) {
|
|
||||||
t.Errorf("Failed ConvertValue: Want 3, 24, 390, 391, Got %v", s)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// func TestNormalizeValue(t *testing.T) {
|
|
||||||
// var s string
|
|
||||||
// v := float64(103456)
|
|
||||||
//
|
|
||||||
// NormalizeValue(&v, "MB/s", &s)
|
|
||||||
//
|
|
||||||
// if v != 104.00 {
|
|
||||||
// t.Errorf("Failed ConvertValue: Want 104.00, Got %f", v)
|
|
||||||
// }
|
|
||||||
// if s != "GB/s" {
|
|
||||||
// t.Errorf("Failed Prefix or unit: Want GB/s, Got %s", s)
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// func TestNormalizeValueNoPrefix(t *testing.T) {
|
|
||||||
// var s string
|
|
||||||
// v := float64(103458596)
|
|
||||||
//
|
|
||||||
// NormalizeValue(&v, "F/s", &s)
|
|
||||||
//
|
|
||||||
// if v != 104.00 {
|
|
||||||
// t.Errorf("Failed ConvertValue: Want 104.00, Got %f", v)
|
|
||||||
// }
|
|
||||||
// if s != "MF/s" {
|
|
||||||
// t.Errorf("Failed Prefix or unit: Want MF/s, Got %s", s)
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// func TestNormalizeValueKeep(t *testing.T) {
|
|
||||||
// var s string
|
|
||||||
// v := float64(345)
|
|
||||||
//
|
|
||||||
// NormalizeValue(&v, "MB/s", &s)
|
|
||||||
//
|
|
||||||
// if v != 345.00 {
|
|
||||||
// t.Errorf("Failed ConvertValue: Want 104.00, Got %f", v)
|
|
||||||
// }
|
|
||||||
// if s != "MB/s" {
|
|
||||||
// t.Errorf("Failed Prefix or unit: Want GB/s, Got %s", s)
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// func TestNormalizeValueDown(t *testing.T) {
|
|
||||||
// var s string
|
|
||||||
// v := float64(0.0004578)
|
|
||||||
//
|
|
||||||
// NormalizeValue(&v, "GB/s", &s)
|
|
||||||
//
|
|
||||||
// if v != 458.00 {
|
|
||||||
// t.Errorf("Failed ConvertValue: Want 458.00, Got %f", v)
|
|
||||||
// }
|
|
||||||
// if s != "KB/s" {
|
|
||||||
// t.Errorf("Failed Prefix or unit: Want KB/s, Got %s", s)
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// func TestNormalizeSeries(t *testing.T) {
|
|
||||||
// var us string
|
|
||||||
// s := []float64{2890031237, 23998994567, 389734042344, 390349424345}
|
|
||||||
// r := []float64{3, 24, 390, 391}
|
|
||||||
//
|
|
||||||
// total := 0.0
|
|
||||||
// for _, number := range s {
|
|
||||||
// total += number
|
|
||||||
// }
|
|
||||||
// avg := total / float64(len(s))
|
|
||||||
//
|
|
||||||
// fmt.Printf("AVG: %e\n", avg)
|
|
||||||
// NormalizeSeries(s, avg, "KB/s", &us)
|
|
||||||
//
|
|
||||||
// if !reflect.DeepEqual(s, r) {
|
|
||||||
// t.Errorf("Failed ConvertValue: Want 3, 24, 390, 391, Got %v", s)
|
|
||||||
// }
|
|
||||||
// if us != "TB/s" {
|
|
||||||
// t.Errorf("Failed Prefix or unit: Want TB/s, Got %s", us)
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
@ -17,7 +17,6 @@ import (
|
|||||||
"github.com/ClusterCockpit/cc-backend/internal/config"
|
"github.com/ClusterCockpit/cc-backend/internal/config"
|
||||||
"github.com/ClusterCockpit/cc-backend/pkg/log"
|
"github.com/ClusterCockpit/cc-backend/pkg/log"
|
||||||
"github.com/ClusterCockpit/cc-backend/pkg/schema"
|
"github.com/ClusterCockpit/cc-backend/pkg/schema"
|
||||||
"github.com/ClusterCockpit/cc-backend/pkg/units"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const Version = 1
|
const Version = 1
|
||||||
@ -35,6 +34,33 @@ func loadJobData(filename string) (*JobData, error) {
|
|||||||
return DecodeJobData(bufio.NewReader(f))
|
return DecodeJobData(bufio.NewReader(f))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func ConvertUnitString(us string) schema.Unit {
|
||||||
|
var nu schema.Unit
|
||||||
|
|
||||||
|
// if us == "CPI" ||
|
||||||
|
// us == "IPC" ||
|
||||||
|
// us == "load" ||
|
||||||
|
// us == "" {
|
||||||
|
// nu.Base = us
|
||||||
|
// return nu
|
||||||
|
// }
|
||||||
|
// u := ccunits.NewUnit(us)
|
||||||
|
// p := u.getPrefix()
|
||||||
|
// if p.Prefix() != "" {
|
||||||
|
// prefix := p.Prefix()
|
||||||
|
// nu.Prefix = &prefix
|
||||||
|
// }
|
||||||
|
// m := u.getMeasure()
|
||||||
|
// d := u.getUnitDenominator()
|
||||||
|
// if d.Short() != "inval" {
|
||||||
|
// nu.Base = fmt.Sprintf("%s/%s", m.Short(), d.Short())
|
||||||
|
// } else {
|
||||||
|
// nu.Base = m.Short()
|
||||||
|
// }
|
||||||
|
|
||||||
|
return nu
|
||||||
|
}
|
||||||
|
|
||||||
func deepCopyJobMeta(j *JobMeta) schema.JobMeta {
|
func deepCopyJobMeta(j *JobMeta) schema.JobMeta {
|
||||||
var jn schema.JobMeta
|
var jn schema.JobMeta
|
||||||
|
|
||||||
@ -78,7 +104,7 @@ func deepCopyJobMeta(j *JobMeta) schema.JobMeta {
|
|||||||
sn.Avg = v.Avg
|
sn.Avg = v.Avg
|
||||||
sn.Max = v.Max
|
sn.Max = v.Max
|
||||||
sn.Min = v.Min
|
sn.Min = v.Min
|
||||||
tmpUnit := units.ConvertUnitString(v.Unit)
|
tmpUnit := ConvertUnitString(v.Unit)
|
||||||
if tmpUnit.Base == "inval" {
|
if tmpUnit.Base == "inval" {
|
||||||
sn.Unit = schema.Unit{Base: ""}
|
sn.Unit = schema.Unit{Base: ""}
|
||||||
} else {
|
} else {
|
||||||
@ -113,7 +139,7 @@ func deepCopyJobData(d *JobData, cluster string, subCluster string) *schema.JobD
|
|||||||
for mk, mv := range v {
|
for mk, mv := range v {
|
||||||
// fmt.Printf("Scope %s\n", mk)
|
// fmt.Printf("Scope %s\n", mk)
|
||||||
var mn schema.JobMetric
|
var mn schema.JobMetric
|
||||||
tmpUnit := units.ConvertUnitString(mv.Unit)
|
tmpUnit := ConvertUnitString(mv.Unit)
|
||||||
if tmpUnit.Base == "inval" {
|
if tmpUnit.Base == "inval" {
|
||||||
mn.Unit = schema.Unit{Base: ""}
|
mn.Unit = schema.Unit{Base: ""}
|
||||||
} else {
|
} else {
|
||||||
@ -198,7 +224,7 @@ func deepCopyClusterConfig(co *Cluster) schema.Cluster {
|
|||||||
mcn.Aggregation = mco.Aggregation
|
mcn.Aggregation = mco.Aggregation
|
||||||
}
|
}
|
||||||
mcn.Timestep = mco.Timestep
|
mcn.Timestep = mco.Timestep
|
||||||
tmpUnit := units.ConvertUnitString(mco.Unit)
|
tmpUnit := ConvertUnitString(mco.Unit)
|
||||||
if tmpUnit.Base == "inval" {
|
if tmpUnit.Base == "inval" {
|
||||||
mcn.Unit = schema.Unit{Base: ""}
|
mcn.Unit = schema.Unit{Base: ""}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user