Resolve new merge conflict after pull

Author: vlkale

profiling/memory-usage/kp_memory_usage.cpp

@@ -67,12 +67,17 @@ void kokkosp_finalize_library() {
   int pid = getpid();
 
   for (int s = 0; s < num_spaces; s++) {
-    char* fileOutput = (char*)malloc(sizeof(char) * 256);
+    char* fileOutput      = (char*)malloc(sizeof(char) * 256);
+    char* fileOutputxfers = (char*)malloc(sizeof(char) * 256);
+
     snprintf(fileOutput, 256, "%s-%d-%s.memspace_usage", hostname, pid,
              space_name[s]);
 
-    FILE* ofile = fopen(fileOutput, "wb");
+    snprintf(fileOutputxfers, 256, "%s-%d.memspace_transfers", hostname, pid);
+    FILE* ofile   = fopen(fileOutput, "wb");
+    FILE* ofilexf = fopen(fileOutputxfers, "wb");
     free(fileOutput);
+    free(fileOutputxfers);
 
     fprintf(ofile, "# Space %s\n", space_name[s]);
     fprintf(ofile,
@@ -89,10 +94,9 @@ void kokkosp_finalize_library() {
     }
 
     fprintf(ofile, "# Data transferred between Kokkos Memory Spaces --- \n");
-    for (unsigned int dst = 0; dst <  (unsigned int) num_spaces; dst++) {
-      for (unsigned int src = 0; src < (unsigned int) num_spaces; src++) {
+    for (unsigned int dst = 0; (unsigned int) dst < num_spaces; dst++) {
+      for (unsigned int src = 0; (unsigned int) src < num_spaces; src++) {
         fprintf(ofile, "# Dst Mem Space     Src Mem Space    Total Data-Transferred(MB)\n");
-
         fprintf(ofile, "%s %s %.1lf \n", space_name[dst], space_name[src],
                 1.0 * totalMemoryTransferred[dst][src] / 1024 / 1024);
       }
@@ -169,7 +173,7 @@ void kokkosp_begin_deep_copy(SpaceHandle dst_handle, const char* /* dst_name */,
   totalMemoryTransferred[space_dst][space_src] += size;
 }
 
-void kokkosp_end_deep_copy() { std::lock_guard<std::mutex> lock(m); }
+void kokkosp_end_deep_copy() {}
 
 Kokkos::Tools::Experimental::EventSet get_event_set() {
   Kokkos::Tools::Experimental::EventSet my_event_set;