From 056d1781600a6d554fe378555fca79f5d7cc64bc Mon Sep 17 00:00:00 2001 From: caitianchi Date: Wed, 29 May 2024 00:18:17 +0800 Subject: [PATCH] rename wrapper --- Makefile | 6 +++--- examples/minicpmv/CMakeLists.txt | 8 ++++---- examples/minicpmv/minicpmv-cli.cpp | 2 +- .../minicpmv/{minicpmv_io.cpp => minicpmv_wrapper.cpp} | 2 +- examples/minicpmv/{minicpmv_io.h => minicpmv_wrapper.h} | 0 5 files changed, 9 insertions(+), 9 deletions(-) rename examples/minicpmv/{minicpmv_io.cpp => minicpmv_wrapper.cpp} (99%) rename examples/minicpmv/{minicpmv_io.h => minicpmv_wrapper.h} (100%) diff --git a/Makefile b/Makefile index b34a868d3..963d7e175 100644 --- a/Makefile +++ b/Makefile @@ -859,12 +859,12 @@ llava-cli: examples/llava/llava-cli.cpp examples/llava/clip.h examples/llava/cli $(CXX) $(CXXFLAGS) -c examples/llava/llava.cpp -o $(call GET_OBJ_FILE, examples/llava/llava.cpp) $(CXX) $(CXXFLAGS) $(filter-out %.h $< examples/llava/clip.cpp examples/llava/llava.cpp,$^) $(call GET_OBJ_FILE, $<) $(call GET_OBJ_FILE, examples/llava/clip.cpp) $(call GET_OBJ_FILE, examples/llava/llava.cpp) -o $@ $(LDFLAGS) -minicpmv-cli: examples/minicpmv/minicpmv-cli.cpp examples/minicpmv/clip.h examples/minicpmv/clip.cpp examples/minicpmv/minicpmv.h examples/minicpmv/minicpmv.cpp examples/minicpmv/minicpmv_io.h examples/minicpmv/minicpmv_io.cpp ggml.o llama.o $(COMMON_DEPS) $(OBJS) +minicpmv-cli: examples/minicpmv/minicpmv-cli.cpp examples/minicpmv/clip.h examples/minicpmv/clip.cpp examples/minicpmv/minicpmv.h examples/minicpmv/minicpmv.cpp examples/minicpmv/minicpmv_wrapper.h examples/minicpmv/minicpmv_wrapper.cpp ggml.o llama.o $(COMMON_DEPS) $(OBJS) $(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<) $(CXX) $(CXXFLAGS) -c examples/minicpmv/clip.cpp -o $(call GET_OBJ_FILE, examples/minicpmv/clip.cpp) -Wno-cast-qual $(CXX) $(CXXFLAGS) -c examples/minicpmv/minicpmv.cpp -o $(call GET_OBJ_FILE, examples/minicpmv/minicpmv.cpp) - $(CXX) $(CXXFLAGS) -c examples/minicpmv/minicpmv_io.cpp -o $(call GET_OBJ_FILE, examples/minicpmv/minicpmv_io.cpp) - $(CXX) $(CXXFLAGS) $(filter-out %.h $< examples/minicpmv/clip.cpp examples/minicpmv/minicpmv.cpp examples/minicpmv/minicpmv_io.cpp,$^) $(call GET_OBJ_FILE, $<) $(call GET_OBJ_FILE, examples/minicpmv/clip.cpp) $(call GET_OBJ_FILE, examples/minicpmv/minicpmv.cpp) $(call GET_OBJ_FILE, examples/minicpmv/minicpmv_io.cpp) -o $@ $(LDFLAGS) + $(CXX) $(CXXFLAGS) -c examples/minicpmv/minicpmv_wrapper.cpp -o $(call GET_OBJ_FILE, examples/minicpmv/minicpmv_wrapper.cpp) + $(CXX) $(CXXFLAGS) $(filter-out %.h $< examples/minicpmv/clip.cpp examples/minicpmv/minicpmv.cpp examples/minicpmv/minicpmv_wrapper.cpp,$^) $(call GET_OBJ_FILE, $<) $(call GET_OBJ_FILE, examples/minicpmv/clip.cpp) $(call GET_OBJ_FILE, examples/minicpmv/minicpmv.cpp) $(call GET_OBJ_FILE, examples/minicpmv/minicpmv_wrapper.cpp) -o $@ $(LDFLAGS) baby-llama: examples/baby-llama/baby-llama.cpp ggml.o llama.o $(COMMON_DEPS) train.o $(OBJS) $(CXX) $(CXXFLAGS) -c $< -o $(call GET_OBJ_FILE, $<) diff --git a/examples/minicpmv/CMakeLists.txt b/examples/minicpmv/CMakeLists.txt index 36ba2fe34..7f6f3f693 100644 --- a/examples/minicpmv/CMakeLists.txt +++ b/examples/minicpmv/CMakeLists.txt @@ -33,10 +33,10 @@ endif() set(TARGET minicpmv-cli) add_executable(minicpmv-cli minicpmv-cli.cpp) install(TARGETS minicpmv-cli RUNTIME) -target_link_libraries(minicpmv-cli PRIVATE common minicpmv_io minicpmv ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(minicpmv-cli PRIVATE common minicpmv_wrapper minicpmv ${CMAKE_THREAD_LIBS_INIT}) target_compile_features(minicpmv PRIVATE cxx_std_11) -add_library(minicpmv_io OBJECT - minicpmv_io.cpp +add_library(minicpmv_wrapper OBJECT + minicpmv_wrapper.cpp ) -target_link_libraries(minicpmv_io PRIVATE minicpmv ${CMAKE_THREAD_LIBS_INIT}) \ No newline at end of file +target_link_libraries(minicpmv_wrapper PRIVATE minicpmv ${CMAKE_THREAD_LIBS_INIT}) \ No newline at end of file diff --git a/examples/minicpmv/minicpmv-cli.cpp b/examples/minicpmv/minicpmv-cli.cpp index e9cd526b7..281b8d097 100644 --- a/examples/minicpmv/minicpmv-cli.cpp +++ b/examples/minicpmv/minicpmv-cli.cpp @@ -3,7 +3,7 @@ #include "common.h" #include "clip.h" #include "minicpmv.h" -#include "minicpmv_io.h" +#include "minicpmv_wrapper.h" #include "llama.h" #include diff --git a/examples/minicpmv/minicpmv_io.cpp b/examples/minicpmv/minicpmv_wrapper.cpp similarity index 99% rename from examples/minicpmv/minicpmv_io.cpp rename to examples/minicpmv/minicpmv_wrapper.cpp index 65fdb7745..5e3a572a8 100644 --- a/examples/minicpmv/minicpmv_io.cpp +++ b/examples/minicpmv/minicpmv_wrapper.cpp @@ -2,7 +2,7 @@ #include "common.h" #include "clip.h" #include "minicpmv.h" -#include "minicpmv_io.h" +#include "minicpmv_wrapper.h" #include "llama.h" #include #include diff --git a/examples/minicpmv/minicpmv_io.h b/examples/minicpmv/minicpmv_wrapper.h similarity index 100% rename from examples/minicpmv/minicpmv_io.h rename to examples/minicpmv/minicpmv_wrapper.h