Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correct env var name for getting gpu index #19

Merged
merged 2 commits into from
Dec 28, 2023
Merged

Correct env var name for getting gpu index #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cf9264
fix: Correct env var name for getting gpu index
mahendrapaipuri Dec 28, 2023
9af6cbb
style: Fix formatting
mahendrapaipuri Dec 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 16 additions & 37 deletions pkg/collector/nvidia_gpus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ import (
const nvidiaGpuJobMapCollectorSubsystem = "nvidia_gpu"

var (
jobMapLock = sync.RWMutex{}
jobMapLock = sync.RWMutex{}
nvidiaSmiPath = BatchJobExporterApp.Flag(
"collector.nvidia.smi.path",
"Absolute path to nvidia-smi executable.",
).Default("/usr/bin/nvidia-smi").String()
gpuStatPath = BatchJobExporterApp.Flag(
"collector.nvidia.gpu.job.map.path",
"Path to file that maps GPU ordinals to job IDs.",
Expand Down Expand Up @@ -62,8 +66,15 @@ func init() {
//
// NOTE: Hoping this command returns MIG devices too
func getAllDevices(logger log.Logger) ([]Device, error) {
// Check if nvidia-smi binary exists
if _, err := os.Stat(*nvidiaSmiPath); err != nil {
level.Error(logger).Log("msg", "Failed to open nvidia-smi executable", "path", *nvidiaSmiPath, "err", err)
return nil, err
}

// Execute nvidia-smi command to get available GPUs
args := []string{"--query-gpu=index,name,uuid", "--format=csv"}
nvidiaSmiOutput, err := helpers.Execute("nvidia-smi", args, logger)
nvidiaSmiOutput, err := helpers.Execute(*nvidiaSmiPath, args, logger)
if err != nil {
level.Error(logger).
Log("msg", "nvidia-smi command to get list of devices failed", "err", err)
Expand All @@ -73,8 +84,8 @@ func getAllDevices(logger log.Logger) ([]Device, error) {
// Get all devices
allDevices := []Device{}
for _, line := range strings.Split(string(nvidiaSmiOutput), "\n") {
// Header line
if strings.HasPrefix(line, "index") {
// Header line, empty line and newlines are ignored
if line == "" || line == "\n" || strings.HasPrefix(line, "index") {
continue
}

Expand Down Expand Up @@ -196,7 +207,7 @@ func (c *nvidiaGpuJobMapCollector) getJobId() (map[string]float64, error) {
// and SLURM_JOB_ID
for _, env := range environments {
// Check both SLURM_SETP_GPUS and SLURM_JOB_GPUS vars
if strings.Contains(env, "SLURM_STEP_GPUS") || strings.Contains(env, "SLURM_JOBS_GPUS") {
if strings.Contains(env, "SLURM_STEP_GPUS") || strings.Contains(env, "SLURM_JOB_GPUS") {
gpuIndices = strings.Split(strings.Split(env, "=")[1], ",")
}
if strings.Contains(env, "SLURM_JOB_ID") {
Expand All @@ -219,38 +230,6 @@ func (c *nvidiaGpuJobMapCollector) getJobId() (map[string]float64, error) {
wg.Done()

}(proc)
// environments, err := proc.Environ()
// if err != nil {
// continue
// }

// var gpuIndices []string
// var slurmJobId string = ""

// // Loop through all env vars and get SLURM_SETP_GPUS/SLURM_JOB_GPUS
// // and SLURM_JOB_ID
// for _, env := range environments {
// // Check both SLURM_SETP_GPUS and SLURM_JOB_GPUS vars and only when
// // gpuIndices is empty.
// // We dont want an empty env var to override already populated
// // gpuIndices slice
// if (strings.Contains(env, "SLURM_STEP_GPUS") || strings.Contains(env, "SLURM_JOBS_GPUS")) && len(gpuIndices) == 0 {
// gpuIndices = strings.Split(strings.Split(env, "=")[1], ",")
// }
// if strings.Contains(env, "SLURM_JOB_ID") {
// slurmJobId = strings.Split(env, "=")[1]
// }
// }

// // If gpuIndices has current GPU index, assign the jobID and break loop
// if slices.Contains(gpuIndices, dev.index) {
// jid, err := strconv.Atoi(slurmJobId)
// if err != nil {
// gpuJobMapper[dev.uuid] = float64(0)
// }
// gpuJobMapper[dev.uuid] = float64(jid)
// goto outside
// }
}

// Wait for all go routines
Expand Down
3 changes: 2 additions & 1 deletion scripts/e2e-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,14 @@ then
exit 1
fi

PATH=$PWD/pkg/collector/fixtures:$PATH ./bin/batchjob_exporter \
./bin/batchjob_exporter \
--path.sysfs="pkg/collector/fixtures/sys" \
--path.cgroupfs="pkg/collector/fixtures/sys/fs/cgroup" \
--collector.slurm.create.unique.jobids \
--collector.slurm.job.props.path="pkg/collector/fixtures/slurmjobprops" \
--collector.ipmi.dcmi.cmd="pkg/collector/fixtures/ipmi-dcmi-wrapper.sh" \
--collector.nvidia_gpu \
--collector.nvidia.smi.path="pkg/collector/fixtures/nvidia-smi" \
--collector.nvidia.gpu.job.map.path="pkg/collector/fixtures/gpujobmap" \
--web.listen-address "127.0.0.1:${port}" \
--log.level="debug" > "${logfile}" 2>&1 &
Expand Down