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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sinol_make
-Version: 1.6.0.dev3
+Version: 1.7.0.dev1
 Summary: CLI tool for creating sio2 task packages
 Author: Mateusz Masiarz
 Author-email: m.masiarz@fri.edu.pl
@@ -113,6 +113,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:

{sinol_make-1.6.0.dev3 → sinol_make-1.7.0.dev1}/README.md

@@ -83,6 +83,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:

{sinol_make-1.6.0.dev3 → sinol_make-1.7.0.dev1}/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.dev1}/src/sinol_make/__init__.py

@@ -6,7 +6,8 @@ import argcomplete
 
 from sinol_make import util, oiejq
 
-__version__ = "1.6.0.dev3"
+
+__version__ = "1.7.0.dev1"
 
 
 def configure_parsers():
@@ -33,7 +34,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,8 +51,10 @@ def main_exn():
     parser = configure_parsers()
     arguments = []
     curr_args = []
+    commands = util.get_commands()
+    commands_dict = {command.get_name(): command for command in commands}
     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]
@@ -59,19 +62,19 @@ def main_exn():
             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.6.0.dev3 → sinol_make-1.7.0.dev1}/src/sinol_make/commands/doc/__init__.py

@@ -18,7 +18,7 @@ class Command(BaseCommand):
         return "doc"
 
     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 +35,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 +62,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.dev1}/src/sinol_make/commands/export/__init__.py

@@ -28,10 +28,7 @@ class Command(BaseCommand):
             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 +115,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.dev1}/src/sinol_make/commands/gen/__init__.py

@@ -5,6 +5,7 @@ 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.interfaces.BaseCommand import BaseCommand
+from sinol_make.task_type import get_task_type
 
 
 class Command(BaseCommand):
@@ -31,20 +32,16 @@ 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
 
     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
@@ -58,6 +55,6 @@ class Command(BaseCommand):
             command = IngenCommand()
             command.run(args)
 
-        if self.outs:
+        if self.outs and task_type.run_outgen():
             command = OutgenCommand()
             command.run(args)

{sinol_make-1.6.0.dev3 → sinol_make-1.7.0.dev1}/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.dev1}/src/sinol_make/commands/inwer/__init__.py

@@ -10,8 +10,7 @@ from typing import Dict, List
 
 from sinol_make import util
 from sinol_make.structs.inwer_structs import TestResult, InwerExecution, VerificationResult, TableData
-from sinol_make.helpers import package_util, compile, printer, paths
-from sinol_make.helpers.parsers import add_compilation_arguments
+from sinol_make.helpers import package_util, printer, paths, parsers
 from sinol_make.interfaces.BaseCommand import BaseCommand
 from sinol_make.commands.inwer import inwer_util
 
@@ -37,12 +36,9 @@ class Command(BaseCommand):
                             help='path to inwer source file, for example prog/abcinwer.cpp')
         parser.add_argument('-t', '--tests', type=str, nargs='+',
                             help='test to verify, for example in/abc{0,1}*')
-        parser.add_argument('-c', '--cpus', type=int,
-                            help=f'number of cpus to use (default: {util.default_cpu_count()})')
-        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`.')
-        add_compilation_arguments(parser)
+        parsers.add_cpus_argument(parser, 'number of cpus to use when verifying tests')
+        parsers.add_fsanitize_argument(parser)
+        parsers.add_compilation_arguments(parser)
         return parser
 
     @staticmethod

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

@@ -10,6 +10,7 @@ from sinol_make.commands.outgen.outgen_util import get_correct_solution, compile
 from sinol_make.structs.gen_structs import OutputGenerationArguments
 from sinol_make.helpers import parsers, package_util, cache, paths
 from sinol_make.interfaces.BaseCommand import BaseCommand
+from sinol_make.task_type import get_task_type
 
 
 class Command(BaseCommand):
@@ -26,11 +27,7 @@ class Command(BaseCommand):
             help='Generate output files',
             description='Generate output files using the correct solution.'
         )
-
-        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')
         parsers.add_compilation_arguments(parser)
@@ -50,7 +47,7 @@ class Command(BaseCommand):
             for i, result in enumerate(pool.imap(generate_output, arguments)):
                 results.append(result)
                 if result:
-                    print(util.info(f'Successfully generated output file {os.path.basename(arguments[i].output_test)}'))
+                    print(f'Successfully generated output file {os.path.basename(arguments[i].output_test)}')
                 else:
                     print(util.error(f'Failed to generate output file {os.path.basename(arguments[i].output_test)}'))
 
@@ -110,6 +107,9 @@ class Command(BaseCommand):
 
     def run(self, args: argparse.Namespace):
         args = util.init_package_command(args)
+        task_type = get_task_type()
+        if not task_type.run_outgen():
+            util.exit_with_error('This task type does not support output generation.')
 
         self.args = args
         self.task_id = package_util.get_task_id()
@@ -130,7 +130,4 @@ class Command(BaseCommand):
                 yaml.dump(md5_sums, f)
 
         if not self.args.no_validate:
-            print(util.info('Validating output test contents.'))
-            for test in sorted(outputs_to_generate):
-                package_util.validate_test(test)
-            print(util.info('Output test contents are valid!'))
+            package_util.validate_tests(sorted(outputs_to_generate), self.args.cpus, 'outputs')