Merge pull request #132 from NanoNabla/pr_remove_oa

remove OA methods since they are removed in Score-P > 7.0

Author: AndreasGocht

scorep/_instrumenters/base_instrumenter.py

@@ -45,14 +45,6 @@ def rewind_begin(self, name, file_name=None, line_number=None):
     def rewind_end(self, name, value):
         pass
 
-    @abc.abstractmethod
-    def oa_region_begin(self, name, file_name=None, line_number=None):
-        pass
-
-    @abc.abstractmethod
-    def oa_region_end(self, name):
-        pass
-
     @abc.abstractmethod
     def user_enable_recording(self):
         pass

scorep/_instrumenters/dummy.py

@@ -35,12 +35,6 @@ def rewind_begin(self, name, file_name=None, line_number=None):
     def rewind_end(self, name, value):
         pass
 
-    def oa_region_begin(self, name, file_name=None, line_number=None):
-        pass
-
-    def oa_region_end(self, name):
-        pass
-
     def user_enable_recording(self):
         pass
 

scorep/_instrumenters/scorep_instrumenter.py

@@ -92,29 +92,6 @@ def rewind_end(self, name, value):
         """
         scorep._bindings.rewind_end(name, value)
 
-    def oa_region_begin(self, name, file_name=None, line_number=None):
-        """
-        Begin of an Online Access region. If file_name or line_number is None, both will
-        be determined automatically
-        @param name name of the user region
-        @param file_name file name of the user region
-        @param line_number line number of the user region
-        """
-        if file_name is None or line_number is None:
-            frame = inspect.currentframe().f_back
-            file_name = frame.f_globals.get('__file__', None)
-            line_number = frame.f_lineno
-        if file_name is not None:
-            full_file_name = os.path.abspath(file_name)
-        else:
-            full_file_name = "None"
-
-        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)
-
     def user_enable_recording(self):
         """Enable writing of trace events in ScoreP"""
         scorep._bindings.enable_recording()

scorep/user.py

@@ -166,34 +166,6 @@ def rewind_end(name, value):
     scorep.instrumenter.get_instrumenter().rewind_end(name, value)
 
 
-def oa_region_begin(name, file_name=None, line_number=None):
-    """
-    Begin of an Online Access region. If file_name or line_number is None, both will
-    be determined automatically
-    @param name name of the user region
-    @param file_name file name of the user region
-    @param line_number line number of the user region
-    """
-
-    with scorep.instrumenter.disable():
-
-        if file_name is None or line_number is None:
-            frame = inspect.currentframe().f_back
-            file_name = frame.f_globals.get('__file__', None)
-            line_number = frame.f_lineno
-        if file_name is not None:
-            full_file_name = os.path.abspath(file_name)
-        else:
-            full_file_name = "None"
-
-        scorep.instrumenter.get_instrumenter().oa_region_begin(
-            name, full_file_name, line_number)
-
-
-def oa_region_end(name):
-    scorep.instrumenter.get_instrumenter().oa_region_end(name)
-
-
 def enable_recording():
     scorep.instrumenter.get_instrumenter().user_enable_recording()
 

src/methods.cpp

@@ -113,32 +113,6 @@ extern "C"
         Py_RETURN_NONE;
     }
 
-    static PyObject* oa_region_begin(PyObject* self, PyObject* args)
-    {
-        const char* region;
-        const char* file_name;
-        std::uint64_t line_number = 0;
-
-        if (!PyArg_ParseTuple(args, "ssK", &region, &file_name, &line_number))
-            return NULL;
-
-        scorepy::oa_region_begin(region, file_name, line_number);
-
-        Py_RETURN_NONE;
-    }
-
-    static PyObject* oa_region_end(PyObject* self, PyObject* args)
-    {
-        const char* region;
-
-        if (!PyArg_ParseTuple(args, "s", &region))
-            return NULL;
-
-        scorepy::oa_region_end(region);
-
-        Py_RETURN_NONE;
-    }
-
     static PyObject* parameter_string(PyObject* self, PyObject* args)
     {
         const char* name;
@@ -211,8 +185,6 @@ extern "C"
         { "region_end", region_end, METH_VARARGS, "exit a region." },
         { "rewind_begin", rewind_begin, METH_VARARGS, "rewind begin." },
         { "rewind_end", rewind_end, METH_VARARGS, "rewind end." },
-        { "oa_region_begin", oa_region_begin, METH_VARARGS, "enter an online access region." },
-        { "oa_region_end", oa_region_end, METH_VARARGS, "exit an online access region." },
         { "enable_recording", enable_recording, METH_VARARGS, "disable scorep recording." },
         { "disable_recording", disable_recording, METH_VARARGS, "disable scorep recording." },
         { "parameter_int", parameter_int, METH_VARARGS, "User parameter int." },

src/scorepy/events.cpp

@@ -180,17 +180,4 @@ void parameter_string(std::string name, std::string value)
     SCOREP_User_ParameterString(&scorep_param, name.c_str(), value.c_str());
 }
 
-void oa_region_begin(std::string region_name, std::string file_name, std::uint64_t line_number)
-{
-    auto& handle = user_regions[region_name];
-    SCOREP_User_OaPhaseBegin(&handle.value, NULL, NULL, region_name.c_str(),
-                             SCOREP_USER_REGION_TYPE_FUNCTION, file_name.c_str(), line_number);
-}
-
-void oa_region_end(std::string region_name)
-{
-    auto& handle = user_regions[region_name];
-    SCOREP_User_OaPhaseEnd(handle.value);
-}
-
 } // namespace scorepy

src/scorepy/events.hpp

@@ -35,6 +35,4 @@ void parameter_int(std::string name, int64_t value);
 void parameter_uint(std::string name, uint64_t value);
 void parameter_string(std::string name, std::string value);
 
-void oa_region_begin(std::string region_name, std::string file_name, std::uint64_t line_number);
-void oa_region_end(std::string region_name);
 } // namespace scorepy

test/cases/oa_regions.py

@@ -200,26 +200,6 @@ def test_user_rewind(scorep_env, instrumenter):
     assert re.search("MEASUREMENT_ON_OFF[ ]*[0-9 ]*[0-9 ]*Mode: ON", std_out)
 
 
-@foreach_instrumenter
-def test_oa_regions(scorep_env, instrumenter):
-    trace_path = get_trace_path(scorep_env)
-
-    std_out, std_err = call_with_scorep(
-        "cases/oa_regions.py",
-        ["--nopython", "--instrumenter-type=" + instrumenter],
-        env=scorep_env,
-    )
-
-    assert std_err == ""
-    assert std_out == "hello world\n"
-
-    std_out, std_err = call(["otf2-print", trace_path])
-
-    assert std_err == ""
-    assert re.search('ENTER[ ]*[0-9 ]*[0-9 ]*Region: "test_region"', std_out)
-    assert re.search('LEAVE[ ]*[0-9 ]*[0-9 ]*Region: "test_region"', std_out)
-
-
 @pytest.mark.parametrize("instrumenter", ALL_INSTRUMENTERS + [None])
 def test_instrumentation(scorep_env, instrumenter):
     trace_path = get_trace_path(scorep_env)