rbx.cp 0.5.14__tar.gz → 0.5.15__tar.gz

{rbx_cp-0.5.14 → rbx_cp-0.5.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rbx.cp
-Version: 0.5.14
+Version: 0.5.15
 Summary: 
 Author: Roberto Sales
 Requires-Python: >=3.9,<4.0

{rbx_cp-0.5.14 → rbx_cp-0.5.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "rbx.cp"
-version = "0.5.14"
+version = "0.5.15"
 description = ""
 packages = [
   {include = "rbx"}

{rbx_cp-0.5.14 → rbx_cp-0.5.15}/rbx/box/generators.py

@@ -116,8 +116,8 @@ def generate_output_for_testcase(
 
     timelimit = pkg.timelimit_for_language(main_solution.language)
     sandbox = EnvironmentSandbox()
-    sandbox.timeLimit = timelimit * 2
-    sandbox.wallTimeLimit = timelimit * 2
+    sandbox.timeLimit = timelimit * 3
+    sandbox.wallTimeLimit = timelimit * 3
     sandbox.memoryLimit = pkg.memorylimit_for_language(main_solution.language)
     sandbox.fileSizeLimit = pkg.outputLimit
     extra_config = ExecutionConfig(sandbox=sandbox)
@@ -146,9 +146,6 @@ def generate_output_for_testcase(
         if run_log is not None:
             console.console.print(f'[error]Summary:[/error] {run_log.get_summary()}')
             checker_result = checkers.check_with_no_output(run_log)
-            console.console.print(
-                f'[warning]Time: [item]{run_log.time:.2f}s[/item][/warning]',
-            )
             console.console.print(
                 f'[warning]Verdict: [item]{checker_result.outcome.value}[/item][/warning]',
             )

{rbx_cp-0.5.14 → rbx_cp-0.5.15}/rbx/box/packaging/polygon/packager.py

@@ -106,8 +106,8 @@ class PolygonPackager(BasePackager):
 
         return polygon_schema.Testset(
             name='tests',
-            timelimit=pkg.timeLimit,
-            memorylimit=pkg.memoryLimit * 1024 * 1024,
+            timelimit=pkg.timelimit_for_language(None),
+            memorylimit=pkg.memorylimit_for_language(None) * 1024 * 1024,
             size=len(testcases),
             inputPattern='tests/%03d',
             answerPattern='tests/%03d.a',

{rbx_cp-0.5.14 → rbx_cp-0.5.15}/rbx/box/schema.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import os
 import pathlib
 from typing import Dict, List, Optional, Union
 
@@ -350,15 +351,14 @@ that is correct and used as reference -- and should have the `accepted` outcome.
 
     def timelimit_for_language(self, language: Optional[str]) -> int:
         res = self.timeLimit
-        if language is None:
-            return res
-        if language not in self.modifiers:
-            return res
-        modifier = self.modifiers[language]
-        if modifier.time is not None:
-            return modifier.time
-        if modifier.timeMultiplier is not None:
-            return int(res * float(modifier.timeMultiplier))
+        if language is not None and language in self.modifiers:
+            modifier = self.modifiers[language]
+            if modifier.time is not None:
+                res = modifier.time
+            if modifier.timeMultiplier is not None:
+                res = int(res * float(modifier.timeMultiplier))
+        if 'RBX_TIME_MULTIPLIER' in os.environ:
+            res = int(res * float(os.environ['RBX_TIME_MULTIPLIER']))
         return res
 
     def memorylimit_for_language(self, language: Optional[str]) -> int:

{rbx_cp-0.5.14 → rbx_cp-0.5.15}/rbx/box/solutions.py

@@ -491,14 +491,24 @@ def _get_evals_memory_in_mb(evals: List[Evaluation]) -> int:
     return max(int(eval.log.memory or 0) // (1024 * 1024) for eval in evals)
 
 
+def _get_evals_memory_in_bytes(evals: List[Evaluation]) -> int:
+    if not evals:
+        return 0
+    return max(int(eval.log.memory or 0) for eval in evals)
+
+
 def get_evals_formatted_time(evals: List[Evaluation]) -> str:
     max_time = _get_evals_time_in_ms(evals)
     return f'{max_time} ms'
 
 
 def get_evals_formatted_memory(evals: List[Evaluation]) -> str:
-    max_memory = _get_evals_memory_in_mb(evals)
-    return f'{max_memory} MiB'
+    max_memory = _get_evals_memory_in_bytes(evals)
+    if max_memory < 1024 * 1024:
+        if max_memory < 1024:
+            return f'{max_memory} B'
+        return f'{max_memory // 1024} KiB'
+    return f'{max_memory // (1024 * 1024)} MiB'
 
 
 def _print_solution_outcome(

{rbx_cp-0.5.14 → rbx_cp-0.5.15}/rbx/grading/judge/sandboxes/timeit.py

@@ -5,7 +5,6 @@ import resource
 import signal
 import stat
 import sys
-from math import ceil
 from time import monotonic
 from typing import List, Optional
 
@@ -58,8 +57,9 @@ def parse_opts() -> Options:
 
 
 def get_memory_usage(ru: resource.struct_rusage) -> int:
-    used = ceil((ru.ru_maxrss + ru.ru_ixrss + ru.ru_idrss + ru.ru_isrss) / 1024)
-    return used
+    if sys.platform == 'darwin':
+        return ru.ru_maxrss // 1024 + ru.ru_ixrss
+    return ru.ru_maxrss + ru.ru_ixrss + ru.ru_idrss + ru.ru_isrss
 
 
 def get_cpu_time(ru: resource.struct_rusage) -> float: