Adapt to numpy NEP-18 (#65)

Together with the introduction of [NEP-18](https://numpy.org/neps/nep-0018-array-function-protocol.html) some numpy functions appeared the name `None:dot`. `None` is misleading. The solution discussed in #63 is to make the reference to numpy and the related function `__array_function__` explicit.

As we are already started using co_filename, we changed to co functions as well.

Author: AndreasGocht

scorep/instrumenters/scorep_profile.py

@@ -81,22 +81,30 @@ def globaltrace_lt(self, frame, why, arg):
             code = frame.f_code
             modulename = frame.f_globals.get('__name__', None)
             if modulename is None:
-                modulename = "None"
+                # this is a NUMPY special situation, see NEP-18, and Score-P Issue issues #63
+                if code.co_filename == "<__array_function__ internals>":
+                    modulename = "numpy.__array_function__"
+                else:
+                    modulename = "unkown"
             if not code.co_name == "_unsetprofile" and not modulename[:6] == "scorep":
-                file_name = frame.f_globals.get('__file__', None)
+                file_name = code.co_filename
                 if file_name is not None:
                     full_file_name = os.path.abspath(file_name)
                 else:
                     full_file_name = "None"
-                line_number = frame.f_lineno
+                line_number = code.co_firstlineno
                 self.scorep_bindings.region_begin(
                     modulename, code.co_name, full_file_name, line_number)
             return
         elif why == 'return':
             code = frame.f_code
             modulename = frame.f_globals.get('__name__', None)
             if modulename is None:
-                modulename = "None"
+                # this is a NUMPY special situation, see NEP-18, and Score-P Issue issues #63
+                if code.co_filename == "<__array_function__ internals>":
+                    modulename = "numpy.__array_function__"
+                else:
+                    modulename = "unkown"
             if not code.co_name == "_unsetprofile" and not modulename[:6] == "scorep":
                 self.scorep_bindings.region_end(modulename, code.co_name)
         else:

scorep/instrumenters/scorep_trace.py

@@ -80,14 +80,18 @@ def globaltrace_lt(self, frame, why, arg):
             code = frame.f_code
             modulename = frame.f_globals.get('__name__', None)
             if modulename is None:
-                modulename = "None"
+                # this is a NUMPY special situation, see NEP-18, and Score-P Issue issues #63
+                if code.co_filename == "<__array_function__ internals>":
+                    modulename = "numpy.__array_function__"
+                else:
+                    modulename = "unkown"
             if not code.co_name == "_unsettrace" and not modulename[:6] == "scorep":
-                file_name = frame.f_globals.get('__file__', None)
+                file_name = code.co_filename
                 if file_name is not None:
                     full_file_name = os.path.abspath(file_name)
                 else:
                     full_file_name = "None"
-                line_number = frame.f_lineno
+                line_number = code.co_firstlineno
                 self.scorep_bindings.region_begin(
                     modulename, code.co_name, full_file_name, line_number)
                 return self.localtrace
@@ -98,7 +102,11 @@ def localtrace_trace(self, frame, why, arg):
             code = frame.f_code
             modulename = frame.f_globals.get('__name__', None)
             if modulename is None:
-                modulename = "None"
+                # this is a NUMPY special situation, see NEP-18, and Score-P Issue issues #63
+                if code.co_filename == "<__array_function__ internals>":
+                    modulename = "numpy.__array_function__"
+                else:
+                    modulename = "unkown"
             self.scorep_bindings.region_end(modulename, code.co_name)
         return self.localtrace
 

test/test.py

@@ -326,6 +326,37 @@ def test_dummy(self):
                 env["SCOREP_EXPERIMENT_DIRECTORY"]),
             "Score-P directory exists for dummy test")
 
+    @unittest.skipIf(sys.version_info.major < 3, "not tested for python 2")
+    def test_numpy_dot(self):
+        env = self.env
+        env["SCOREP_EXPERIMENT_DIRECTORY"] += "/test_numpy_dot"
+        trace_path = env["SCOREP_EXPERIMENT_DIRECTORY"] + "/traces.otf2"
+
+        out = call([self.python,
+                    "-m",
+                    "scorep",
+                    "--nocompiler",
+                    "--noinstrumenter",
+                    "test_numpy_dot.py"],
+                   env=env)
+        std_out = out[1]
+        std_err = out[2]
+
+        self.assertEqual(std_out, "[[ 7 10]\n [15 22]]\n")
+        self.assertEqual(std_err, self.expected_std_err)
+        
+
+        out = call(["otf2-print", trace_path])
+        std_out = out[1]
+        std_err = out[2]
+
+        self.assertEqual(std_err, "")
+        self.assertRegex(std_out,
+                         'ENTER[ ]*[0-9 ]*[0-9 ]*Region: "numpy.__array_function__:dot"')
+        self.assertRegex(std_out,
+                         'LEAVE[ ]*[0-9 ]*[0-9 ]*Region: "numpy.__array_function__:dot"')
+
+
     def tearDown(self):
         #pass
         shutil.rmtree(

test/test_numpy_dot.py

@@ -0,0 +1,9 @@
+import numpy
+import scorep.instrumenter
+
+with scorep.instrumenter.enable():
+    a = [[1, 2],[3, 4]] 
+    b = [[1, 2],[3, 4]]
+    
+    c = numpy.dot(a,b)
+    print(c)