Skip to content

Commit a75089d

Browse files
AndreasGochtAndreasGocht
committed
autopep8
1 parent 7c6dd27 commit a75089d

6 files changed

Lines changed: 52 additions & 39 deletions

File tree

‎scorep/__main__.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ def set_init_environment(scorep_config=[], keep_files=False):
4646

4747
preload_str = scorep_ld_preload + " " + subsystem_lib_name
4848
if "LD_PRELOAD" in os.environ:
49-
sys.stderr.write("LD_PRELOAD is already specified. If Score-P is already loaded this might lead to errors.")
49+
sys.stderr.write(
50+
"LD_PRELOAD is already specified. If Score-P is already loaded this might lead to errors.")
5051
preload_str = preload_str + " " + os.environ["LD_PRELOAD"]
5152
os.environ["LD_PRELOAD"] = preload_str
5253
os.environ["SCOREP_PYTHON_BINDINGS_INITALISED"] = "true"
@@ -159,5 +160,7 @@ def main(argv=None):
159160
if __name__ == '__main__':
160161
scorep_main()
161162
else:
162-
if ("SCOREP_PYTHON_BINDINGS_INITALISED" not in os.environ) or (os.environ["SCOREP_PYTHON_BINDINGS_INITALISED"] != "true"):
163-
sys.stderr.write("scorep needs to be loaded using \"python -m scorep <script>\". Please be aware that scorep might not work correctly!")
163+
if ("SCOREP_PYTHON_BINDINGS_INITALISED" not in os.environ) or (
164+
os.environ["SCOREP_PYTHON_BINDINGS_INITALISED"] != "true"):
165+
sys.stderr.write(
166+
"scorep needs to be loaded using \"python -m scorep <script>\". Please be aware that scorep might not work correctly!")

‎scorep/subsystem.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ def generate(scorep_config, keep_files=False):
6060

6161
temp_dir = tempfile.mkdtemp(prefix="scorep.")
6262
if keep_files:
63-
sys.stderr.write("Score-P files are keept at: {}".format(temp_dir), file=sys.stderr)
63+
sys.stderr.write(
64+
"Score-P files are keept at: {}".format(temp_dir),
65+
file=sys.stderr)
6466

6567
with open(temp_dir + "/scorep_init.c", "w") as f:
6668
f.write(scorep_adapter_init)
@@ -91,5 +93,6 @@ def clean_up(keep_files=True):
9193
if keep_files:
9294
return
9395
else:
94-
if ("SCOREP_PYTHON_BINDINGS_TEMP_DIR" in os.environ) and (os.environ["SCOREP_PYTHON_BINDINGS_TEMP_DIR"] != ""):
96+
if ("SCOREP_PYTHON_BINDINGS_TEMP_DIR" in os.environ) and (
97+
os.environ["SCOREP_PYTHON_BINDINGS_TEMP_DIR"] != ""):
9598
shutil.rmtree(os.environ["SCOREP_PYTHON_BINDINGS_TEMP_DIR"])

‎scorep/trace.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ def user_region_begin(self, name, file_name=None, line_number=None):
135135

136136
def user_region_end(self, name):
137137
self.scorep_bindings.region_end("user", name)
138-
138+
139139
def rewind_begin(self, name, file_name=None, line_number=None):
140140
"""
141141
Begin of an Rewind region. If file_name or line_number is None, both will
@@ -162,7 +162,6 @@ def rewind_end(self, name, value):
162162
@param value True or False, whenether the region shall be rewinded or not.
163163
"""
164164
self.scorep_bindings.rewind_end(name, value)
165-
166165

167166
def oa_region_begin(self, name, file_name=None, line_number=None):
168167
"""

‎scorep/user.py‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ def region_begin(name, file_name=None, line_number=None):
2929
def region_end(name):
3030
global_trace.user_region_end(name)
3131

32+
3233
def rewind_begin(name, file_name=None, line_number=None):
3334
"""
3435
Begin of an User region. If file_name or line_number is None, both will
@@ -56,9 +57,10 @@ def rewind_end(name, value):
5657
End of an Rewind region.
5758
@param name name of the user region
5859
@param value True or False, whenether the region shall be rewinded or not.
59-
"""
60+
"""
6061
global_trace.rewind_end(name, value)
6162

