Skip to content

Commit

Permalink
rename lut to lutil (#98)
Browse files Browse the repository at this point in the history
  • Loading branch information
ling0322 authored Sep 27, 2024
1 parent d62435e commit 4870780
Show file tree
Hide file tree
Showing 143 changed files with 271 additions and 271 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ endif()

add_subdirectory("src")

set(libllm_LIBADD lut ${CMAKE_DL_LIBS})
set(libllm_LIBADD lutil ${CMAKE_DL_LIBS})

if(WITH_OPENMP)
set(libllm_LIBADD ${libllm_LIBADD} OpenMP::OpenMP_CXX)
Expand All @@ -102,7 +102,7 @@ endif()
set(unittest_LIBADD
libllm_static
libllm_test
lut_test
lutil_test
${libllm_LIBADD}
catch2)
if (WITH_MKL)
Expand Down Expand Up @@ -131,7 +131,7 @@ target_link_libraries(benchmark ${benchmark_LIBADD})
if (WITH_CUDA)
add_library(llmplugincublas SHARED $<TARGET_OBJECTS:llmplugincublas_static>)
target_include_directories(llmplugincublas PRIVATE ${libllm_INCDIR})
target_link_libraries(llmplugincublas lut CUDA::cublas)
target_link_libraries(llmplugincublas lutil CUDA::cublas)
if(UNIX AND NOT APPLE)
target_link_options(llmplugincublas PUBLIC "-Wl,--no-undefined")
endif()
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
add_subdirectory("lut")
add_subdirectory("lutil")
add_subdirectory("libllm")
2 changes: 1 addition & 1 deletion src/libllm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ if (WITH_CUDA)

set(llmplugincublas_SOURCES
"cuda/gemm_cublas.cc"
"../lut/internal/log.cc")
"../lutil/internal/log.cc")
endif()

# CPU specific code
Expand Down
8 changes: 4 additions & 4 deletions src/libllm/benchmark_main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
#include "libllm/llm.h"
#include "libllm/model_for_generation.h"
#include "libllm/operators.h"
#include "lut/error.h"
#include "lut/flags.h"
#include "lut/random.h"
#include "lut/time.h"
#include "lutil/error.h"
#include "lutil/flags.h"
#include "lutil/random.h"
#include "lutil/time.h"

constexpr int MagicNumber = 0x55aa;
constexpr double MaxWait = 10;
Expand Down
2 changes: 1 addition & 1 deletion src/libllm/bpe_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <memory>
#include <string>

#include "lut/ini_config.h"
#include "lutil/ini_config.h"

