opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Determine server CPU info in JobMetrics component and add units to props

Browse Source 
- Users of the CarbonEmissions component should pass all necessary
  props
- Add explicit units to prop names
This commit is contained in:
Rendani Gangazhe
2023-06-02 10:08:17 -04:00
committed by Dannon Baker
parent dc1a24e4d4
commit bc150a63cf
2 changed files with 43 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/components/CarbonEmissions/CarbonEmissions.vue
+21 -23
View File
@@ -2,7 +2,6 @@
import BarChart from "./BarChart.vue";
import CarbonEmissionsCard from "./CarbonEmissionCard.vue";
import { computed } from "vue";
import cpuReferenceData from "./cpu_tdp.json";
import { faQuestionCircle } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
import Heading from "@/components/Common/Heading.vue";
@@ -14,43 +13,42 @@ library.add(faQuestionCircle);
export interface CarbonEmissionsProps {
estimatedServerInstance: {
name: string;
cpuModel: string[];
coreCount: number;
memory: number;
cpuInfo: {
modelName: string;
totalAvailableCores: number;
tdp: number;
}
};
jobRuntime: number;
jobRuntimeInSeconds: number;
coresAllocated: number;
memoryAllocated?: number;
memoryAllocatedInMebibyte?: number;
}
const props = withDefaults(defineProps<CarbonEmissionsProps>(), {
memoryAllocated: 0,
memoryAllocatedInMebibyte: 0,
});
const carbonEmissions = computed(() => {
const cpu = cpuReferenceData.find(({ cpuModel }) => props.estimatedServerInstance.cpuModel.includes(cpuModel));
if (!cpu) {
return;
}
const powerUsageEffectiveness = carbonEmissionsConstants.worldwidePowerUsageEffectiveness;
const memoryPowerUsed = carbonEmissionsConstants.memoryPowerUsage;
const runtime = props.jobRuntime / (60 * 60); // Convert to hours
const memoryAllocated = props.memoryAllocated / 1024; // Convert to gibibyte
const tdpPerCore = cpu.tdp / cpu.coreCount;
const normalizedTdpPerCore = tdpPerCore * props.coresAllocated;
const runtimeInHours = props.jobRuntimeInSeconds / (60 * 60); // Convert to hours
const memoryAllocatedInGibibyte = props.memoryAllocatedInMebibyte / 1024; // Convert to gibibyte
const cpuInfo = props.estimatedServerInstance.cpuInfo;
const tdpPerCore = cpuInfo.tdp / cpuInfo.totalAvailableCores;
const normalizedTdpPerCore = tdpPerCore * runtimeInHours;
// Power needed in Watt
const powerNeededCpu = powerUsageEffectiveness * normalizedTdpPerCore;
const powerNeededMemory = powerUsageEffectiveness * memoryAllocated * memoryPowerUsed;
const powerNeededMemory = powerUsageEffectiveness * memoryAllocatedInGibibyte * memoryPowerUsed;
const totalPowerNeeded = powerNeededCpu + powerNeededMemory;
// Energy needed. Convert kWh to kW
const energyNeededCPU = (runtime * powerNeededCpu) / 1000;
const energyNeededMemory = (runtime * powerNeededMemory) / 1000;
const totalEnergyNeeded = (runtime * totalPowerNeeded) / 1000;
const energyNeededCPU = (runtimeInHours * powerNeededCpu) / 1000;
const energyNeededMemory = (runtimeInHours * powerNeededMemory) / 1000;
const totalEnergyNeeded = (runtimeInHours * totalPowerNeeded) / 1000;
// Carbon emissions (carbonIntensity is in grams/kWh so emissions results are in grams of CO2)
// Carbon emissions (carbon intensity is in grams/kWh so emissions results are in grams of CO2)
const carbonIntensity = carbonEmissionsConstants.worldwideCarbonIntensity;
const cpuCarbonEmissions = energyNeededCPU * carbonIntensity;
const memoryCarbonEmissions = energyNeededMemory * carbonIntensity;
@@ -160,7 +158,7 @@ const carbonEmissionsComparisons = computed(() => {
});
const canShowMemory = computed(() => {
return props.memoryAllocated && props.memoryAllocated !== 0;
return props.memoryAllocatedInMebibyte && props.memoryAllocatedInMebibyte !== 0;
});
const barChartData = computed(() => {
@@ -320,7 +318,7 @@ function getEnergyNeededText(energyNeededInKiloWattHours: number) {
<td id="cpu-carbon-emissions">
{{ getCarbonEmissionsText(carbonEmissions.cpuCarbonEmissions) }}
</td>
<td id="cpu-energy-used">{{ getEnergyNeededText(carbonEmissions.energyNeededCPU) }}</td>
<td id="cpu-energy-usage">{{ getEnergyNeededText(carbonEmissions.energyNeededCPU) }}</td>
</tr>
<tr v-if="canShowMemory">
client/src/components/JobMetrics/JobMetrics.vue
+22 -12
View File
@@ -1,6 +1,7 @@
<script setup lang="ts">
import AwsEstimate from "./AwsEstimate.vue";
import CarbonEmissions from "@/components/CarbonEmissions/CarbonEmissions.vue";
import cpuReferenceData from "@/components/CarbonEmissions/cpu_tdp.json";
import ec2 from "./ec2.json";
import { useJobMetricsStore } from "@/stores/jobMetricsStore";
import { computed, unref } from "vue";
@@ -90,26 +91,35 @@ const estimatedServerInstance = computed(() => {
return;
}
let serverInstance: (typeof ec2)[number] | undefined;
const memory = unref(memoryAllocated);
const adjustedMemory = memory ? memory / 1024 : 0;
if (adjustedMemory === 0) {
serverInstance = ec2.find((ec) => ec.vcpus >= cores);
} else {
serverInstance = ec2.find((ec) => ec.mem >= adjustedMemory && ec.vcpus >= cores);
}
const serverInstance = ec2.find((ec) => {
if (adjustedMemory === 0) {
// Exclude memory from search criteria
return ec2.find((ec) => ec.vcpus >= cores);
}
// Search by all criteria
return ec.mem >= adjustedMemory && ec.vcpus >= cores
});
if (!serverInstance) {
return;
}
const cpu = cpuReferenceData.find(({ cpuModel }) => serverInstance.cpu.includes(cpuModel));
if (!cpu) {
return;
}
return {
name: serverInstance.name,
cpuModel: serverInstance.cpu,
coreCount: serverInstance.vcpus,
memory: serverInstance.mem,
cpuInfo: {
modelName: cpu.cpuModel,
totalAvailableCores: cpu.coreCount,
tdp: cpu.tdp
}
};
});
</script>
@@ -143,8 +153,8 @@ const estimatedServerInstance = computed(() => {
<CarbonEmissions
v-if="estimatedServerInstance && jobRuntime && coresAllocated"
:estimated-server-instance="estimatedServerInstance"
:job-runtime="jobRuntime"
:job-runtime-in-seconds="jobRuntime"
:cores-allocated="coresAllocated"
:memory-allocated="memoryAllocated" />
:memory-allocated-in-mebibyte="memoryAllocated" />
</div>
</template>