sinol-make 1.6.0.dev3__tar.gz → 1.7.0__tar.gz

{sinol_make-1.6.0.dev3/src/sinol_make.egg-info → sinol_make-1.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sinol_make
-Version: 1.6.0.dev3
+Version: 1.7.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?
@@ -93,7 +94,7 @@ 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
@@ -113,6 +114,9 @@ Run `sinol-make ingen --help` to see available flags.
 program to use, what tests to check and how many CPUs to use. Run `sinol-make inwer --help` to see available flags.
 - `sinol-make export` -- Creates archive ready to upload to sio2 or szkopul. Run `sinol-make export --help` to see all available flags.
 - `sinol-make doc` -- Compiles all LaTeX files in doc/ directory to PDF. Run `sinol-make doc --help` to see all available flags.
+- `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 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:
@@ -121,6 +125,31 @@ 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`
+- `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                                                                                   | oiejq     | oiejq | oiejq | 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.6.0.dev3 → sinol_make-1.7.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?
@@ -63,7 +64,7 @@ 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
@@ -83,6 +84,9 @@ Run `sinol-make ingen --help` to see available flags.
 program to use, what tests to check and how many CPUs to use. Run `sinol-make inwer --help` to see available flags.
 - `sinol-make export` -- Creates archive ready to upload to sio2 or szkopul. Run `sinol-make export --help` to see all available flags.
 - `sinol-make doc` -- Compiles all LaTeX files in doc/ directory to PDF. Run `sinol-make doc --help` to see all available flags.
+- `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 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:
@@ -91,6 +95,31 @@ 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`
+- `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                                                                                   | oiejq     | oiejq | oiejq | 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.6.0.dev3 → sinol_make-1.7.0}/setup.cfg

@@ -44,6 +44,7 @@ tests =
 [options.entry_points]
 console_scripts = 
 	sinol-make = sinol_make:main
+	sm = sinol_make:main
 
 [tool:pytest]
 testpaths = 

{sinol_make-1.6.0.dev3 → sinol_make-1.7.0}/src/sinol_make/__init__.py

@@ -6,7 +6,12 @@ import argcomplete
 
 from sinol_make import util, oiejq
 
-__version__ = "1.6.0.dev3"
+# 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"
 
 
 def configure_parsers():
@@ -33,7 +38,7 @@ def configure_parsers():
 
 def check_oiejq():
     if util.is_linux() and not oiejq.check_oiejq():
-        print(util.warning('`oiejq` in `~/.local/bin/` not found, installing now...'))
+        print(util.warning('Up to date `oiejq` in `~/.local/bin/` not found, installing new version...'))
         try:
             if oiejq.install_oiejq():
                 print(util.info('`oiejq` was successfully installed.'))
@@ -50,28 +55,35 @@ def main_exn():
     parser = configure_parsers()
     arguments = []
     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 util.get_command_names() and not (len(curr_args) > 0 and curr_args[0] == 'init'):
+        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:
         arguments.append(curr_args)
-    commands = util.get_commands()
+    if not arguments:
+        parser.print_help()
+        exit(1)
     check_oiejq()
 
     for curr_args in arguments:
         args = parser.parse_args(curr_args)
-        command_found = False
-        for command in commands:
-            if command.get_name() == args.command:
-                command_found = True
-                if len(arguments) > 1:
-                    print(f' {command.get_name()} command '.center(util.get_terminal_size()[1], '='))
-                command.run(args)
-        if not command_found:
+        command = commands_dict.get(args.command, None)
+        if command:
+            if len(arguments) > 1:
+                print(f' {command.get_name()} command '.center(util.get_terminal_size()[1], '='))
+            command.run(args)
+        else:
             parser.print_help()
             exit(1)
 

sinol_make-1.7.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.7.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.6.0.dev3 → sinol_make-1.7.0}/src/sinol_make/commands/doc/__init__.py

@@ -17,8 +17,11 @@ class Command(BaseCommand):
     def get_name(self):
         return "doc"
 
+    def get_short_name(self):
+        return "d"
+
     def compile_file_latex_div(self, file_path):
