Skip to content

Commit 78a5ebc

Browse files
fix: ram units (#3730)
* fix: ram units * chore: adding changelog file 3730.fixed.md [dependabot-skip] --------- Co-authored-by: pyansys-ci-bot <[email protected]>
1 parent e4e5ee2 commit 78a5ebc

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

doc/changelog.d/3730.fixed.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fix: ram units

src/ansys/mapdl/core/launcher.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,8 @@ def generate_mapdl_launch_command(
383383
cpu_sw = "-np %d" % nproc
384384

385385
if ram:
386-
ram_sw = "-m %d" % int(1024 * ram)
387-
LOG.debug(f"Setting RAM: {ram_sw}")
386+
ram_sw = "-m %d" % int(ram)
387+
LOG.debug(f"Setting RAM: {ram_sw} MB")
388388
else:
389389
ram_sw = ""
390390

@@ -1990,7 +1990,7 @@ def get_value(
19901990
ram = SLURM_MEM_PER_NODE
19911991

19921992
if not units:
1993-
args["ram"] = int(ram)
1993+
args["ram"] = int(ram) # Assuming in MB
19941994
elif units == "T": # tera
19951995
args["ram"] = int(ram) * (2**10) ** 2
19961996
elif units == "G": # giga

tests/test_launcher.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,7 +1002,7 @@ def test_generate_mapdl_launch_command_windows():
10021002
jobname = "myjob"
10031003
nproc = 10
10041004
port = 1000
1005-
ram = 2
1005+
ram = 2024
10061006
additional_switches = "-my_add=switch"
10071007

10081008
cmd = generate_mapdl_launch_command(
@@ -1022,7 +1022,7 @@ def test_generate_mapdl_launch_command_windows():
10221022
assert "-port" in cmd
10231023
assert f"{port}" in cmd
10241024
assert "-m" in cmd
1025-
assert f"{ram*1024}" in cmd
1025+
assert f"{ram}" in cmd
10261026
assert "-np" in cmd
10271027
assert f"{nproc}" in cmd
10281028
assert "-grpc" in cmd
@@ -1037,7 +1037,7 @@ def test_generate_mapdl_launch_command_windows():
10371037
assert f"{exec_file}" in cmd
10381038
assert f" -j {jobname} " in cmd
10391039
assert f" -port {port} " in cmd
1040-
assert f" -m {ram*1024} " in cmd
1040+
assert f" -m {ram} " in cmd
10411041
assert f" -np {nproc} " in cmd
10421042
assert " -grpc" in cmd
10431043
assert f" {additional_switches} " in cmd
@@ -1053,7 +1053,7 @@ def test_generate_mapdl_launch_command_linux():
10531053
jobname = "myjob"
10541054
nproc = 10
10551055
port = 1000
1056-
ram = 2
1056+
ram = 2024
10571057
additional_switches = "-my_add=switch"
10581058

10591059
cmd = generate_mapdl_launch_command(
@@ -1075,7 +1075,7 @@ def test_generate_mapdl_launch_command_linux():
10751075
assert "-port" in cmd
10761076
assert f"{port}" in cmd
10771077
assert "-m" in cmd
1078-
assert f"{ram*1024}" in cmd
1078+
assert f"{ram}" in cmd
10791079
assert "-np" in cmd
10801080
assert f"{nproc}" in cmd
10811081
assert "-grpc" in cmd
@@ -1091,7 +1091,7 @@ def test_generate_mapdl_launch_command_linux():
10911091
assert f"{exec_file} " in cmd
10921092
assert f" -j {jobname} " in cmd
10931093
assert f" -port {port} " in cmd
1094-
assert f" -m {ram*1024} " in cmd
1094+
assert f" -m {ram} " in cmd
10951095
assert f" -np {nproc} " in cmd
10961096
assert " -grpc" in cmd
10971097
assert f" {additional_switches} " in cmd

0 commit comments

Comments
 (0)