Skip to content

Commit 7378a04

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

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

scorep/__main__.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33

44
import scorep.instrumenter
55
import scorep.subsystem
6-
import scorep.helper
7-
from scorep.helper import print_err
6+
from scorep.helper import get_scorep_version, print_err
87

98

109
def _err_exit(msg):
@@ -19,7 +18,6 @@ def print_help():
1918
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'.
2019
2120
--help Show this help message and exit.
22-
--mpi Enable MPI instrumentation (equivalent to --mpp=mpi).
2321
--keep-files Keep temporary files after execution.
2422
--verbose, -v Enable verbose output for debugging and tracing.
2523
--nocompiler Disable compiler-based instrumentation.
@@ -31,7 +29,7 @@ def print_help():
3129
--instrumenter-file=<file>
3230
Path to a Python script that is executed before the application.
3331
Allows instrumentation of specific modules and functions without modifying their source code.
34-
-- Stop parsing Score-P options; pass following args to your script.
32+
-- Stop parsing Score-P options; interpret all following arguments verbatim as the program with its arguments.
3533
3634
Other options starting with '-' are passed directly to 'scorep-config'.
3735
To view all available Score-P configuration options, run: scorep-config --help
@@ -75,6 +73,8 @@ def scorep_main(argv=None):
7573
show_help = True
7674
break
7775
elif elem == "--mpi":
76+
print_err(f"scorep: Warning: The option '{elem}' is deprecated "
77+
"and will be removed in future.")
7878
scorep_config.append("--mpp=mpi")
7979
elif elem == "--keep-files":
8080
keep_files = True
@@ -87,7 +87,7 @@ def scorep_main(argv=None):
8787
no_instrumenter = True
8888
elif elem == "--noinstrumenter":
8989
no_instrumenter = True
90-
elif elem in ["--io=runtime:posix", "--io=posix"]:
90+
elif elem in ["--io=runtime:posix", "--io=posix"] and get_scorep_version() >= 9.0:
9191
print_err(f"scorep: Warning: The option '{elem}' is deprecated.")
9292
if "SCOREP_IO_POSIX" in os.environ:
9393
print_err(" Will not overwrite existing value for environment variable "

0 commit comments

Comments
 (0)