Merge pull request #10 from ucb-bar/install

REFACTOR: change import directory structure to better help library installation
ucb-bar · Jul 20, 2024 · 8dde10e · 8dde10e
2 parents 6dfb30d + a755bf6
commit 8dde10e
Show file tree

Hide file tree

Showing 76 changed files with 346 additions and 324 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -44,8 +44,8 @@ target_compile_features(target-riscv INTERFACE c_std_11)
 target_compile_definitions(target-riscv INTERFACE RISCV)
 
 set(WRAP_SPECS_FILE     "htif_wrap.specs")
-set(SPECS_FILE          "nano.specs")
-set(SPEC_FLAGS          "-specs=${SPECS_FILE} -specs=${WRAP_SPECS_FILE}")
+set(SPECS_FILE          "htif_nano.specs")
+set(SPEC_FLAGS          -specs=${SPECS_FILE} -specs=${WRAP_SPECS_FILE})
 
 set(MARCH               "rv64gcv_zfh_zvfh_zvfhmin")
 set(MABI                "lp64d")

diff --git a/examples/fast-depth/CMakeLists.txt b/examples/fast-depth/CMakeLists.txt
@@ -21,3 +21,4 @@ endif ()
 target_compile_options(fast-depth PRIVATE -O3 -Wall -Wextra)
 
 target_link_libraries(fast-depth PUBLIC nn)
+target_link_libraries(fast-depth PUBLIC m)
diff --git a/examples/fast-depth/model.h b/examples/fast-depth/model.h
@@ -2,7 +2,6 @@
 #define __MODEL_H
 
 #include "nn.h"
-#include "nn_relu.h"
 
 
 // load the weight data block from the model.bin file

diff --git a/examples/llama2/CMakeLists.txt b/examples/llama2/CMakeLists.txt
@@ -19,4 +19,5 @@ endif ()
 target_compile_options(llama2 PRIVATE -O3 -Wall -Wextra)
 
 target_link_libraries(llama2 PUBLIC nn)
+target_link_libraries(llama2 PUBLIC m)
 
