From d4362b63dae55a19ad3868ddf6c94d2ac23bb53b Mon Sep 17 00:00:00 2001 From: Nick Pang Date: Mon, 12 Aug 2024 15:26:00 +1000 Subject: [PATCH] Added Any under CPU vendors and updated cmd text. --- src/components/tool/guide/Config.js | 4 ++-- src/components/tool/guide/Instructions/StartInstructions.js | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/tool/guide/Config.js b/src/components/tool/guide/Config.js index 8f492f67..e919b707 100644 --- a/src/components/tool/guide/Config.js +++ b/src/components/tool/guide/Config.js @@ -78,9 +78,9 @@ export const getCpuVendor = (config, onChange) => () => { export const getCpuModel = (config, onChange) => () => { let cpuModels = []; if (config?.cpuVendor === "AMD") { - cpuModels = ["7702", "7713"]; + cpuModels = ["Any", "7702", "7713"]; } else if (config?.cpuVendor === "Intel") { - cpuModels = ["6140", "6248", "8260", "E7-8890v4"]; + cpuModels = ["Any", "6140", "6248", "8260", "E7-8890v4"]; } return { diff --git a/src/components/tool/guide/Instructions/StartInstructions.js b/src/components/tool/guide/Instructions/StartInstructions.js index a5e80218..923fa647 100644 --- a/src/components/tool/guide/Instructions/StartInstructions.js +++ b/src/components/tool/guide/Instructions/StartInstructions.js @@ -37,7 +37,10 @@ export function LyraStartInstructions({ `ncpus=${cpuCores}`, `mem=${ram}gb`, ]; - if (cpuVendor !== "Any" && cpuModel) resources.push(`cputype=${cpuModel}`); + if (cpuVendor !== "Any") { + if (cpuModel !== "Any") resources.push(`cputype=${cpuModel}`); + else resources.push(cpuVendor === "AMD" ? "cpuarch=amd" : "cpuarch=avx512"); + } if (hardware === "GPU") { resources.push(`ngpus=${gpuModules}`); if (gpuVendor !== "Any" && gpuModel) {