fix: ram units (#3730)

* fix: ram units * chore: adding changelog file 3730.fixed.md [dependabot-skip] --------- Co-authored-by: pyansys-ci-bot <[email protected]>
ansys · Feb 10, 2025 · 78a5ebc · 78a5ebc
1 parent e4e5ee2
commit 78a5ebc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/doc/changelog.d/3730.fixed.md b/doc/changelog.d/3730.fixed.md
@@ -0,0 +1 @@
+fix: ram units
diff --git a/src/ansys/mapdl/core/launcher.py b/src/ansys/mapdl/core/launcher.py
@@ -383,8 +383,8 @@ def generate_mapdl_launch_command(
     cpu_sw = "-np %d" % nproc
 
     if ram:
-        ram_sw = "-m %d" % int(1024 * ram)
-        LOG.debug(f"Setting RAM: {ram_sw}")
+        ram_sw = "-m %d" % int(ram)
+        LOG.debug(f"Setting RAM: {ram_sw} MB")
     else:
         ram_sw = ""
 
@@ -1990,7 +1990,7 @@ def get_value(
                 ram = SLURM_MEM_PER_NODE
 
             if not units:
-                args["ram"] = int(ram)
+                args["ram"] = int(ram)  # Assuming in MB
             elif units == "T":  # tera
                 args["ram"] = int(ram) * (2**10) ** 2
             elif units == "G":  # giga

diff --git a/tests/test_launcher.py b/tests/test_launcher.py
@@ -1002,7 +1002,7 @@ def test_generate_mapdl_launch_command_windows():
     jobname = "myjob"
     nproc = 10
     port = 1000
-    ram = 2
+    ram = 2024
     additional_switches = "-my_add=switch"
 
     cmd = generate_mapdl_launch_command(
@@ -1022,7 +1022,7 @@ def test_generate_mapdl_launch_command_windows():
     assert "-port" in cmd
     assert f"{port}" in cmd
     assert "-m" in cmd
-    assert f"{ram*1024}" in cmd
+    assert f"{ram}" in cmd
     assert "-np" in cmd
     assert f"{nproc}" in cmd
     assert "-grpc" in cmd
@@ -1037,7 +1037,7 @@ def test_generate_mapdl_launch_command_windows():
     assert f"{exec_file}" in cmd
     assert f" -j {jobname} " in cmd
     assert f" -port {port} " in cmd
-    assert f" -m {ram*1024} " in cmd
+    assert f" -m {ram} " in cmd
     assert f" -np {nproc} " in cmd
     assert " -grpc" in cmd
     assert f" {additional_switches} " in cmd
@@ -1053,7 +1053,7 @@ def test_generate_mapdl_launch_command_linux():
     jobname = "myjob"
     nproc = 10
     port = 1000
-    ram = 2
+    ram = 2024
     additional_switches = "-my_add=switch"
 
     cmd = generate_mapdl_launch_command(
@@ -1075,7 +1075,7 @@ def test_generate_mapdl_launch_command_linux():
     assert "-port" in cmd
     assert f"{port}" in cmd
     assert "-m" in cmd
-    assert f"{ram*1024}" in cmd
+    assert f"{ram}" in cmd
     assert "-np" in cmd
     assert f"{nproc}" in cmd
     assert "-grpc" in cmd
@@ -1091,7 +1091,7 @@ def test_generate_mapdl_launch_command_linux():
     assert f"{exec_file} " in cmd
     assert f" -j {jobname} " in cmd
     assert f" -port {port} " in cmd
-    assert f" -m {ram*1024} " in cmd
+    assert f" -m {ram} " in cmd
     assert f" -np {nproc} " in cmd
     assert " -grpc" in cmd
     assert f" {additional_switches} " in cmd