Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion example_package/prog/__ID__ingen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ sol_exe="$cache_dir/${task_id}solution"
slo_exe="$cache_dir/${task_id}slow"
stresstest_seconds=10
function compile_cpp {
g++ -std=c++20 -O3 -lm -Werror -Wall -Wextra -Wshadow -Wconversion -Wno-unused-result -Wfloat-equal "$1" -o "$2" \
g++ -std=c++23 -O3 -lm -Werror -Wall -Wextra -Wshadow -Wconversion -Wno-unused-result -Wfloat-equal "$1" -o "$2" \
|| exit 1
}

Expand Down
2 changes: 1 addition & 1 deletion src/sinol_make/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from sinol_make.task_type.interactive import InteractiveTaskType # noqa


__version__ = "1.9.9"
__version__ = "1.9.10"


def configure_parsers():
Expand Down
2 changes: 1 addition & 1 deletion src/sinol_make/commands/export/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ def create_makefile_in(self, target_dir: str, config: dict):
:param config: Config dictionary.
"""
with open(os.path.join(target_dir, 'makefile.in'), 'w') as f:
cxx_flags = '-std=c++20'
cxx_flags = '-std=c++23'
c_flags = '-std=gnu99'

def format_multiple_arguments(obj):
Expand Down
2 changes: 1 addition & 1 deletion src/sinol_make/helpers/compile.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def compile(program, output, compilers: Compilers = None, compile_log=None, comp
if ext == '.cpp':
arguments = [compilers.cpp_compiler_path or compiler.get_cpp_compiler_path(), program] + \
extra_compilation_args + ['-o', output] + \
f'--std=c++20 -O3 -lm{gcc_compilation_flags} -fdiagnostics-color'.split(' ')
f'--std=c++23 -O3 -lm{gcc_compilation_flags} -fdiagnostics-color'.split(' ')
if use_fsanitize and compilation_flags != 'weak':
arguments += ['-fsanitize=address,undefined', '-fno-sanitize-recover']
elif ext == '.c':
Expand Down
10 changes: 5 additions & 5 deletions src/sinol_make/helpers/compiler.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ def get_cpp_compiler_path():
else:
return 'g++'
elif sys.platform == 'darwin':
if check_if_installed('g++-12'): # g++12 is currently the default compiler on sio.
return 'g++-12'
if check_if_installed('g++-14'): # g++14 is currently the default compiler on sio.
return 'g++-14'
for i in [9, 10, 11, 13, 14]:
compiler = 'g++-' + str(i)
if check_if_installed(compiler):
Expand All @@ -70,9 +70,9 @@ def get_python_interpreter_path():
Get the Python interpreter
"""

if check_if_installed('python3.11'): # python3.11 is currently the default interpreter on sio.
return 'python3.11'
for ver in ['3.9', '3.8', '3.7', '3']:
if check_if_installed('python3.13'): # python3.13 is currently the default interpreter on sio.
return 'python3.13'
for ver in ['3.12', '3.11', '3.10', '3.9', '3']:
if check_if_installed('python' + ver):
return 'python' + ver
return None
Expand Down
4 changes: 2 additions & 2 deletions src/sinol_make/helpers/parsers.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

def add_compilation_arguments(parser: argparse.ArgumentParser):
if sys.platform == 'darwin':
gcc_versions = 'gcc-9, gcc-10, gcc-11'
gpp_versions = 'g++-9, g++-10, g++-11'
gcc_versions = 'gcc-10, gcc-11, gcc-12, gcc-13, gcc-14'
gpp_versions = 'g++-10, g++-11, g++-12, g++-13, g++-14'
else:
gcc_versions = 'gcc'
gpp_versions = 'g++'
Expand Down
2 changes: 1 addition & 1 deletion tests/commands/export/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def _get_value_from_key(key, separator):
assert _get_value_from_key("SLOW_TIMELIMIT", "=") == str(4 * config["time_limit"])
assert _get_value_from_key("MEMLIMIT", "=") == str(config["memory_limit"])

cxx_flags = '-std=c++20'
cxx_flags = '-std=c++23'
c_flags = '-std=gnu99'
def format_multiple_arguments(obj):
if isinstance(obj, str):
Expand Down
Loading