namespace libllm {

Expand Down
2 changes: 1 addition & 1 deletion src/libllm/bpe_encoder.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#include "libllm/bpe_encoder.h"

#include "lut/strings.h"
#include "lutil/strings.h"

namespace libllm {

Expand Down
4 changes: 2 additions & 2 deletions src/libllm/bpe_encoder.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

#include "libllm/bpe_config.h"
#include "libllm/bpe_model.h"
#include "lut/noncopyable.h"
#include "lut/pool.h"
#include "lutil/noncopyable.h"
#include "lutil/pool.h"

namespace libllm {

Expand Down
6 changes: 3 additions & 3 deletions src/libllm/bpe_model.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@

#include <limits>

#include "lut/error.h"
#include "lut/reader.h"
#include "lut/strings.h"
#include "lutil/error.h"
#include "lutil/reader.h"
#include "lutil/strings.h"

namespace libllm {

Expand Down
2 changes: 1 addition & 1 deletion src/libllm/bpe_model.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <unordered_map>

#include "libllm/vocab.h"
#include "lut/reader.h"
#include "lutil/reader.h"

namespace libllm {

Expand Down
6 changes: 3 additions & 3 deletions src/libllm/context.cc
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
#include "libllm/context.h"

#include "libllm/device.h"
#include "lut/error.h"
#include "lut/log.h"
#include "lut/strings.h"
#include "lutil/error.h"
#include "lutil/log.h"
#include "lutil/strings.h"

namespace libllm {

Expand Down
2 changes: 1 addition & 1 deletion src/libllm/cpu/accessor.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <vector>

#include "libllm/tensor.h"
#include "lut/span.h"
#include "lutil/span.h"

namespace libllm {
namespace op {
Expand Down
2 changes: 1 addition & 1 deletion src/libllm/cpu/binary_op.cc
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "libllm/cpu/tensor.h"
#include "libllm/mp.h"
#include "libllm/tensor.h"
#include "lut/attributes.h"
#include "lutil/attributes.h"

namespace libllm {
namespace op {
Expand Down
2 changes: 1 addition & 1 deletion src/libllm/cpu/cast.cc
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include "libllm/cpu/lookup.h"
#include "libllm/cpu/tensor.h"
#include "libllm/tensor.h"
#include "lut/half.h"
#include "lutil/half.h"

namespace libllm {
namespace op {
Expand Down
2 changes: 1 addition & 1 deletion src/libllm/cpu/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "libllm/cpu/accessor.h"
#include "libllm/cpu/kernel/interface.h"
#include "libllm/tensor.h"
#include "lut/span.h"
#include "lutil/span.h"

namespace libllm {
namespace op {
Expand Down
6 changes: 3 additions & 3 deletions src/libllm/cpu/cpu_tensor_data.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@

#include "libllm/device.h"
#include "libllm/dtype.h"
#include "lut/error.h"
#include "lut/platform.h"
#include "lut/span.h"
#include "lutil/error.h"
#include "lutil/platform.h"
#include "lutil/span.h"

namespace libllm {
namespace op {
Expand Down
2 changes: 1 addition & 1 deletion src/libllm/cpu/cpu_tensor_data.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include "libllm/device.h"
#include "libllm/tensor.h"
#include "lut/span.h"
#include "lutil/span.h"

namespace libllm {
namespace op {
Expand Down
2 changes: 1 addition & 1 deletion src/libllm/cpu/gelu.cc
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "libllm/cpu/accessor.h"
#include "libllm/cpu/tensor.h"
#include "libllm/mp.h"
#include "lut/thread_pool.h"
#include "lutil/thread_pool.h"

namespace libllm {
namespace op {
Expand Down
2 changes: 1 addition & 1 deletion src/libllm/cpu/kernel/asimdhp.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <stdint.h>

#include "libllm/cpu/kernel/abstract.h"
#include "lut/log.h"
#include "lutil/log.h"

namespace libllm {
namespace op {
Expand Down
6 changes: 3 additions & 3 deletions src/libllm/cpu/kernel/asimdhp_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
#include "libllm/cpu/kernel/abstract.h"
#include "libllm/cpu/kernel/test_common.h"
#include "libllm/cpu/kernel/util.h"
#include "lut/half.h"
#include "lut/log.h"
#include "lut/random.h"
#include "lutil/half.h"
#include "lutil/log.h"
#include "lutil/random.h"

namespace libllm {
namespace op {
Expand Down
2 changes: 1 addition & 1 deletion src/libllm/cpu/kernel/avx2.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <stdint.h>

#include "libllm/cpu/kernel/abstract.h"
#include "lut/log.h"
#include "lutil/log.h"

namespace libllm {
namespace op {
Expand Down
6 changes: 3 additions & 3 deletions src/libllm/cpu/kernel/avx2_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
#include "libllm/cpu/kernel/abstract.h"
#include "libllm/cpu/kernel/test_common.h"
#include "libllm/cpu/kernel/util.h"
#include "lut/half.h"
#include "lut/log.h"
#include "lut/random.h"
#include "lutil/half.h"
#include "lutil/log.h"
#include "lutil/random.h"

namespace libllm {
namespace op {
Expand Down
2 changes: 1 addition & 1 deletion src/libllm/cpu/kernel/avx512.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#include "libllm/cpu/kernel/abstract.h"
#include "libllm/cpu/kernel/avx2.h"
#include "lut/log.h"
#include "lutil/log.h"

namespace libllm {
namespace op {
Expand Down
6 changes: 3 additions & 3 deletions src/libllm/cpu/kernel/avx512_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
#include "libllm/cpu/kernel/abstract.h"
#include "libllm/cpu/kernel/test_common.h"
#include "libllm/cpu/kernel/util.h"
#include "lut/half.h"
#include "lut/log.h"
#include "lut/random.h"
#include "lutil/half.h"
#include "lutil/log.h"
#include "lutil/random.h"
#include "ruapu/ruapu.h"

namespace libllm {
Expand Down
8 changes: 4 additions & 4 deletions src/libllm/cpu/kernel/benchmark.cc
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
#include "libllm/cpu/kernel/abstract.h"
#include "libllm/cpu/kernel/gemm.h"
#include "libllm/cpu/kernel/interface.h"
#include "lut/attributes.h"
#include "lut/log.h"
#include "lut/strings.h"
#include "lut/time.h"
#include "lutil/attributes.h"
#include "lutil/log.h"
#include "lutil/strings.h"
#include "lutil/time.h"

namespace libllm {
namespace op {
Expand Down
4 changes: 2 additions & 2 deletions src/libllm/cpu/kernel/block.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

#include "libllm/cpu/kernel/abstract.h"
#include "libllm/mp.h"
#include "lut/log.h"
#include "lut/time.h"
#include "lutil/log.h"
#include "lutil/time.h"

namespace libllm {
namespace op {
Expand Down
2 changes: 1 addition & 1 deletion src/libllm/cpu/kernel/cvt.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include "libllm/cpu/kernel/abstract.h"
#include "libllm/mp.h"
#include "lut/log.h"
#include "lutil/log.h"

namespace libllm {
namespace op {
Expand Down
6 changes: 3 additions & 3 deletions src/libllm/cpu/kernel/fallback.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@

#include "libllm/cpu/kernel/abstract.h"
#include "libllm/cpu/kernel/util.h"
#include "lut/attributes.h"
#include "lut/half.h"
#include "lut/log.h"
#include "lutil/attributes.h"
#include "lutil/half.h"
#include "lutil/log.h"

namespace libllm {
namespace op {
Expand Down
2 changes: 1 addition & 1 deletion src/libllm/cpu/kernel/fallback.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include <stdint.h>

#include "libllm/cpu/kernel/abstract.h"
#include "lut/log.h"
#include "lutil/log.h"

namespace libllm {
namespace op {
Expand Down
4 changes: 2 additions & 2 deletions src/libllm/cpu/kernel/gemm.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
#include "libllm/cpu/kernel/cvt.h"
#include "libllm/cpu/kernel/gemv.h"
#include "libllm/mp.h"
#include "lut/log.h"
#include "lut/time.h"
#include "lutil/log.h"
#include "lutil/time.h"

namespace libllm {
namespace op {
Expand Down
2 changes: 1 addition & 1 deletion src/libllm/cpu/kernel/gemv.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "libllm/cpu/kernel/abstract.h"
#include "libllm/cpu/kernel/util.h"
#include "libllm/mp.h"
#include "lut/c_ptr.h"
#include "lutil/c_ptr.h"

namespace libllm {
namespace op {
Expand Down
8 changes: 4 additions & 4 deletions src/libllm/cpu/kernel/interface.cc
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@
#include "libllm/cpu/kernel/gemm.h"
#include "libllm/cpu/kernel/gemv.h"
#include "libllm/cpu/kernel/interface.h"
#include "lut/is_debug.h"
#include "lut/log.h"
#include "lut/platform.h"
#include "lut/strings.h"
#include "lutil/is_debug.h"
#include "lutil/log.h"
#include "lutil/platform.h"
#include "lutil/strings.h"
#include "ruapu/ruapu.h"

namespace libllm {
Expand Down
2 changes: 1 addition & 1 deletion src/libllm/cpu/kernel/interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include <stdint.h>

#include "lut/attributes.h"
#include "lutil/attributes.h"

namespace libllm {
namespace op {
Expand Down
6 changes: 3 additions & 3 deletions src/libllm/cpu/kernel/interface_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
#include "catch2/catch_amalgamated.hpp"
#include "libllm/cpu/kernel/test_common.h"
#include "libllm/cpu/kernel/util.h"
#include "lut/half.h"
#include "lut/log.h"
#include "lut/random.h"
#include "lutil/half.h"
#include "lutil/log.h"
#include "lutil/random.h"

namespace libllm {
namespace op {
Expand Down
6 changes: 3 additions & 3 deletions src/libllm/cpu/kernel/test_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
#include "libllm/cpu/kernel/avx512.h"
#include "libllm/cpu/kernel/fallback.h"
#include "libllm/cpu/kernel/util.h"
#include "lut/half.h"
#include "lut/log.h"
#include "lut/random.h"
#include "lutil/half.h"
#include "lutil/log.h"
#include "lutil/random.h"

namespace libllm {
namespace op {
Expand Down
4 changes: 2 additions & 2 deletions src/libllm/cpu/kernel/util.cc
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
#include <algorithm>

#include "libllm/cpu/kernel/abstract.h"
#include "lut/half.h"
#include "lut/platform.h"
#include "lutil/half.h"
#include "lutil/platform.h"

#ifdef LUT_ARCH_AARCH64
#include <arm_neon.h>
Expand Down
Loading

0 comments on commit 4870780

Please sign in to comment.