63+
6264
def oa_region_begin(name, file_name=None, line_number=None):
6365
global_trace.unregister()
6466
"""
@@ -84,21 +86,24 @@ def oa_region_begin(name, file_name=None, line_number=None):
8486
def oa_region_end(name):
8587
global_trace.oa_region_end(name)
8688

89+
8790
def register():
8891
"""
8992
Reenables the python-tracing.
90-
"""
93+
"""
9194
global_trace.register()
92-
95+
96+
9397
def unregister():
9498
"""
9599
Disables the python-tracing.
96100
Disabling the python-tracing is more efficient than disable_recording, as python does not longer call the tracing module.
97101
However, all the other things that are traced by Score-P will still be recorded.
98-
Please call register() to enable tracing again.
99-
"""
102+
Please call register() to enable tracing again.
103+
"""
100104
global_trace.unregister()
101105

106+
102107
def enable_recording():
103108
global_trace.user_enable_recording()
104109

‎test/test.py‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
import sys
88
import pkgutil
99

10-
def call(arguments, env = os.environ.copy()):
10+
11+
def call(arguments, env=os.environ.copy()):
1112
"""
1213
return a triple with (returncode, stdout, stderr) from the call to subprocess
1314
"""
@@ -37,7 +38,7 @@ def call(arguments, env = os.environ.copy()):
3738
class TestScorepBindingsPython(unittest.TestCase):
3839
maxDiff = None
3940
python = sys.executable
40-
41+
4142
def assertRegex(self, in1, in2):
4243
if sys.version_info > (3, 5):
4344
super().assertRegex(in1, in2)
@@ -67,19 +68,19 @@ def test_user_regions(self):
6768
out = call([self.python,
6869
"-m",
6970
"scorep",
70-
"--nopython",
71+
"--nopython",
7172
"test_user_regions.py"],
72-
env=env)
73+
env=env)
7374
std_out = out[1]
7475
std_err = out[2]
75-
76+
7677
self.assertEqual(std_err, self.expected_std_err)
7778
self.assertEqual(std_out, "hello world\n")
7879

7980
out = call(["otf2-print", trace_path])
8081
std_out = out[1]
8182
std_err = out[2]
82-
83+
8384
self.assertRegex(std_out,
8485
'ENTER[ ]*[0-9 ]*[0-9 ]*Region: "user:test_region"')
8586
self.assertRegex(std_out,
@@ -92,36 +93,35 @@ def test_user_rewind(self):
9293

9394
out = call([self.python,
9495
"-m",
95-
"scorep",
96+
"scorep",
9697
"test_user_rewind.py"],
97-
env=env)
98+
env=env)
9899
std_out = out[1]
99100
std_err = out[2]
100-
101+
101102
self.assertEqual(std_err, self.expected_std_err)
102103
self.assertEqual(std_out, "hello world\nhello world\n")
103104

104105
out = call(["otf2-print", trace_path])
105106
std_out = out[1]
106107
std_err = out[2]
107-
108+
108109
self.assertRegex(std_out,
109110
'MEASUREMENT_ON_OFF[ ]*[0-9 ]*[0-9 ]*Mode: OFF')
110111
self.assertRegex(std_out,
111112
'MEASUREMENT_ON_OFF[ ]*[0-9 ]*[0-9 ]*Mode: ON')
112113

113-
114114
def test_oa_regions(self):
115115
env = self.env
116116
env["SCOREP_EXPERIMENT_DIRECTORY"] += "/test_oa_regions"
117117
trace_path = env["SCOREP_EXPERIMENT_DIRECTORY"] + "/traces.otf2"
118-
118+
119119
out = call([self.python,
120120
"-m",
121121
"scorep",
122122
"--nopython",
123123
"test_oa_regions.py"],
124-
env=env)
124+
env=env)
125125
std_out = out[1]
126126
std_err = out[2]
127127

@@ -131,7 +131,7 @@ def test_oa_regions(self):
131131
out = call(["otf2-print", trace_path])
132132
std_out = out[1]
133133
std_err = out[2]
134-
134+
135135
self.assertEqual(std_err, "")
136136
self.assertRegex(std_out,
137137
'ENTER[ ]*[0-9 ]*[0-9 ]*Region: "test_region"')
@@ -148,28 +148,28 @@ def test_instrumentation(self):
148148
"scorep",
149149
"--nocompiler",
150150
"test_instrumentation.py"],
151-
env=env)
151+
env=env)
152152
std_out = out[1]
153153
std_err = out[2]
154-
154+
155155
self.assertEqual(std_err, self.expected_std_err)
156156
self.assertEqual(std_out, "hello world\nbaz\nbar\n")
157157

158158
out = call(["otf2-print", trace_path])
159159
std_out = out[1]
160160
std_err = out[2]
161-
161+
162162
self.assertEqual(std_err, "")
163163
self.assertRegex(std_out,
164164
'ENTER[ ]*[0-9 ]*[0-9 ]*Region: "__main__:foo"')
165165
self.assertRegex(std_out,
166166
'LEAVE[ ]*[0-9 ]*[0-9 ]*Region: "__main__:foo"')
167167

168-
@unittest.skipIf(len(pkgutil.extend_path([], "mpi4py")) == 0 or
168+
@unittest.skipIf(len(pkgutil.extend_path([], "mpi4py")) == 0 or
169169
len(pkgutil.extend_path([], "numpy")) == 0,
170170
"no mpi4py present")
171171
def test_mpi(self):
172-
172+
173173
env = self.env
174174
env["SCOREP_EXPERIMENT_DIRECTORY"] += "/test_mpi"
175175
trace_path = env["SCOREP_EXPERIMENT_DIRECTORY"] + "/traces.otf2"
@@ -182,18 +182,18 @@ def test_mpi(self):
182182
"--mpp=mpi",
183183
"--nocompiler",
184184
"test_mpi.py"],
185-
env=env)
186-
185+
env=env)
186+
187187
std_out = out[1]
188188
std_err = out[2]
189189

190190
expected_std_err = ""
191-
expected_std_out = "\[0[0-9]\] \[0. 1. 2. 3. 4.\]\\n\[0[0-9]] \[0. 1. 2. 3. 4.\]\\n"
191+
expected_std_out = r"\[0[0-9]\] \[0. 1. 2. 3. 4.\]\\n\[0[0-9]] \[0. 1. 2. 3. 4.\]\\n"
192192

193193
self.assertRegex(std_err,
194194
'\[Score-P\] [\w/.: ]*MPI_THREAD_FUNNELED')
195195
self.assertRegex(std_out, expected_std_out)
196-
196+
197197
expected_std_out
198198

199199
def test_call_main(self):
@@ -205,11 +205,11 @@ def test_call_main(self):
205205
"scorep",
206206
"--nocompiler",
207207
"test_call_main.py"],
208-
env=env)
208+
env=env)
209209
std_out = out[1]
210210
std_err = out[2]
211-
212-
expected_std_err = "scorep: Someone called scorep\.__main__\.main"
211+
212+
expected_std_err = r"scorep: Someone called scorep\.__main__\.main"
213213
expected_std_out = ""
214214
self.assertRegex(std_err, expected_std_err)
215215
self.assertEqual(std_out, expected_std_out)

‎test/test_user_rewind.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
import scorep.user
22

3+
34
def bar():
45
print("hello world")
56

7+
68
def foo():
79
bar()
810
scorep.user.rewind_begin("test_region")
911
bar()
10-
scorep.user.rewind_end("test_region",True)
12+
scorep.user.rewind_end("test_region", True)
13+
1114

1215
foo()

0 commit comments

Comments
 (0)