From 99da8524508e43562c8fcce8c352eabddaa31875 Mon Sep 17 00:00:00 2001
From: Hariharan Devarajan <mani.hariharan@gmail.com>
Date: Sun, 8 Oct 2023 02:19:07 -0700
Subject: [PATCH] build ci

---
 .github/workflows/ci.yml                                 | 8 +++-----
 CMakeLists.txt                                           | 2 +-
 include/dlio_profiler/dlio_profiler.h                    | 9 +++++++--
 src/dlio_profiler/brahma/posix.h                         | 2 +-
 src/dlio_profiler/brahma/stdio.h                         | 2 +-
 src/dlio_profiler/core/dlio_profiler_main.h              | 2 +-
 .../dlio_profiler => src/dlio_profiler/core}/typedef.h   | 0
 src/dlio_profiler/dlio_logger.h                          | 2 +-
 src/dlio_profiler/utils/utils.h                          | 2 +-
 src/dlio_profiler/writer/base_writer.h                   | 2 +-
 src/dlio_profiler/writer/chrome_writer.cpp               | 2 +-
 test/CMakeLists.txt                                      | 4 ++--
 test/py/requirements.txt                                 | 2 ++
 13 files changed, 22 insertions(+), 17 deletions(-)
 rename {include/dlio_profiler => src/dlio_profiler/core}/typedef.h (100%)
 create mode 100644 test/py/requirements.txt

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bd2a14aa..0f60ec02 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,13 +48,11 @@ jobs:
              echo pip install -v ${LOC}
              sudo pip install -v ${LOC}
           fi
-      - name: Build through cmake
-        run: |
-          mkdir build
-          cmake --build build
       - name: Test ctest
+        if: matrix.os == 'ubuntu-22.04' && matrix.dir == 'clone' && matrix.perm == 'user'
         run: |