-        print(util.info(f'Compiling {os.path.basename(file_path)} (latex to dvi)...'))
+        print(f'Compiling {os.path.basename(file_path)} (latex to dvi)...')
         os.chdir(os.path.dirname(file_path))
         subprocess.run(['latex', file_path])
         dvi_file = os.path.splitext(file_path)[0] + '.dvi'
@@ -35,7 +38,7 @@ class Command(BaseCommand):
         return True
 
     def compile_pdf_latex(self, file_path):
-        print(util.info(f'Compiling {os.path.basename(file_path)} (pdflatex)...'))
+        print(f'Compiling {os.path.basename(file_path)} (pdflatex)...')
         os.chdir(os.path.dirname(file_path))
         subprocess.run(['pdflatex', file_path])
         pdf_file = os.path.splitext(file_path)[0] + '.pdf'
@@ -62,7 +65,7 @@ class Command(BaseCommand):
         for pattern in self.LOG_PATTERNS:
             for file in glob.glob(os.path.join(os.getcwd(), 'doc', pattern)):
                 os.rename(file, os.path.join(output_dir, os.path.basename(file)))
-        print(util.info(f'Compilation log files can be found in {os.path.relpath(output_dir, os.getcwd())}'))
+        print(f'Compilation log files can be found in {os.path.relpath(output_dir, os.getcwd())}')
 
     def configure_subparser(self, subparser: argparse.ArgumentParser):
         parser = subparser.add_parser(

{sinol_make-1.6.0.dev3 → sinol_make-1.7.0}/src/sinol_make/commands/export/__init__.py

@@ -23,15 +23,15 @@ 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(),
             help='Create archive for oioioi upload',
             description='Creates archive in the current directory ready to upload to sio2 or szkopul.')
-        parser.add_argument('-c', '--cpus', type=int,
-                            help=f'number of cpus to use to generate output files '
-                                 f'(default: {util.default_cpu_count()})',
-                            default=util.default_cpu_count())
+        parsers.add_cpus_argument(parser, 'number of cpus to use to generate output files')
         parser.add_argument('--no-statement', dest='no_statement', action='store_true',
                             help='allow export without statement')
         parser.add_argument('--export-ocen', dest='export_ocen', action='store_true',
@@ -118,12 +118,14 @@ class Command(BaseCommand):
                     shutil.copy(test, os.path.join(ocen_dir, ext, os.path.basename(test)))
                     num_tests += 1
 
+            dlazaw_dir = os.path.join(os.getcwd(), 'dlazaw')
             if num_tests == 0:
                 print(util.warning('No ocen tests found.'))
+            elif os.path.exists(dlazaw_dir):
+                print(util.warning('Skipping ocen archive creation because dlazaw directory exists.'))
             else:
                 shutil.make_archive(os.path.join(attachments_dir, f'{self.task_id}ocen'), 'zip', tmpdir)
 
-            dlazaw_dir = os.path.join(os.getcwd(), 'dlazaw')
             if os.path.exists(dlazaw_dir):
                 print('Archiving dlazaw directory and adding to attachments.')
                 os.makedirs(os.path.join(tmpdir, 'dlazaw'), exist_ok=True)

{sinol_make-1.6.0.dev3 → sinol_make-1.7.0}/src/sinol_make/commands/gen/__init__.py

@@ -3,7 +3,7 @@ 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
 
 
@@ -15,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(),
@@ -31,15 +34,10 @@ class Command(BaseCommand):
                             help='path to ingen source file, for example prog/abcingen.cpp')
         parser.add_argument('-i', '--only-inputs', action='store_true', help='generate input files only')
         parser.add_argument('-o', '--only-outputs', action='store_true', help='generate output files only')
-        parser.add_argument('-c', '--cpus', type=int,
-                            help=f'number of cpus to use to generate output files '
-                                 f'(default: {util.default_cpu_count()})',
-                            default=util.default_cpu_count())
+        parsers.add_cpus_argument(parser, 'number of cpus to use to generate output files')
         parser.add_argument('-n', '--no-validate', default=False, action='store_true',
                             help='do not validate test contents')
