sinol-make 1.7.0.dev1__tar.gz → 1.8.0__tar.gz

{sinol_make-1.7.0.dev1/src/sinol_make.egg-info → sinol_make-1.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sinol_make
-Version: 1.7.0.dev1
+Version: 1.8.0
 Summary: CLI tool for creating sio2 task packages
 Author: Mateusz Masiarz
 Author-email: m.masiarz@fri.edu.pl
@@ -45,6 +45,7 @@ with features such as:
 - [Why?](#why)
 - [Installation](#installation)
 - [Usage](#usage)
+- [Contest types](#contest-types)
 - [Reporting bugs and contributing code](#reporting-bugs-and-contributing-code)
 
 ### Why?
@@ -57,7 +58,7 @@ they lack some built-in mechanisms for verifying packages and finding mistakes
 before uploading the package to the judge system.
 As sinol-make was created specifically for the sio2 problem packages,
 by default it downloads and uses sio2's deterministic mechanism of measuring
-solutions' runtime, called `oiejq`.
+solutions' runtime, called `sio2jail`.
 
 ### Installation
 
@@ -72,7 +73,7 @@ pip3 install sinol-make
 so make sure this directory is in your `PATH`.
 [Here's](https://gist.github.com/nex3/c395b2f8fd4b02068be37c961301caa7) how to add a directory to `PATH`.
 
-As `oiejq` works only on Linux-based operating systems,
+As `sio2jail` works only on Linux-based operating systems,
 *we do not recommend* using operating systems such as Windows or macOS.
 Nevertheless `sinol-make` supports those operating systems,
 though there are additional installation steps required to use
@@ -93,11 +94,11 @@ activate-global-python-argcomplete
 
 ### Usage
 
-The availabe commands (see `sinol-make --help`) are:
+The available commands (see `sinol-make --help`) are:
 
 - `sinol-make run` -- Runs selected solutions (by default all solutions) on selected tests (by default all tests) with a given number
-of CPUs. Measures the solutions' time with oiejq, unless specified otherwise. After running the solutions, it
-compares the solutions' scores with the ones saved in config.yml. If you're using oiejq, make sure you are not running on efficiency
+of CPUs. Measures the solutions' time with sio2jail, unless specified otherwise. After running the solutions, it
+compares the solutions' scores with the ones saved in config.yml. If you're using sio2jail, make sure you are not running on efficiency
 cpu cores. You can check if you have them [like this](https://stackoverflow.com/a/71282744). To run on normal cpu cores, use
 `taskset -c 8-15 sinol-make ...`, assuming that cpu cores 8-15 are not efficiency cores.
 Run `sinol-make run --help` to see available flags.
@@ -116,6 +117,8 @@ program to use, what tests to check and how many CPUs to use. Run `sinol-make in
 - `sinol-make verify` -- Verifies the package. This command runs stress tests (if available), verifies the config,
 generates tests, generates problem statements, runs inwer and run all solutions. Ingen and inwer are compiled with
 address and UB sanitizers. Run `sinol-make verify --help` to see all available flags.
+- `sinol-make chkwer` -- Run checker with model solution and print results. Prints a table with points and checker's comments.
+This command fails if the model solution didn't score maximum points. Run `sinol-make chkwer --help` to see all available flags.
 - `sinol-make init [id]` -- Creates package from template [on github](https://github.com/sio2project/sinol-make/tree/main/example_package) and sets task id to provided `[id]`. Requires an internet connection to run.
 
 You can also run multiple commands at once, for example:
@@ -124,6 +127,32 @@ You can also run multiple commands at once, for example:
 sinol-make gen prog/abcingen2.cpp inwer --cpus 4 run --tests abc1*.in doc export --no-statement
 ```
 
+There are also available short aliases for the commands:
+- `sinol-make r` for `sinol-make run`
+- `sinol-make g` for `sinol-make gen`
+- `sinol-make i` for `sinol-make inwer`
+- `sinol-make e` for `sinol-make export`
+- `sinol-make d` for `sinol-make doc`
+- `sinol-make v` for `sinol-make verify`
+- `sinol-make c` for `sinol-make chkwer`
+- `sm` for `sinol-make`
+
+### Contest types
+
+`sinol-make` changes its behavior depending on the contest type specified in `config.yml`. You can specify
+the contest type with the `sinol_contest_type` key in config. Here is the table of available contest types and their
+features:
+
+| Feature                                                                                             | `default` | `oi`     | `oij`    | `icpc` |
+|-----------------------------------------------------------------------------------------------------|-----------|----------|----------|--------|
+| Max score                                                                                           | 100       | 100      | 100      | 1      |
+| Default time tool                                                                                   | sio2jail  | sio2jail | sio2jail | time   |
+| Full score if took less than half of the time limit, <br/>otherwise linearly decreasing to 1.       | ❌         | ✔️       | ❌        | ❌      |
+| Full score if took less than the time limit                                                         | ✔️        | ❌        | ✔️       | ✔️     |
+| Scores must sum up to 100                                                                           | ❌         | ✔️       | ✔️       | ❌      |
+| Limits can be set for individual tests                                                              | ✔️        | ❌        | ✔️       | ✔️     |
+| Verifies if tests are named correctly<br/> (letters within groups increase, group numbers increase) | ❌         | ✔️       | ✔️       | ✔️     |
+
 ### Reporting bugs and contributing code
 
 - Want to report a bug or request a feature? [Open an issue](https://github.com/sio2project/sinol-make/issues).

{sinol_make-1.7.0.dev1 → sinol_make-1.8.0}/README.md

@@ -15,6 +15,7 @@ with features such as:
 - [Why?](#why)
 - [Installation](#installation)
 - [Usage](#usage)
+- [Contest types](#contest-types)
 - [Reporting bugs and contributing code](#reporting-bugs-and-contributing-code)
 
 ### Why?
@@ -27,7 +28,7 @@ they lack some built-in mechanisms for verifying packages and finding mistakes
 before uploading the package to the judge system.
 As sinol-make was created specifically for the sio2 problem packages,
 by default it downloads and uses sio2's deterministic mechanism of measuring
-solutions' runtime, called `oiejq`.
+solutions' runtime, called `sio2jail`.
 
 ### Installation
 
@@ -42,7 +43,7 @@ pip3 install sinol-make
 so make sure this directory is in your `PATH`.
 [Here's](https://gist.github.com/nex3/c395b2f8fd4b02068be37c961301caa7) how to add a directory to `PATH`.
 
-As `oiejq` works only on Linux-based operating systems,
+As `sio2jail` works only on Linux-based operating systems,
 *we do not recommend* using operating systems such as Windows or macOS.
 Nevertheless `sinol-make` supports those operating systems,
 though there are additional installation steps required to use
@@ -63,11 +64,11 @@ activate-global-python-argcomplete
 
 ### Usage
 
-The availabe commands (see `sinol-make --help`) are:
+The available commands (see `sinol-make --help`) are:
 
 - `sinol-make run` -- Runs selected solutions (by default all solutions) on selected tests (by default all tests) with a given number
-of CPUs. Measures the solutions' time with oiejq, unless specified otherwise. After running the solutions, it
-compares the solutions' scores with the ones saved in config.yml. If you're using oiejq, make sure you are not running on efficiency
+of CPUs. Measures the solutions' time with sio2jail, unless specified otherwise. After running the solutions, it
+compares the solutions' scores with the ones saved in config.yml. If you're using sio2jail, make sure you are not running on efficiency
 cpu cores. You can check if you have them [like this](https://stackoverflow.com/a/71282744). To run on normal cpu cores, use
 `taskset -c 8-15 sinol-make ...`, assuming that cpu cores 8-15 are not efficiency cores.
 Run `sinol-make run --help` to see available flags.
@@ -86,6 +87,8 @@ program to use, what tests to check and how many CPUs to use. Run `sinol-make in
 - `sinol-make verify` -- Verifies the package. This command runs stress tests (if available), verifies the config,
 generates tests, generates problem statements, runs inwer and run all solutions. Ingen and inwer are compiled with
 address and UB sanitizers. Run `sinol-make verify --help` to see all available flags.
+- `sinol-make chkwer` -- Run checker with model solution and print results. Prints a table with points and checker's comments.
+This command fails if the model solution didn't score maximum points. Run `sinol-make chkwer --help` to see all available flags.
 - `sinol-make init [id]` -- Creates package from template [on github](https://github.com/sio2project/sinol-make/tree/main/example_package) and sets task id to provided `[id]`. Requires an internet connection to run.
 
 You can also run multiple commands at once, for example:
@@ -94,6 +97,32 @@ You can also run multiple commands at once, for example:
 sinol-make gen prog/abcingen2.cpp inwer --cpus 4 run --tests abc1*.in doc export --no-statement
 ```
 
+There are also available short aliases for the commands:
+- `sinol-make r` for `sinol-make run`
+- `sinol-make g` for `sinol-make gen`
+- `sinol-make i` for `sinol-make inwer`
+- `sinol-make e` for `sinol-make export`
+- `sinol-make d` for `sinol-make doc`
+- `sinol-make v` for `sinol-make verify`
+- `sinol-make c` for `sinol-make chkwer`
+- `sm` for `sinol-make`
+
+### Contest types
+
+`sinol-make` changes its behavior depending on the contest type specified in `config.yml`. You can specify
+the contest type with the `sinol_contest_type` key in config. Here is the table of available contest types and their
+features:
+
+| Feature                                                                                             | `default` | `oi`     | `oij`    | `icpc` |
+|-----------------------------------------------------------------------------------------------------|-----------|----------|----------|--------|
+| Max score                                                                                           | 100       | 100      | 100      | 1      |
+| Default time tool                                                                                   | sio2jail  | sio2jail | sio2jail | time   |
+| Full score if took less than half of the time limit, <br/>otherwise linearly decreasing to 1.       | ❌         | ✔️       | ❌        | ❌      |
+| Full score if took less than the time limit                                                         | ✔️        | ❌        | ✔️       | ✔️     |
+| Scores must sum up to 100                                                                           | ❌         | ✔️       | ✔️       | ❌      |
+| Limits can be set for individual tests                                                              | ✔️        | ❌        | ✔️       | ✔️     |
+| Verifies if tests are named correctly<br/> (letters within groups increase, group numbers increase) | ❌         | ✔️       | ✔️       | ✔️     |
+
 ### Reporting bugs and contributing code
 
 - Want to report a bug or request a feature? [Open an issue](https://github.com/sio2project/sinol-make/issues).

{sinol_make-1.7.0.dev1 → sinol_make-1.8.0}/setup.cfg

@@ -51,7 +51,7 @@ testpaths =
 	tests
 markers = 
 	github_runner: Mark tests that require GitHub runner
-	oiejq: Mark tests that require working oiejq
+	sio2jail: Mark tests that require working sio2jail
 
 [egg_info]
 tag_build = 

{sinol_make-1.7.0.dev1 → sinol_make-1.8.0}/src/sinol_make/__init__.py

@@ -4,10 +4,14 @@ import argparse
 import traceback
 import argcomplete
 
-from sinol_make import util, oiejq
+from sinol_make import util, sio2jail
 
+# Required for side effects
+from sinol_make.task_type.normal import NormalTaskType # noqa
+from sinol_make.task_type.interactive import InteractiveTaskType # noqa
 
-__version__ = "1.7.0.dev1"
+
+__version__ = "1.8.0"
 
 
 def configure_parsers():
@@ -32,19 +36,19 @@ def configure_parsers():
     return parser
 
 
-def check_oiejq():
-    if util.is_linux() and not oiejq.check_oiejq():
-        print(util.warning('Up to date `oiejq` in `~/.local/bin/` not found, installing new version...'))
+def check_sio2jail():
+    if util.is_linux() and not sio2jail.check_sio2jail():
+        print(util.warning('Up to date `sio2jail` in `~/.local/bin/` not found, installing new version...'))
         try:
-            if oiejq.install_oiejq():
-                print(util.info('`oiejq` was successfully installed.'))
+            if sio2jail.install_sio2jail():
+                print(util.info('Newest `sio2jail` was successfully installed.'))
             else:
-                util.exit_with_error('`oiejq` could not be installed.\n'
-                                     'You can download it from https://oij.edu.pl/zawodnik/srodowisko/oiejq.tar.gz, '
-                                     'unpack it to `~/.local/bin/` and rename oiejq.sh to oiejq.\n'
-                                     'You can also use --oiejq-path to specify path to your oiejq.')
+                util.exit_with_error('`sio2jail` could not be installed.\n'
+                                     'You can download it from https://oij.edu.pl/zawodnik/srodowisko/oiejq.tar.gz '
+                                     'and unpack it to `~/.local/bin/`.\n'
+                                     'You can also use --sio2jail-path to specify path to your sio2jail.')
         except Exception as err:
-            util.exit_with_error('`oiejq` could not be installed.\n' + str(err))
+            util.exit_with_error('`sio2jail` could not be installed.\n' + str(err))
 
 
 def main_exn():
@@ -53,11 +57,16 @@ def main_exn():
     curr_args = []
     commands = util.get_commands()
     commands_dict = {command.get_name(): command for command in commands}
+    commands_short_dict = {command.get_short_name(): command for command in commands if command.get_short_name()}
     for arg in sys.argv[1:]:
         if arg in commands_dict.keys() and not (len(curr_args) > 0 and curr_args[0] == 'init'):
             if curr_args:
                 arguments.append(curr_args)
             curr_args = [arg]
+        elif arg in commands_short_dict.keys() and not (len(curr_args) > 0 and curr_args[0] == 'init'):
+            if curr_args:
+                arguments.append(curr_args)
+            curr_args = [commands_short_dict[arg].get_name()]
         else:
             curr_args.append(arg)
     if curr_args:
@@ -65,7 +74,7 @@ def main_exn():
     if not arguments:
         parser.print_help()
         exit(1)
-    check_oiejq()
+    check_sio2jail()
 
     for curr_args in arguments:
         args = parser.parse_args(curr_args)
@@ -101,9 +110,13 @@ def main():
             if not util.is_dev(new_version):
                 print(util.warning(
                     f'New version of sinol-make is available (your version: {__version__}, available version: '
-                    f'{new_version}).\nYou can update it by running `pip3 install sinol-make --upgrade`.'))
+                    f'{new_version}).\n'
+                    f'Changelog can be found at https://github.com/sio2project/sinol-make/releases.\n'
+                    f'You can update sinol-make by running `pip install sinol-make --upgrade`.'))
             elif util.is_dev(new_version):
                 print(util.warning(
                     f'New development version of sinol-make is available (your version: {__version__}, available '
-                    f'version: {new_version}).\nYou can update it by running `pip3 install sinol-make --pre --upgrade`.'
+                    f'version: {new_version}).\n'
+                    f'Changelog can be found at https://github.com/sio2project/sinol-make/releases.\n'
+                    f'You can update sinol-make by running `pip install sinol-make --pre --upgrade`.'
                 ))

sinol_make-1.8.0/src/sinol_make/commands/chkwer/__init__.py

@@ -0,0 +1,137 @@
+import os
+import subprocess
+import threading
+from typing import Dict, List
+import multiprocessing as mp
+
+from sinol_make import util, contest_types
+from sinol_make.commands.chkwer import chkwer_util
+from sinol_make.commands.outgen import outgen_util
+from sinol_make.helpers import package_util, parsers, compiler, compile, printer, paths
+from sinol_make.interfaces.BaseCommand import BaseCommand
+from sinol_make.structs.chkwer_structs import TestResult, ChkwerExecution, TableData, RunResult
+
+
+class Command(BaseCommand):
+    """
+    Class for `chkwer` command.
+    """
+
+    def get_name(self):
+        return "chkwer"
+
+    def get_short_name(self):
+        return "c"
+
+    def configure_subparser(self, subparser):
+        parser = subparser.add_parser(
+            self.get_name(),
+            help='Run checker with model solution and print results',
+            description='Run checker with model solution and print results. '
+                        'Prints a table with points and checker\'s comments. '
+                        'This command fails if the model solution didn\'t '
+                        'score maximum points.'
+        )
+        parser.add_argument('-t', '--tests', type=str, nargs='+',
+                            help='test to run, for example in/abc{0,1}*')
+        parsers.add_cpus_argument(parser, 'number of cpus to use when verifying tests')
+        parsers.add_compilation_arguments(parser)
+        return parser
+
+    def compile(self, file_path, exe_path, args, name, compilation_flags):
+        print(f'Compiling {name}... ', end='')
+        compilers = compiler.verify_compilers(args, [file_path])
+        exe, compile_log_path = compile.compile_file(file_path, exe_path, compilers, compilation_flags,
+                                                     use_fsanitize=False, use_extras=False)
+        if exe is None:
+            print(util.error('ERROR'))
+            compile.print_compile_log(compile_log_path)
+            util.exit_with_error(f'Failed {name} compilation.')
+        else:
+            print(util.info('OK'))
+        return exe
+
+    def run_test(self, execution: ChkwerExecution) -> RunResult:
+        """
+        Verifies a test and returns the result of chkwer on this test.
+        """
+        output_file = paths.get_chkwer_path(os.path.basename(execution.out_test_path))
+        with open(execution.in_test_path, 'r') as inf, open(output_file, 'w') as outf:
+            process = subprocess.Popen([execution.model_exe], stdin=inf, stdout=outf)
+            process.wait()
+        ok, points, comment = self.task_type.check_output(execution.in_test_path, output_file, execution.out_test_path)
+
+        return RunResult(execution.in_test_path, ok, int(points), comment)
+
+    def run_and_print_table(self) -> Dict[str, TestResult]:
+        os.makedirs(paths.get_chkwer_path(), exist_ok=True)
+        results = {}
+        sorted_tests = sorted(self.tests, key=lambda test: package_util.get_group(test, self.task_id))
+        executions: List[ChkwerExecution] = []
+        for test in sorted_tests:
+            results[test] = TestResult(test, self.task_id)
+            executions.append(ChkwerExecution(test, results[test].test_name, package_util.get_out_from_in(test),
+                                              self.checker_executable, self.model_executable))
+
+        has_terminal, terminal_width, terminal_height = util.get_terminal_size()
+        table_data = TableData(results, 0, self.task_id, self.contest_type.max_score_per_test())
+        if has_terminal:
+            run_event = threading.Event()
+            run_event.set()
+            thr = threading.Thread(target=printer.printer_thread, args=(run_event, chkwer_util.print_view, table_data))
+            thr.start()
+
+        keyboard_interrupt = False
+        try:
+            with mp.Pool(self.cpus) as pool:
+                for i, result in enumerate(pool.imap(self.run_test, executions)):
+                    table_data.results[result.test_path].set_results(result.points, result.ok, result.comment)
+                    table_data.i = i
+        except KeyboardInterrupt:
+            keyboard_interrupt = True
+
+        if has_terminal:
+            run_event.clear()
+            thr.join()
+
+        print("\n".join(chkwer_util.print_view(terminal_width, terminal_height, table_data)[0]))
+        if keyboard_interrupt:
+            util.exit_with_error("Keyboard interrupt.")
+        return results
+
+    def run(self, args):
+        args = util.init_package_command(args)
+        self.task_id = package_util.get_task_id()
+        self.task_type = package_util.get_task_type("time", None)
+        self.contest_type = contest_types.get_contest_type()
+
+        if self.task_type.name() != "normal":
+            util.exit_with_error("chkwer can be run only for normal tasks.")
+
+        self.cpus = args.cpus or util.default_cpu_count()
+        self.tests = package_util.get_tests(self.task_id, args.tests)
+
+        if len(self.tests) == 0:
+            util.exit_with_error("No tests found.")
+        else:
+            print('Will run on tests: ' + util.bold(', '.join(self.tests)))
+        util.change_stack_size_to_unlimited()
+
+        additional_files = self.task_type.additional_files_to_compile()
+        if len(additional_files) == 0:
+            util.exit_with_error("Checker not found.")
+        if len(additional_files) != 1:
+            util.exit_with_error("More than one file to compile found. How is that possible?")
+        checker_info = additional_files[0]
+        model_solution = outgen_util.get_correct_solution(self.task_id)
+        self.checker_executable = self.compile(checker_info[0], checker_info[1], args, "checker",
+                                               args.compile_mode)
+        self.model_executable = self.compile(model_solution, package_util.get_executable(model_solution), args,
+                                             "model solution", args.compile_mode)
+        print()
+
+        results = self.run_and_print_table()
+        for result in results.values():
+            if not result.ok or result.points != self.contest_type.max_score_per_test():
+                util.exit_with_error("Model solution didn't score maximum points.")
+        print(util.info("Checker verification successful."))

sinol_make-1.8.0/src/sinol_make/commands/chkwer/chkwer_util.py

@@ -0,0 +1,72 @@
+import sys
+from io import StringIO
+
+from sinol_make import util
+from sinol_make.commands.inwer.inwer_util import sort_tests
+from sinol_make.structs.chkwer_structs import TableData
+
+
+def print_view(term_width, term_height, table_data: TableData):
+    """
+    Prints current results of test verification.
+    """
+
+    previous_stdout = sys.stdout
+    new_stdout = StringIO()
+    sys.stdout = new_stdout
+
+    results = table_data.results
+    column_lengths = [0, len('Points') + 1, 0]
+    tests = []
+    for result in results.values():
+        column_lengths[0] = max(column_lengths[0], len(result.test_name))
+        tests.append(result.test_path)
+    tests = sort_tests(tests, table_data.task_id)
+
+    # 6 is for " | " between columns, 3 for margin.
+    column_lengths[2] = max(10, term_width - column_lengths[0] - column_lengths[1] - 6 - 3)
+    margin = "  "
+
+    def print_line_separator():
+        res = "-" * (column_lengths[0] + 3) + "+" + "-" * (column_lengths[1] + 1) + "+"
+        res += "-" * (term_width - len(res) - 1)
+        print(res)
+
+    print_line_separator()
+
+    print(margin + "Test".ljust(column_lengths[0]) + " | " + "Points" + " | " + "Comment")
+    print_line_separator()
+
+    last_group = None
+    for test_path in tests:
+        result = results[test_path]
+        if last_group is not None and last_group != result.test_group:
+            print_line_separator()
+        last_group = result.test_group
+        print(margin + result.test_name.ljust(column_lengths[0]) + " | ", end='')
+
+        if result.run:
+            if result.ok:
+                if result.points == table_data.max_score:
+                    print(util.info(str(result.points).ljust(column_lengths[1] - 1)), end='')
+                else:
+                    print(util.warning(str(result.points).ljust(column_lengths[1] - 1)), end='')
+            else:
+                print(util.error(str(result.points).ljust(column_lengths[1] - 1)), end='')
+        else:
+            print(util.warning("...".ljust(column_lengths[1] - 1)), end='')
+        print(" | ", end='')
+
+        output = []
+        if result.run:
+            if result.comment:
+                print(result.comment)
+            else:
+                print(util.color_gray("No comment"))
+
+    print_line_separator()
+    print()
+    print()
+
+    sys.stdout = previous_stdout
+    return new_stdout.getvalue().splitlines(), None, "Use arrows to move."

{sinol_make-1.7.0.dev1 → sinol_make-1.8.0}/src/sinol_make/commands/doc/__init__.py

@@ -12,11 +12,14 @@ class Command(BaseCommand):
     """
     Class for `doc` command.
     """
-    LOG_PATTERNS = ['*~', '*.aux', '*.log', '*.dvi', '*.err', '*.inf']
+    LOG_PATTERNS = ['*~', '*.aux', '*.log', '*.dvi', '*.err', '*.inf', '*.out']
 
     def get_name(self):
         return "doc"
 
+    def get_short_name(self):
+        return "d"
+
     def compile_file_latex_div(self, file_path):
         print(f'Compiling {os.path.basename(file_path)} (latex to dvi)...')
         os.chdir(os.path.dirname(file_path))
@@ -37,7 +40,8 @@ class Command(BaseCommand):
     def compile_pdf_latex(self, file_path):
         print(f'Compiling {os.path.basename(file_path)} (pdflatex)...')
         os.chdir(os.path.dirname(file_path))
-        subprocess.run(['pdflatex', file_path])
+        for _ in range(3):
+            subprocess.run(['pdflatex', file_path])
         pdf_file = os.path.splitext(file_path)[0] + '.pdf'
         pdf_file_path = os.path.join(os.path.dirname(file_path), pdf_file)
         if not os.path.exists(pdf_file_path):

{sinol_make-1.7.0.dev1 → sinol_make-1.8.0}/src/sinol_make/commands/export/__init__.py

@@ -23,6 +23,9 @@ class Command(BaseCommand):
     def get_name(self):
         return "export"
 
+    def get_short_name(self):
+        return "e"
+
     def configure_subparser(self, subparser: argparse.ArgumentParser):
         parser = subparser.add_parser(
             self.get_name(),
@@ -215,12 +218,15 @@ class Command(BaseCommand):
                 if 'c' in config['extra_compilation_args']:
                     c_flags += ' ' + format_multiple_arguments(config['extra_compilation_args']['c'])
 
+            tl = config.get('time_limit', None)
+            if not tl:
+                tl = config['time_limits'][0]
             f.write(f'MODE = wer\n'
                     f'ID = {self.task_id}\n'
                     f'SIG = sinolmake\n'
                     f'\n'
-                    f'TIMELIMIT = {config["time_limit"]}\n'
-                    f'SLOW_TIMELIMIT = {4 * config["time_limit"]}\n'
+                    f'TIMELIMIT = {tl}\n'
+                    f'SLOW_TIMELIMIT = {4 * tl}\n'
                     f'MEMLIMIT = {config["memory_limit"]}\n'
                     f'\n'
                     f'OI_TIME = oiejq\n'

{sinol_make-1.7.0.dev1 → sinol_make-1.8.0}/src/sinol_make/commands/gen/__init__.py

@@ -3,9 +3,8 @@ import argparse
 from sinol_make import util
 from sinol_make.commands.ingen import Command as IngenCommand
 from sinol_make.commands.outgen import Command as OutgenCommand
-from sinol_make.helpers import parsers
+from sinol_make.helpers import parsers, package_util
 from sinol_make.interfaces.BaseCommand import BaseCommand
-from sinol_make.task_type import get_task_type
 
 
 class Command(BaseCommand):
@@ -16,6 +15,9 @@ class Command(BaseCommand):
     def get_name(self):
         return "gen"
 
+    def get_short_name(self):
+        return "g"
+
     def configure_subparser(self, subparser):
         parser = subparser.add_parser(
             self.get_name(),
@@ -41,11 +43,11 @@ class Command(BaseCommand):
 
     def run(self, args: argparse.Namespace):
         args = util.init_package_command(args)
-        task_type = get_task_type()
 
         self.args = args
         self.ins = args.only_inputs
         self.outs = args.only_outputs
+        self.task_type = package_util.get_task_type_cls()
         # If no arguments are specified, generate both input and output files.
         if not self.ins and not self.outs:
             self.ins = True
@@ -55,6 +57,10 @@ class Command(BaseCommand):
             command = IngenCommand()
             command.run(args)
 
-        if self.outs and task_type.run_outgen():
+        if not self.task_type.run_outgen():
+            print(util.warning("Outgen is not supported for this task type."))
+            return
+
+        if self.outs:
             command = OutgenCommand()
             command.run(args)

{sinol_make-1.7.0.dev1 → sinol_make-1.8.0}/src/sinol_make/commands/ingen/ingen_util.py

@@ -58,7 +58,7 @@ def compile_ingen(ingen_path: str, args: argparse.Namespace, compilation_flags='
     compilers = compiler.verify_compilers(args, [ingen_path])
     ingen_exe, compile_log_path = compile.compile_file(ingen_path, package_util.get_executable(ingen_path),
                                                        compilers, compilation_flags, use_fsanitize=use_fsanitize,
-                                                       additional_flags='-D_INGEN')
+                                                       additional_flags='-D_INGEN', use_extras=False)
 
     if ingen_exe is None:
         compile.print_compile_log(compile_log_path)
@@ -100,7 +100,7 @@ def run_ingen(ingen_exe, working_dir=None):
 
     if util.has_sanitizer_error(whole_output, exit_code):
         print(util.warning('Warning: if ingen failed due to sanitizer errors, you can either run '
-                           '`sudo sysctl vm.mmap_rnd_bits = 28` to fix this or disable sanitizers with the '
+                           '`sudo sysctl vm.mmap_rnd_bits=28` to fix this or disable sanitizers with the '
                            '--no-fsanitize flag.'))
 
     return exit_code == 0