Import bindings as scorep._bindings

Author: Flamefire

scorep/_instrumenters/scorep_cProfile.py

@@ -1,10 +1,10 @@
 from scorep._instrumenters.scorep_instrumenter import ScorepInstrumenter
-from scorep import _bindings as scorep_bindings
+import scorep._bindings
 
 
-class ScorepCProfile(scorep_bindings.CInstrumenter, ScorepInstrumenter):
+class ScorepCProfile(scorep._bindings.CInstrumenter, ScorepInstrumenter):
     def __init__(self, enable_instrumenter):
-        scorep_bindings.CInstrumenter.__init__(self, tracingOrProfiling=False)
+        scorep._bindings.CInstrumenter.__init__(self, tracingOrProfiling=False)
         ScorepInstrumenter.__init__(self, enable_instrumenter)
 
     def _enable_instrumenter(self):

scorep/_instrumenters/scorep_cTrace.py

@@ -1,10 +1,10 @@
 from scorep._instrumenters.scorep_instrumenter import ScorepInstrumenter
-from scorep import _bindings as scorep_bindings
+import scorep._bindings
 
 
-class ScorepCTrace(scorep_bindings.CInstrumenter, ScorepInstrumenter):
+class ScorepCTrace(scorep._bindings.CInstrumenter, ScorepInstrumenter):
     def __init__(self, enable_instrumenter):
-        scorep_bindings.CInstrumenter.__init__(self, tracingOrProfiling=True)
+        scorep._bindings.CInstrumenter.__init__(self, tracingOrProfiling=True)
         ScorepInstrumenter.__init__(self, enable_instrumenter)
 
     def _enable_instrumenter(self):

scorep/_instrumenters/scorep_instrumenter.py

@@ -2,7 +2,7 @@
 import inspect
 import os
 from scorep._instrumenters import base_instrumenter
-from scorep import _bindings as scorep_bindings
+import scorep._bindings
 
 
 class ScorepInstrumenter(base_instrumenter.BaseInstrumenter):
@@ -64,12 +64,12 @@ def run(self, cmd, globals=None, locals=None):
 
     def region_begin(self, module_name, function_name, file_name, line_number):
         """Record a region begin event"""
-        scorep_bindings.region_begin(
+        scorep._bindings.region_begin(
             module_name, function_name, file_name, line_number)
 
     def region_end(self, module_name, function_name):
         """Record a region end event"""
-        scorep_bindings.region_end(module_name, function_name)
+        scorep._bindings.region_end(module_name, function_name)
 
     def rewind_begin(self, name, file_name=None, line_number=None):
         """
@@ -88,15 +88,15 @@ def rewind_begin(self, name, file_name=None, line_number=None):
         else:
             full_file_name = "None"
 
-        scorep_bindings.rewind_begin(name, full_file_name, line_number)
+        scorep._bindings.rewind_begin(name, full_file_name, line_number)
 
     def rewind_end(self, name, value):
         """
         End of an Rewind region.
         @param name name of the user region
         @param value True or False, whenether the region shall be rewinded or not.
         """
-        scorep_bindings.rewind_end(name, value)
+        scorep._bindings.rewind_end(name, value)
 
     def oa_region_begin(self, name, file_name=None, line_number=None):
         """
@@ -115,28 +115,28 @@ def oa_region_begin(self, name, file_name=None, line_number=None):
         else:
             full_file_name = "None"
 
-        scorep_bindings.oa_region_begin(name, full_file_name, line_number)
+        scorep._bindings.oa_region_begin(name, full_file_name, line_number)
 
     def oa_region_end(self, name):
         """End an Online Access region."""
-        scorep_bindings.oa_region_end(name)
+        scorep._bindings.oa_region_end(name)
 
     def user_enable_recording(self):
         """Enable writing of trace events in ScoreP"""
-        scorep_bindings.enable_recording()
+        scorep._bindings.enable_recording()
 
     def user_disable_recording(self):
         """Disable writing of trace events in ScoreP"""
-        scorep_bindings.disable_recording()
+        scorep._bindings.disable_recording()
 
     def user_parameter_int(self, name, val):
         """Record a parameter of type integer"""
-        scorep_bindings.parameter_int(name, val)
+        scorep._bindings.parameter_int(name, val)
 
     def user_parameter_uint(self, name, val):
         """Record a parameter of type unsigned integer"""
-        scorep_bindings.parameter_string(name, val)
+        scorep._bindings.parameter_string(name, val)
 
     def user_parameter_string(self, name, string):
         """Record a parameter of type string"""
-        scorep_bindings.parameter_string(name, string)
+        scorep._bindings.parameter_string(name, string)

scorep/_instrumenters/scorep_profile.py

@@ -3,7 +3,7 @@
 import sys
 from scorep._instrumenters.utils import get_module_name, get_file_name
 from scorep._instrumenters.scorep_instrumenter import ScorepInstrumenter
-from scorep import _bindings as scorep_bindings
+import scorep._bindings
 
 try:
     import threading
@@ -42,9 +42,9 @@ def _globaltrace(self, frame, why, arg):
             if not code.co_name == "_unsetprofile" and not modulename[:6] == "scorep":
                 full_file_name = get_file_name(frame)
                 line_number = code.co_firstlineno
-                scorep_bindings.region_begin(modulename, code.co_name, full_file_name, line_number)
+                scorep._bindings.region_begin(modulename, code.co_name, full_file_name, line_number)
         elif why == 'return':
             code = frame.f_code
             modulename = get_module_name(frame)
             if not code.co_name == "_unsetprofile" and not modulename[:6] == "scorep":
-                scorep_bindings.region_end(modulename, code.co_name)
+                scorep._bindings.region_end(modulename, code.co_name)

scorep/_instrumenters/scorep_trace.py

@@ -3,7 +3,7 @@
 import sys
 from scorep._instrumenters.utils import get_module_name, get_file_name
 from scorep._instrumenters.scorep_instrumenter import ScorepInstrumenter
-from scorep import _bindings as scorep_bindings
+import scorep._bindings
 
 try:
     import threading
@@ -40,13 +40,13 @@ def _globaltrace(self, frame, why, arg):
             if not code.co_name == "_unsettrace" and not modulename[:6] == "scorep":
                 full_file_name = get_file_name(frame)
                 line_number = code.co_firstlineno
-                scorep_bindings.region_begin(modulename, code.co_name, full_file_name, line_number)
+                scorep._bindings.region_begin(modulename, code.co_name, full_file_name, line_number)
                 return self._localtrace
         return None
 
     def _localtrace(self, frame, why, arg):
         if why == 'return':
             code = frame.f_code
             modulename = get_module_name(frame)
-            scorep_bindings.region_end(modulename, code.co_name)
+            scorep._bindings.region_end(modulename, code.co_name)
         return self._localtrace