-        parser.add_argument('-f', '--fsanitize', default=False, action='store_true',
-                            help='Use -fsanitize=address,undefined for ingen compilation. Warning: this may fail on some '
-                                 'systems. To fix this, run `sudo sysctl vm.mmap_rnd_bits = 28`.')
+        parsers.add_fsanitize_argument(parser)
         parsers.add_compilation_arguments(parser)
         return parser
 
@@ -49,6 +47,7 @@ class Command(BaseCommand):
         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
@@ -58,6 +57,10 @@ class Command(BaseCommand):
             command = IngenCommand()
             command.run(args)
 
+        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.6.0.dev3 → sinol_make-1.7.0}/src/sinol_make/commands/ingen/__init__.py

@@ -30,22 +30,43 @@ class Command(BaseCommand):
                             help='path to ingen source file, for example prog/abcingen.cpp')
         parser.add_argument('-n', '--no-validate', default=False, action='store_true',
                             help='do not validate test contents')
-        parser.add_argument('-f', '--fsanitize', default=False, action='store_true',
-                            help='Use -fsanitize=address,undefined for compilation. Warning: this may fail on some '
-                                 'systems. Tof fix this, run `sudo sysctl vm.mmap_rnd_bits = 28`.')
+        parsers.add_cpus_argument(parser, 'number of cpus used for validating tests')
+        parsers.add_fsanitize_argument(parser)
         parsers.add_compilation_arguments(parser)
         return parser
 
+    def delete_dangling_files(self, dates):
+        to_delete = set()
+        for test in glob.glob(os.path.join(os.getcwd(), "in", f"{self.task_id}*.in")):
+            basename = os.path.basename(test)
+            if basename in dates and dates[basename] == os.path.getmtime(test):
+                to_delete.add(os.path.basename(test))
+        if to_delete:
+            config = package_util.get_config()
+            if 'sinol_static_tests' not in config:
+                print(util.warning('Old input files won\'t be deleted, '
+                                   'because static tests are not defined. '
+                                   'You can define them in config.yml with `sinol_static_tests` key.'))
+            else:
+                static_files = config['sinol_static_tests']
+                if isinstance(static_files, str):
+                    static_files = [static_files]
+                static_files = set([os.path.basename(test) for test in static_files])
+                to_delete = to_delete - static_files
+                if to_delete:
+                    print('Cleaning up old input files.')
+                    for test in to_delete:
+                        os.remove(os.path.join(os.getcwd(), "in", test))
+
     def run(self, args: argparse.Namespace):
         args = util.init_package_command(args)
 
         self.args = args
 
         self.task_id = package_util.get_task_id()
-        package_util.validate_test_names(self.task_id)
         util.change_stack_size_to_unlimited()
         self.ingen = get_ingen(self.task_id, args.ingen_path)
-        print(util.info(f'Using ingen file {os.path.basename(self.ingen)}'))
+        print(f'Using ingen file {os.path.basename(self.ingen)}')
         self.ingen_exe = compile_ingen(self.ingen, self.args, self.args.compile_mode, self.args.fsanitize)
 
         previous_tests = []
@@ -64,18 +85,11 @@ class Command(BaseCommand):
         else:
             util.exit_with_error('Failed to generate input files.')
 
-        print(util.info('Cleaning up old input files.'))
-        for test in glob.glob(os.path.join(os.getcwd(), "in", f"{self.task_id}*.in")):
-            basename = os.path.basename(test)
-            if basename in dates and dates[basename] == os.path.getmtime(test):
-                os.unlink(test)
+        self.delete_dangling_files(dates)
 
         with open(paths.get_cache_path("input_tests"), "w") as f:
             f.write("\n".join(glob.glob(os.path.join(os.getcwd(), "in", f"{self.task_id}*.in"))))
 
         if not self.args.no_validate:
-            print(util.info('Validating input test contents.'))
             tests = sorted(glob.glob(os.path.join(os.getcwd(), "in", f"{self.task_id}*.in")))
-            for test in tests:
-                package_util.validate_test(test)
-            print(util.info('Input test contents are valid!'))
+            package_util.validate_tests(tests, self.args.cpus, 'input')

{sinol_make-1.6.0.dev3 → sinol_make-1.7.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)