diff --git a/nn/CMakeLists.txt b/nn/CMakeLists.txt
@@ -1,4 +1,4 @@
-
+cmake_minimum_required(VERSION 3.10)
 
 set(cpu_impl 
   ./impl/cpu/abs.c
@@ -112,10 +112,7 @@ add_library(nn
   ${cpu_impl}
 )
 
-target_include_directories(nn PUBLIC 
-  ./
-  ./functional 
-  ./impl)
+target_include_directories(nn PUBLIC ./)
 
 if (X86)
   message(STATUS "nn: Building for x86")
@@ -128,6 +125,3 @@ endif ()
 
 
 target_link_libraries(nn m)
-
-
-
diff --git a/nn/functional/nn_abs.h b/nn/functional/nn_abs.h
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "nn_tensor.h"
-#include "abs.h"
+#include "impl/abs.h"
 
 
 /**

diff --git a/nn/functional/nn_add.h b/nn/functional/nn_add.h
@@ -6,10 +6,10 @@
 
 #include "nn_tensor.h"
 #include "nn_print.h"
-#include "acc.h"
-#include "acc1.h"
-#include "add.h"
-#include "add1.h"
+#include "impl/acc.h"
+#include "impl/acc1.h"
+#include "impl/add.h"
+#include "impl/add1.h"
 
 
 /**

diff --git a/nn/functional/nn_clip.h b/nn/functional/nn_clip.h
@@ -4,8 +4,8 @@
 #include <assert.h>
 
 #include "nn_tensor.h"
-#include "maximum1.h"
-#include "minimum1.h"
+#include "impl/maximum1.h"
+#include "impl/minimum1.h"
 
 
 /**

diff --git a/nn/functional/nn_div.h b/nn/functional/nn_div.h
@@ -5,7 +5,7 @@
 #include <float.h>
 
 #include "nn_tensor.h"
-#include "div.h"
+#include "impl/div.h"
 
 
 /**

diff --git a/nn/functional/nn_fill.h b/nn/functional/nn_fill.h
@@ -5,7 +5,7 @@
 #include <math.h>
 
 #include "nn_tensor.h"
-#include "fill.h"
+#include "impl/fill.h"
 
 /**
  * Fills the tensor with the specified value.

diff --git a/nn/functional/nn_layer_norm.h b/nn/functional/nn_layer_norm.h
@@ -5,12 +5,12 @@
 #include <math.h>
 
 #include "nn_tensor.h"
-#include "sum.h"
-#include "add.h"
-#include "add1.h"
-#include "mul.h"
-#include "mul1.h"
-#include "sqr.h"
+#include "impl/sum.h"
+#include "impl/add.h"
+#include "impl/add1.h"
+#include "impl/mul.h"
+#include "impl/mul1.h"
+#include "impl/sqr.h"
 
 
 void NN_layer_norm(

diff --git a/nn/functional/nn_max.h b/nn/functional/nn_max.h
@@ -5,7 +5,7 @@
 #include <float.h>
 
 #include "nn_tensor.h"
-#include "max.h"
+#include "impl/max.h"
 
 
 /**

diff --git a/nn/functional/nn_maximum.h b/nn/functional/nn_maximum.h
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "nn_tensor.h"
-#include "maximum.h"
+#include "impl/maximum.h"
 
 
 /**

diff --git a/nn/functional/nn_min.h b/nn/functional/nn_min.h
@@ -5,7 +5,7 @@
 #include <float.h>
 
 #include "nn_tensor.h"
-#include "min.h"
+#include "impl/min.h"
 
 
 /**

diff --git a/nn/functional/nn_minimum.h b/nn/functional/nn_minimum.h
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "nn_tensor.h"
-#include "minimum.h"
+#include "impl/minimum.h"
 
 
 /**

diff --git a/nn/functional/nn_mm.h b/nn/functional/nn_mm.h
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "nn_tensor.h"
-#include "dot.h"
+#include "impl/dot.h"
 
 
 /**

diff --git a/nn/functional/nn_mul.h b/nn/functional/nn_mul.h
@@ -5,8 +5,8 @@
 #include <float.h>
 
 #include "nn_tensor.h"
-#include "mul.h"
-#include "mul1.h"
+#include "impl/mul.h"
+#include "impl/mul1.h"
 
 
 /**

diff --git a/nn/functional/nn_mv.h b/nn/functional/nn_mv.h
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "nn_tensor.h"
-#include "dot.h"
+#include "impl/dot.h"
 
 
 /**

diff --git a/nn/functional/nn_neg.h b/nn/functional/nn_neg.h
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "nn_tensor.h"
-#include "neg.h"
+#include "impl/neg.h"
 
 
 /**

diff --git a/nn/functional/nn_relu.h b/nn/functional/nn_relu.h
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "nn_tensor.h"
-#include "maximum1.h"
+#include "impl/maximum1.h"
 
 
 /**

diff --git a/nn/functional/nn_relu6.h b/nn/functional/nn_relu6.h
@@ -4,8 +4,8 @@
 #include <assert.h>
 
 #include "nn_tensor.h"
-#include "maximum1.h"
-#include "minimum1.h"
+#include "impl/maximum1.h"
+#include "impl/minimum1.h"
 
 
 /**

diff --git a/nn/functional/nn_rms_norm.h b/nn/functional/nn_rms_norm.h
@@ -5,7 +5,7 @@
 #include <math.h>
 
 #include "nn_tensor.h"
-#include "rms_norm.h"
+#include "impl/rms_norm.h"
 
 
 /**

diff --git a/nn/functional/nn_silu.h b/nn/functional/nn_silu.h
@@ -5,7 +5,7 @@
 #include <math.h>
 
 #include "nn_tensor.h"
-#include "maximum1.h"
+#include "impl/maximum1.h"
 
 
 /**

diff --git a/nn/functional/nn_softmax.h b/nn/functional/nn_softmax.h
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "nn_tensor.h"
-#include "softmax.h"
+#include "impl/softmax.h"
 
 
 /**

diff --git a/nn/functional/nn_sub.h b/nn/functional/nn_sub.h
@@ -6,7 +6,7 @@
 
 #include "nn_tensor.h"
 #include "nn_print.h"
-#include "sub.h"
+#include "impl/sub.h"
 
 
 /**

diff --git a/nn/functional/nn_sum.h b/nn/functional/nn_sum.h
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "nn_tensor.h"
-#include "sum.h"
+#include "impl/sum.h"
 
 
 /**

diff --git a/nn/functional/nn_transpose.h b/nn/functional/nn_transpose.h
@@ -4,7 +4,7 @@
 #include <assert.h>
 
 #include "nn_tensor.h"
-#include "transpose.h"
+#include "impl/transpose.h"
 
 /**
  * Transpose a 2D tensor

diff --git a/nn/impl/cpu/abs.c b/nn/impl/cpu/abs.c
@@ -1,4 +1,4 @@
-#include "abs.h"
+#include "impl/abs.h"
 
 
 __attribute__((weak)) void NN__abs_i8(size_t n, int8_t *y, size_t incy, const int8_t *x, size_t incx) {

diff --git a/nn/impl/cpu/acc.c b/nn/impl/cpu/acc.c
@@ -1,4 +1,4 @@
-#include "acc.h"
+#include "impl/acc.h"
 
 
 __attribute__((weak)) void NN__acc_i8(size_t n, int8_t *y, size_t incy, const int8_t *x, size_t incx) {

diff --git a/nn/impl/cpu/acc1.c b/nn/impl/cpu/acc1.c
@@ -1,4 +1,4 @@
-#include "acc1.h"
+#include "impl/acc1.h"
 
 
 __attribute__((weak)) void NN__acc1_i8(size_t n, int8_t *result, size_t incr, int8_t scalar) {

diff --git a/nn/impl/cpu/add.c b/nn/impl/cpu/add.c
@@ -1,4 +1,4 @@
-#include "add.h"
+#include "impl/add.h"
 
 
 __attribute__((weak)) void NN__add_i8(size_t n, int8_t *z, size_t incz, const int8_t *x, size_t incx, const int8_t *y, size_t incy) {

diff --git a/nn/impl/cpu/add1.c b/nn/impl/cpu/add1.c
@@ -1,4 +1,4 @@
-#include "add1.h"
+#include "impl/add1.h"
 
 
 

diff --git a/nn/impl/cpu/div.c b/nn/impl/cpu/div.c
@@ -1,4 +1,4 @@
-#include "div.h"
+#include "impl/div.h"
 
 
 __attribute__((weak)) void NN__div_i8(size_t n, int8_t *z, size_t incz, const int8_t *x, size_t incx, const int8_t *y, size_t incy) {

diff --git a/nn/impl/cpu/dot.c b/nn/impl/cpu/dot.c
@@ -1,4 +1,4 @@
-#include "dot.h"
+#include "impl/dot.h"
 
 
 __attribute__((weak)) void NN__dot_i8_to_i32(size_t n, int32_t *result, const int8_t *x, size_t incx, const int8_t *y, size_t incy) {

diff --git a/nn/impl/cpu/fill.c b/nn/impl/cpu/fill.c
@@ -1,4 +1,4 @@
-#include "fill.h"
+#include "impl/fill.h"
 
 
 __attribute__((weak)) void NN__fill_u8(size_t n, uint8_t *x, size_t incx, uint8_t scalar) {

diff --git a/nn/impl/cpu/log.c b/nn/impl/cpu/log.c
@@ -1,4 +1,4 @@
-#include "log.h"
+#include "impl/log.h"
 
 
 __attribute__((weak)) void NN__log_f32(size_t n, float *y, size_t incy, const float *x, size_t incx) {

diff --git a/nn/impl/cpu/max.c b/nn/impl/cpu/max.c
@@ -1,4 +1,4 @@
-#include "max.h"
+#include "impl/max.h"
 
 
 __attribute__((weak)) void NN__max_i8(size_t n, int8_t *result, const int8_t *x, size_t incx) {

diff --git a/nn/impl/cpu/maximum.c b/nn/impl/cpu/maximum.c
@@ -1,4 +1,4 @@
-#include "maximum.h"
+#include "impl/maximum.h"
 
 
 __attribute__((weak)) void NN__maximum_i8(size_t n, int8_t *z, size_t incz, const int8_t *x, size_t incx, const int8_t *y, size_t incy) {

diff --git a/nn/impl/cpu/maximum1.c b/nn/impl/cpu/maximum1.c
@@ -1,4 +1,4 @@
-#include "maximum1.h"
+#include "impl/maximum1.h"
 
 
 __attribute__((weak)) void NN__maximum1_i8(size_t n, int8_t *y, size_t incy, const int8_t *x, size_t incx, int8_t scalar) {

diff --git a/nn/impl/cpu/min.c b/nn/impl/cpu/min.c
@@ -1,4 +1,4 @@
-#include "min.h"
+#include "impl/min.h"
 
 
 __attribute__((weak)) void NN__min_i8(size_t n, int8_t *result, const int8_t *x, size_t incx) {

diff --git a/nn/impl/cpu/minimum.c b/nn/impl/cpu/minimum.c
@@ -1,4 +1,4 @@
-#include "minimum.h"
+#include "impl/minimum.h"
 
 
 __attribute__((weak)) void NN__minimum_i8(size_t n, int8_t *z, size_t incz, const int8_t *x, size_t incx, const int8_t *y, size_t incy) {

diff --git a/nn/impl/cpu/minimum1.c b/nn/impl/cpu/minimum1.c
@@ -1,4 +1,4 @@
-#include "minimum1.h"
+#include "impl/minimum1.h"
 
 
 __attribute__((weak)) void NN__minimum1_i8(size_t n, int8_t *y, size_t incy, const int8_t *x, size_t incx, int8_t scalar) {

diff --git a/nn/impl/cpu/mul.c b/nn/impl/cpu/mul.c
@@ -1,4 +1,4 @@
-#include "mul.h"
+#include "impl/mul.h"
 
 
 __attribute__((weak)) void NN__mul_i8(size_t n, int8_t *z, size_t incz, const int8_t *x, size_t incx, const int8_t *y, size_t incy) {

diff --git a/nn/impl/cpu/mul1.c b/nn/impl/cpu/mul1.c
@@ -1,4 +1,4 @@
-#include "mul1.h"
+#include "impl/mul1.h"
 
 
 __attribute__((weak)) void NN__mul1_i8(size_t n, int8_t *y, size_t incy, const int8_t *x, size_t incx, int8_t scalar) {

diff --git a/nn/impl/cpu/neg.c b/nn/impl/cpu/neg.c
@@ -1,4 +1,4 @@
-#include "neg.h"
+#include "impl/neg.h"
 
 
 __attribute__((weak)) void NN__neg_i8(size_t n, int8_t *y, size_t incy, const int8_t *x, size_t incx) {

diff --git a/nn/impl/cpu/norm.c b/nn/impl/cpu/norm.c
@@ -1,4 +1,4 @@
-#include "norm.h"
+#include "impl/norm.h"
 
 
 __attribute__((weak)) void NN__norm_f32(size_t n, float *result, const float *x, size_t incx) {

diff --git a/nn/impl/cpu/rms_norm.c b/nn/impl/cpu/rms_norm.c
@@ -1,4 +1,4 @@
-#include "rms_norm.h"
+#include "impl/rms_norm.h"
 
 
 __attribute__((weak)) void NN__rms_norm_f32(size_t n, float* y, size_t incy, const float* x, size_t incx, const float* w, size_t incw, float eps) {