Skip to content

Commit a1ca75f

Browse files
committed
Marks --mpi as deprecated
1 parent 3ad7368 commit a1ca75f

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

scorep/__main__.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import scorep.instrumenter
55
import scorep.subsystem
66
import scorep.helper
7-
from scorep.helper import print_err
7+
from scorep.helper import get_scorep_version, print_err get_scorep_version
88

99

1010
def _err_exit(msg):
@@ -19,7 +19,6 @@ def print_help():
1919
Score-P Python instrumentation wrapper. The following options control how the program is instrumented and executed. Any unknown option are passed directly to 'scorep-config'.
2020
2121
--help Show this help message and exit.
22-
--mpi Enable MPI instrumentation (equivalent to --mpp=mpi).
2322
--keep-files Keep temporary files after execution.
2423
--verbose, -v Enable verbose output for debugging and tracing.
2524
--nocompiler Disable compiler-based instrumentation.
@@ -31,7 +30,7 @@ def print_help():
3130
--instrumenter-file=<file>
3231
Path to a Python script that is executed before the application.
3332
Allows instrumentation of specific modules and functions without modifying their source code.
34-
-- Stop parsing Score-P options; pass following args to your script.
33+
-- Stop parsing Score-P options; interpret all following arguments verbatim as the program with its arguments.
3534
3635
Other options starting with '-' are passed directly to 'scorep-config'.
3736
To view all available Score-P configuration options, run: scorep-config --help
@@ -75,6 +74,8 @@ def scorep_main(argv=None):
7574
show_help = True
7675
break
7776
elif elem == "--mpi":
77+
print_err(*args: f"scorep: Warning: The option '{elem}' is deprecated "
78+
"and will be removed in future.")
7879
scorep_config.append("--mpp=mpi")
7980
elif elem == "--keep-files":
8081
keep_files = True
@@ -87,7 +88,7 @@ def scorep_main(argv=None):
8788
no_instrumenter = True
8889
elif elem == "--noinstrumenter":
8990
no_instrumenter = True
90-
elif elem in ["--io=runtime:posix", "--io=posix"]:
91+
elif elem in ["--io=runtime:posix", "--io=posix"] and get_scorep_version() >= 9.0:
9192
print_err(f"scorep: Warning: The option '{elem}' is deprecated.")
9293
if "SCOREP_IO_POSIX" in os.environ:
9394
print_err(" Will not overwrite existing value for environment variable "

0 commit comments

Comments
 (0)