Skip to content

Ensure load_machines returns MachineList in all cases #864

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

Merged
dnwillia-work merged 1 commit into from
Sep 9, 2022
Merged

Ensure load_machines returns MachineList in all cases #864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions src/ansys/fluent/core/scheduler/load_machines.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@
import csv
import os
import subprocess
from typing import Dict, List

from ansys.fluent.core.scheduler.machine_list import Machine, MachineList


def load_machines(machine_info=None, host_info=None, ncores=None):
def load_machines(
machine_info: List[Dict[str, int]] = None, host_info: str = None, ncores: int = None
) -> MachineList:
"""Provide a function to construct a machine list from allocated machines.

Parameters
Expand Down Expand Up @@ -54,7 +57,7 @@ def load_machines(machine_info=None, host_info=None, ncores=None):
names using scontrol.
"""

machine_list = []
machine_list = MachineList()

if machine_info:
machine_list = _construct_machine_list_manual(machine_info)
Expand Down Expand Up @@ -95,8 +98,10 @@ def load_machines(machine_info=None, host_info=None, ncores=None):
machine_list = _construct_machine_list_ccs(hostList)
elif ncores:
machine_list = _get_local_machine(ncores)
elif ncores is None:
machine_list = _get_local_machine(1)

if machine_list and ncores:
if ncores is not None and machine_list.number_of_cores != ncores:
# If both machine list and number of cores are provided, edit the
# machine list to use exactly the number of cores indicated.
machine_list = _restrict_machines_to_core_count(machine_list, ncores)
Expand Down
12 changes: 12 additions & 0 deletions tests/test_scheduler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"""
from builtins import range
import os
import socket
import unittest

from ansys.fluent.core.scheduler import build_parallel_options
Expand Down Expand Up @@ -155,6 +156,16 @@ def setUp(self):
def tearDown(self):
self._machineList.reset()

def test_no_environment(self):
machineList = load_machines()
self.assertEqual(machineList[0].host_name, socket.gethostname())
self.assertEqual(machineList.number_of_cores, 1)

def test_no_environment_cores(self):
machineList = load_machines(ncores=4)
self.assertEqual(machineList[0].host_name, socket.gethostname())
self.assertEqual(machineList.number_of_cores, 4)

def test_constrain_machines1(self):
machineList = load_machines(host_info="M0:2,M1:3,M2:2", ncores=4)
expectedValue = {"M0": 1, "M1": 2, "M2": 1}
Expand Down Expand Up @@ -209,6 +220,7 @@ def test_winhpc(self):
self.assertEqual(machineList.machines[2].host_name, "M2")
fluentOpts = build_parallel_options(machineList)
self.assertEqual(fluentOpts, "-t32 -cnf=M0:8,M1:8,M2:16")
del os.environ["CCP_NODES"]

def test_slurm_no_brackets(self):
os.environ["SLURM_JOB_NODELIST"] = "M0,M1,M2"
Expand Down