more python 3 stuff + extra flag for vtune to avoid segfault

python/MooreTests/make_profile_plots.py

@@ -74,7 +74,7 @@ def main(results_dir, listOfLogs, hltlabel, throughput, ht_file, heaptrack):
             '--minwidth', '2', '--width', '1600', '--countname', 'Allocations'], stdin=inp, stdout=out)
 
     ## reads the text logs and extracts timing shares of different steps of the algorithm
-    import readTimingTable
+    from MooreTests import readTimingTable
     timingTable = readTimingTable.readTimings(hltlabel, listOfLogs)
 
     # last entry in the sorted list will always be the total time so let's remove that one
@@ -186,7 +186,7 @@ if __name__ == '__main__':
     parser.add_argument(
         '--heaptrack',
         type=str,
-        required=True,
+        required=False,
         help='Enable heaptrack profiling by providing path to executable')
 
     args = parser.parse_args()

python/MooreTests/readTimingTable.py

@@ -88,7 +88,7 @@ def parseTimingTable(log_fn):
     df = df.drop(columns=["Unnamed: 0", "Unnamed: 5"])
     df.columns = ["name", "count", "total_time", "average_time"]
     df.set_index("name")
-    df.name = map(lambda x: x.strip('"'), df.name)
+    df.name = df.name.apply(lambda x: x.strip('"'))
     return df
 
 

python/MooreTests/run_throughput_jobs.py

@@ -202,7 +202,7 @@ options.input_files = {inputs!r}
         subprocess.Popen(["sleep", "60"]).wait()
 
         prof_cmd = [
-            "amplxe-cl", "-collect hotspots", "-d", "60", "-target-pid=",
+            "amplxe-cl", "-run-pass-thru=--no-altstack", "-collect hotspots", "-d", "60", "-target-pid=",
             str(process.pid), "-r", "profile_out"
         ]
         # At the end of collection the executable above does some preproscessing,
@@ -252,7 +252,7 @@ options.input_files = {inputs!r}
         logging.info("Making profile plots")
         for s in args.options:
             hlt_label = "HLT1" if "hlt1" in s.lower() else "HLT2"
-        import make_profile_plots
+        from MooreTests import make_profile_plots
         make_profile_plots.main("profile_out", [log_filename], hlt_label,
                                 parsed_throughput, ht_file, args.heaptrack)