-          cd build
+          pip install -r test/py/requirements.txt
+          cd build/temp*/dlio_profiler_py
           ctest -VV
       - name: Test DLIO_Benchmark
         if: matrix.os == 'ubuntu-22.04' && matrix.perm == 'root'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a80b195c..d85fa879 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -143,9 +143,9 @@ set(DLIO_PROFILER_CORE_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/dlio_profiler/brahma/
         ${CMAKE_CURRENT_SOURCE_DIR}/src/dlio_profiler/utils/posix_internal.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/dlio_profiler/dlio_profiler.cpp)
 set(DLIO_PROFILER_CORE_PUBLIC_INCLUDE
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/dlio_profiler/typedef.h
         ${CMAKE_CURRENT_SOURCE_DIR}/include/dlio_profiler/dlio_profiler.h)
 set(DLIO_PROFILER_CORE_PRIVATE_INCLUDE
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/dlio_profiler/typedef.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/dlio_profiler/core/dlio_profiler_main.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/dlio_profiler/core/constants.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/dlio_profiler/utils/posix_internal.h
diff --git a/include/dlio_profiler/dlio_profiler.h b/include/dlio_profiler/dlio_profiler.h
index 8c2ee3d2..0a8bc46c 100644
--- a/include/dlio_profiler/dlio_profiler.h
+++ b/include/dlio_profiler/dlio_profiler.h
@@ -8,7 +8,7 @@
 /**
  * Common to both C and CPP
  */
-#include <dlio_profiler/typedef.h>
+#include <dlio_profiler/core/typedef.h>
 #include <dlio_profiler/core/constants.h>
 #ifdef __cplusplus
 /**
@@ -33,7 +33,12 @@ class DLIOProfiler {
       dlio_profiler_core = DLIO_PROFILER_MAIN_SINGLETON(ProfilerStage::PROFILER_OTHER, ProfileType::PROFILER_CPP_APP);
       start_time = dlio_profiler_core->get_time();
     }
-    inline void update(const char* key, std::any& value) {
+    inline void update(const char* key, int value) {
+      if (dlio_profiler_core->is_active()) {
+        metadata.insert_or_assign(key, value);
+      }
+    }
+    inline void update(const char* key, const char* value) {
       if (dlio_profiler_core->is_active()) {
         metadata.insert_or_assign(key, value);
       }
diff --git a/src/dlio_profiler/brahma/posix.h b/src/dlio_profiler/brahma/posix.h
index e5b29cd1..8644a9ba 100644
--- a/src/dlio_profiler/brahma/posix.h
+++ b/src/dlio_profiler/brahma/posix.h
@@ -8,7 +8,7 @@
 #include <dlio_profiler/utils/utils.h>
 #include <brahma/brahma.h>
 #include <dlio_profiler/dlio_logger.h>
-#include <dlio_profiler/macro.h>
+#include <dlio_profiler/core/macro.h>
 #include <fcntl.h>
 #include <filesystem>
 #include <fstream>
diff --git a/src/dlio_profiler/brahma/stdio.h b/src/dlio_profiler/brahma/stdio.h
index 40101a48..22cfd4af 100644
--- a/src/dlio_profiler/brahma/stdio.h
+++ b/src/dlio_profiler/brahma/stdio.h
@@ -7,7 +7,7 @@
 #include <dlio_profiler/utils/utils.h>
 #include <brahma/brahma.h>
 #include <dlio_profiler/dlio_logger.h>
-#include <dlio_profiler/macro.h>
+#include <dlio_profiler/core/macro.h>
 #include <fcntl.h>
 #include <filesystem>
 #include <fstream>
diff --git a/src/dlio_profiler/core/dlio_profiler_main.h b/src/dlio_profiler/core/dlio_profiler_main.h
index df313d70..6e277e50 100644
--- a/src/dlio_profiler/core/dlio_profiler_main.h
+++ b/src/dlio_profiler/core/dlio_profiler_main.h
@@ -10,7 +10,7 @@
 
 #include <cpp-logger/logger.h>
 #include <dlio_profiler/core/constants.h>
-#include <dlio_profiler/macro.h>
+#include <dlio_profiler/core/macro.h>
 #include <dlio_profiler/brahma/posix.h>
 #include <dlio_profiler/brahma/stdio.h>
 #include <dlio_profiler/dlio_logger.h>
diff --git a/include/dlio_profiler/typedef.h b/src/dlio_profiler/core/typedef.h
similarity index 100%
rename from include/dlio_profiler/typedef.h
rename to src/dlio_profiler/core/typedef.h
diff --git a/src/dlio_profiler/dlio_logger.h b/src/dlio_profiler/dlio_logger.h
index ee4c2c2f..9e6cf202 100644
--- a/src/dlio_profiler/dlio_logger.h
+++ b/src/dlio_profiler/dlio_logger.h
@@ -12,7 +12,7 @@
 #include <dlio_profiler/writer/base_writer.h>
 #include <dlio_profiler/writer/chrome_writer.h>
 #include <unistd.h>
-#include <dlio_profiler/macro.h>
+#include <dlio_profiler/core/macro.h>
 #include <dlio_profiler/utils/utils.h>
 
 typedef std::chrono::high_resolution_clock chrono;
diff --git a/src/dlio_profiler/utils/utils.h b/src/dlio_profiler/utils/utils.h
index 5e2edb16..497c43d1 100644
--- a/src/dlio_profiler/utils/utils.h
+++ b/src/dlio_profiler/utils/utils.h
@@ -10,7 +10,7 @@
 #include <vector>
 #include <vector>
 #include <cstring>
-#include <dlio_profiler/macro.h>
+#include <dlio_profiler/core/macro.h>
 const std::string ignore_filenames[5] = {".pfw", "/pipe", "/socket","/proc/self", ".py"};
 inline std::vector<std::string> split(std::string str, char delimiter) {
   std::vector<std::string> res;
diff --git a/src/dlio_profiler/writer/base_writer.h b/src/dlio_profiler/writer/base_writer.h
index 59fdc217..e9bc56f7 100644
--- a/src/dlio_profiler/writer/base_writer.h
+++ b/src/dlio_profiler/writer/base_writer.h
@@ -9,7 +9,7 @@
 #include <dlio_profiler/utils/utils.h>
 #include <unordered_map>
 #include <dlio_profiler/utils/posix_internal.h>
-#include <dlio_profiler/typedef.h>
+#include <dlio_profiler/core/typedef.h>
 
 namespace dlio_profiler {
     class BaseWriter {
diff --git a/src/dlio_profiler/writer/chrome_writer.cpp b/src/dlio_profiler/writer/chrome_writer.cpp
index e372d922..2fb751c9 100644
--- a/src/dlio_profiler/writer/chrome_writer.cpp
+++ b/src/dlio_profiler/writer/chrome_writer.cpp
@@ -4,7 +4,7 @@
 
 #include <dlio_profiler/writer/chrome_writer.h>
 #include <fcntl.h>
-#include <dlio_profiler/macro.h>
+#include <dlio_profiler/core/macro.h>
 #include <cassert>
 #include <unistd.h>
 #include <thread>
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index e7b5d085..3f629ac8 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -39,7 +39,7 @@ add_test(check_file_exists_${test_name} ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_D
 set_tests_properties(check_file_exists_${test_name} PROPERTIES DEPENDS ${test_name})
 
 set(test_name test_cpp_basic_meta)
-add_test(${test_name} ${CMAKE_BINARY_DIR}/bin/test_basic ./data)
+add_test(${test_name} ${CMAKE_BINARY_DIR}/bin/test_cpp ./data)
 set_property(TEST ${test_name} APPEND PROPERTY ENVIRONMENT LD_PRELOAD=${CMAKE_BINARY_DIR}/lib/libdlio_profiler_preload.so)
 set_property(TEST ${test_name} APPEND PROPERTY ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib)
 set_property(TEST ${test_name} APPEND PROPERTY ENVIRONMENT DLIO_PROFILER_ENABLE=1)
@@ -53,7 +53,7 @@ add_test(check_file_exists_${test_name} ${BASH_PROGRAM} ${CMAKE_CURRENT_SOURCE_D
 set_tests_properties(check_file_exists_${test_name} PROPERTIES DEPENDS ${test_name})
 
 set(test_name test_cpp_basic_affinity)
-add_test(${test_name} ${CMAKE_BINARY_DIR}/bin/test_basic ./data)
+add_test(${test_name} ${CMAKE_BINARY_DIR}/bin/test_cpp ./data)
 set_property(TEST ${test_name} APPEND PROPERTY ENVIRONMENT LD_PRELOAD=${CMAKE_BINARY_DIR}/lib/libdlio_profiler_preload.so)
 set_property(TEST ${test_name} APPEND PROPERTY ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib)
 set_property(TEST ${test_name} APPEND PROPERTY ENVIRONMENT DLIO_PROFILER_ENABLE=1)
diff --git a/test/py/requirements.txt b/test/py/requirements.txt
new file mode 100644
index 00000000..ec184782
--- /dev/null
+++ b/test/py/requirements.txt
@@ -0,0 +1,2 @@
+numpy
+Pillow
\ No newline at end of file