Skip to content

Commit

Permalink
Merge branch 'main' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@da-ekchajzer
da-ekchajzer committed Feb 28, 2024
2 parents e78cf96 + c973a48 commit 191263b
Show file tree
Hide file tree
Showing 14 changed files with 2,273 additions and 909 deletions.
2 changes: 1 addition & 1 deletion boaviztapi/dto/consumption_profile/consumption_profile.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def mapper_cp_cpu(cp_dto: ConsumptionProfileCPU) -> Tuple[CPUConsumptionProfileM
manufacturer, model_range, family = None, None, None

if cp_dto.cpu.name is not None:
name, manufacturer, family, model_range, tdp, cores, total_die_size, total_die_size_source, source = attributes_from_cpu_name(cp_dto.cpu.name)
name, manufacturer, family, model_range, tdp, cores, threads, die_size, die_size_source, source = attributes_from_cpu_name(cp_dto.cpu.name)

if cp_dto.cpu.manufacturer is not None:
cpu.manufacturer.set_input(cp_dto.cpu.manufacturer)
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/contributing/cloud_instance.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ The `platform` field must match one of the `id` of the available server archetyp

### Value ranges

Some values can be inputted using ranges like the following: `default;min;max`. For example, if the value is `default;2;8`, it means that the default value is `2` and the range is from `2` to `8`. If the value is `2;1;4`, it means that the default value is `2` and the range is from `1` to `2`.
Some values can be inputted using ranges like the following: `default;min;max`. For example, if the value is `2;1;8`, it means that the default value is `2` and the range is from `1` to `8`.
22 changes: 12 additions & 10 deletions docs/docs/contributing/server.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ All available servers are stored in a CSV file named `servers.csv` located at `b
| manufacturer | | | Server manufacturer | |
| case_type | **Required** | | Server case type | rack |
| CPU.units | **Required** | unit | Number of CPU | 2 |
| CPU.name | | | CPU name | |
| CPU.name [^1] | | | CPU name | |
| CPU.core_units | | unit | Number of CPU cores per CPU | 24 |
| CPU.die_size_per_core | | mm² | Die size per CPU core | 8 |
| CPU.threads | | unit | Number of vCPU per CPU | 32 |
| CPU.vcpu | | unit | Number of vCPU per CPU | 32 |
| RAM.units | **Required** | unit | Number of RAM | 1 |
| RAM.capacity | | GB | RAM quantity | 1000 |
| SSD.units | **Required** | unit | Number of SSD | 0 |
Expand All @@ -25,20 +25,22 @@ All available servers are stored in a CSV file named `servers.csv` located at `b
| GPU.units | **Required** | unit | GPU quantity (not supported yet) | 0 |
| GPU.name | | | GPU name | |
| GPU.memory_capacity | | GB | GPU memory capacity | |
| POWER_SUPPLY.units | **Required** | unit | Number of power supply[^1] | 2 |
| POWER_SUPPLY.unit_weight | **Required** | kg | Power supply weight[^1] | 2.99;1;5 |
| USAGE.time_workload | **Required** | % | Time workload [^2] | 50;0;100 |
| USAGE.use_time_ratio | **Required** | /1 | Use time ratio[^3] | 1 |
| POWER_SUPPLY.units | **Required** | unit | Number of power supply[^2] | 2 |
| POWER_SUPPLY.unit_weight | **Required** | kg | Power supply weight[^2] | 2.99;1;5 |
| USAGE.time_workload | **Required** | % | Time workload [^3] | 50;0;100 |
| USAGE.use_time_ratio | **Required** | /1 | Use time ratio[^4] | 1 |
| USAGE.hours_life_time | **Required** | hours | Hours life time | 35040 |
| USAGE.other_consumption_ratio | **Required** | /1 | Other consumption ratio | 0.33 |
| WARNINGS | | | Warnings | |

[^1]: (Usually power supply duplicated so POWER_SUPPLY.units = 2. Usually POWER_SUPPLY.unit_weight is unknown, in that case use a range such as 2.99;1;5)
[^1]: If CPU.name is set and the CPU is available in [cpu_specs.csv](./cpu.md), you do not need to fill in the other CPU attributes. The API will complete them based on the CPU.name.

[^2]: (Should be a range between 0 and 100 (50;0;100) without valid justification)
[^2]: (Usually power supply duplicated so POWER_SUPPLY.units = 2. Usually POWER_SUPPLY.unit_weight is unknown, in that case use a range such as 2.99;1;5)

[^3]: (Should be 100% without valid justification so USAGE.use_time_ratio = 1)
[^3]: (Should be a range between 0 and 100 (50;0;100) without valid justification)

[^4]: (Should be 100% without valid justification so USAGE.use_time_ratio = 1)

### Value ranges

Some values can be inputted using ranges like the following: `default;min;max`. For example, if the value is `4;2;8`, it means that the default value is `4` and the range is from `2` to `8`.
Some values can be inputted using ranges like the following: `default;min;max`. For example, if the value is `4;2;8`, it means that the default value is `4` and the range is from `2` to `8`.
16 changes: 8 additions & 8 deletions docs/docs/getting_started/consumption_profile.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ The API will select the average xeon gold consumption profile and adapt it with

```json
{
"a": 35.5688,
"b": 0.2438,
"c": 9.6694,
"d": -0.6087
"a": 35.5688,
"b": 0.2438,
"c": 9.6694,
"d": -0.6087
}
```

Expand Down Expand Up @@ -81,10 +81,10 @@ The API will select the average xeon gold consumption profile and adapt it to ma

```json
{
"a": 88.92199999999995,
"b": 0.13034943934208817,
"c": 13.521235682053703,
"d": -0.6456240344253034
"a": 105.9490625645529,
"b": 0.08276489427342926,
"c": 19.892145752325938,
"d": -0.7237683566860724
}
```

Expand Down
Loading

0 comments on commit 191263b

Please sign in to comment.