build fix

hariharan-devarajan · Oct 8, 2023 · 0bea457 · 0bea457
1 parent 3d8d299
commit 0bea457
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 15 deletions.
diff --git 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.dir == 'clone'
         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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → src/dlio_profiler/core/typedef.h b/include/dlio_profiler/typedef.h → src/dlio_profiler/core/typedef.h
diff --git 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
@@ -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
@@ -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
@@ -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/py/requirements.txt b/test/py/requirements.txt
@@ -0,0 +1,2 @@
+numpy
+Pillow