Skip to content

Commit 76c06e0

Browse files
authored
Update to g++14 with c++23 and python 3.13 (#306)
* Update to g++14 with c++23 and python 3.13 * Bump version
1 parent b61cab7 commit 76c06e0

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

example_package/prog/__ID__ingen.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ sol_exe="$cache_dir/${task_id}solution"
1515
slo_exe="$cache_dir/${task_id}slow"
1616
stresstest_seconds=10
1717
function compile_cpp {
18-
g++ -std=c++20 -O3 -lm -Werror -Wall -Wextra -Wshadow -Wconversion -Wno-unused-result -Wfloat-equal "$1" -o "$2" \
18+
g++ -std=c++23 -O3 -lm -Werror -Wall -Wextra -Wshadow -Wconversion -Wno-unused-result -Wfloat-equal "$1" -o "$2" \
1919
|| exit 1
2020
}
2121

src/sinol_make/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from sinol_make.task_type.interactive import InteractiveTaskType # noqa
1313

1414

15-
__version__ = "1.9.9"
15+
__version__ = "1.9.10"
1616

1717

1818
def configure_parsers():

src/sinol_make/commands/export/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ def create_makefile_in(self, target_dir: str, config: dict):
210210
:param config: Config dictionary.
211211
"""
212212
with open(os.path.join(target_dir, 'makefile.in'), 'w') as f:
213-
cxx_flags = '-std=c++20'
213+
cxx_flags = '-std=c++23'
214214
c_flags = '-std=gnu99'
215215

216216
def format_multiple_arguments(obj):

src/sinol_make/helpers/compile.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def compile(program, output, compilers: Compilers = None, compile_log=None, comp
7676
if ext == '.cpp':
7777
arguments = [compilers.cpp_compiler_path or compiler.get_cpp_compiler_path(), program] + \
7878
extra_compilation_args + ['-o', output] + \
79-
f'--std=c++20 -O3 -lm{gcc_compilation_flags} -fdiagnostics-color'.split(' ')
79+
f'--std=c++23 -O3 -lm{gcc_compilation_flags} -fdiagnostics-color'.split(' ')
8080
if use_fsanitize and compilation_flags != 'weak':
8181
arguments += ['-fsanitize=address,undefined', '-fno-sanitize-recover']
8282
elif ext == '.c':

src/sinol_make/helpers/compiler.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ def get_cpp_compiler_path():
5454
else:
5555
return 'g++'
5656
elif sys.platform == 'darwin':
57-
if check_if_installed('g++-12'): # g++12 is currently the default compiler on sio.
58-
return 'g++-12'
57+
if check_if_installed('g++-14'): # g++14 is currently the default compiler on sio.
58+
return 'g++-14'
5959
for i in [9, 10, 11, 13, 14]:
6060
compiler = 'g++-' + str(i)
6161
if check_if_installed(compiler):
@@ -70,9 +70,9 @@ def get_python_interpreter_path():
7070
Get the Python interpreter
7171
"""
7272

73-
if check_if_installed('python3.11'): # python3.11 is currently the default interpreter on sio.
74-
return 'python3.11'
75-
for ver in ['3.9', '3.8', '3.7', '3']:
73+
if check_if_installed('python3.13'): # python3.13 is currently the default interpreter on sio.
74+
return 'python3.13'
75+
for ver in ['3.12', '3.11', '3.10', '3.9', '3']:
7676
if check_if_installed('python' + ver):
7777
return 'python' + ver
7878
return None

src/sinol_make/helpers/parsers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88
def add_compilation_arguments(parser: argparse.ArgumentParser):
99
if sys.platform == 'darwin':
10-
gcc_versions = 'gcc-9, gcc-10, gcc-11'
11-
gpp_versions = 'g++-9, g++-10, g++-11'
10+
gcc_versions = 'gcc-10, gcc-11, gcc-12, gcc-13, gcc-14'
11+
gpp_versions = 'g++-10, g++-11, g++-12, g++-13, g++-14'
1212
else:
1313
gcc_versions = 'gcc'
1414
gpp_versions = 'g++'

tests/commands/export/util.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def _get_value_from_key(key, separator):
5656
assert _get_value_from_key("SLOW_TIMELIMIT", "=") == str(4 * config["time_limit"])
5757
assert _get_value_from_key("MEMLIMIT", "=") == str(config["memory_limit"])
5858

59-
cxx_flags = '-std=c++20'
59+
cxx_flags = '-std=c++23'
6060
c_flags = '-std=gnu99'
6161
def format_multiple_arguments(obj):
6262
if isinstance(obj, str):

0 commit comments

Comments
 (0)