fix: windows compile bug

UbiquitousLearning · Sep 22, 2024 · 6da1f06 · 6da1f06
1 parent a5ed585
commit 6da1f06
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 4 deletions.
diff --git a/src/Tensor.hpp b/src/Tensor.hpp
@@ -945,7 +945,9 @@ class Tensor {
                 }
             }
         }
-        for (auto &child_tensor : child_tensors_) {
+        auto it = child_tensors_.begin();
+        while (it != child_tensors_.end()) {
+            auto &child_tensor = *it;
             auto origin_shape_offset = child_tensor->shapeOffset();
             if (!origin_shape_offset.empty()) {
                 if (!shape_offset.empty()) {
@@ -957,7 +959,7 @@ class Tensor {
             } else {
                 child_tensor->deepCopyFrom(source, false, {}, head_rep);
             }
-            child_tensors_.erase(std::remove(child_tensors_.begin(), child_tensors_.end(), child_tensor), child_tensors_.end());
+            it = child_tensors_.erase(it);
         }
         source->addChildTensor(this);
     }

diff --git a/src/backends/cpu/CMakeLists.txt b/src/backends/cpu/CMakeLists.txt
@@ -54,7 +54,7 @@ if(OpenMP_FOUND)
     message(STATUS "found openmp")
     if(ARM AND NOT APK)
         message(STATUS "[ARM]  found openmp")
-        target_compile_options(MLLM_CPU PRIVATE -fopenmp)
+        target_compile_options(MLLM_CPU PUBLIC -fopenmp)
         target_link_libraries(MLLM_CPU PUBLIC -fopenmp -static-openmp)
     else()
     target_link_libraries(MLLM_CPU

diff --git a/src/models/llava/processing_llava.hpp b/src/models/llava/processing_llava.hpp
@@ -8,6 +8,7 @@
 #include "processor/ClipPreProcess.hpp"
 #include <numeric>
 #include <utility>
+#include <array>
 
 using namespace mllm;
 

diff --git a/src/processor/AudioProcess.cpp b/src/processor/AudioProcess.cpp
@@ -4,6 +4,7 @@
 
 #include "AudioProcess.hpp"
 #include <iomanip>
+#include <numeric>
 #include <utility>
 #include <iostream>
 #include <memory>

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -34,6 +34,7 @@ target_link_libraries(
         MLLM_TEST
         GTest::gtest_main
         MLLM_CPU
+        -fopenmp
 )
 add_executable(
         memoryPoolTest

diff --git a/tools/convertor/requirements.txt b/tools/convertor/requirements.txt
@@ -1,2 +1,3 @@
 torch
-numpy
+numpy
+safetensors