Fixes mlcpp#24

Adds custom make targets: examples and benchmarks From now, `make` or `make all` will compile examples/ and benchmarks/ `make examples` will compile examples/ `make benchmarks` will compile benchmarks/ Also, `benchmark` folder has been renamed to `benchmarks`.
ashok-arora · Dec 19, 2020 · 1da5aa8 · 1da5aa8
1 parent fbc64d7
commit 1da5aa8
Show file tree

Hide file tree

Showing 37 changed files with 5 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,14 +18,8 @@ include_directories(${Matrix_SOURCE_DIR}/lib/benchmark/include)
 link_directories(${Matrix_SOURCE_DIR}/lib/benchmark/build/src)
 
 
-add_custom_target(example)
+add_custom_target(examples)
 add_subdirectory(examples)
 
-add_custom_target(bench)
-add_subdirectory(benchmark)
-
-# make -> make all
-# make example 
-# make bench
-# make test
-# make doc
+add_custom_target(benchmarks)
+add_subdirectory(benchmarks)
diff --git a/benchmark/BM_T.cpp → benchmarks/BM_T.cpp b/benchmark/BM_T.cpp → benchmarks/BM_T.cpp
diff --git a/benchmark/BM_abs.cpp → benchmarks/BM_abs.cpp b/benchmark/BM_abs.cpp → benchmarks/BM_abs.cpp
diff --git a/benchmark/BM_addition.cpp → benchmarks/BM_addition.cpp b/benchmark/BM_addition.cpp → benchmarks/BM_addition.cpp
diff --git a/benchmark/BM_all.cpp → benchmarks/BM_all.cpp b/benchmark/BM_all.cpp → benchmarks/BM_all.cpp
diff --git a/benchmark/BM_argmax.cpp → benchmarks/BM_argmax.cpp b/benchmark/BM_argmax.cpp → benchmarks/BM_argmax.cpp
diff --git a/benchmark/BM_argmin.cpp → benchmarks/BM_argmin.cpp b/benchmark/BM_argmin.cpp → benchmarks/BM_argmin.cpp
diff --git a/benchmark/BM_concatenate.cpp → benchmarks/BM_concatenate.cpp b/benchmark/BM_concatenate.cpp → benchmarks/BM_concatenate.cpp
diff --git a/benchmark/BM_delete_.cpp → benchmarks/BM_delete_.cpp b/benchmark/BM_delete_.cpp → benchmarks/BM_delete_.cpp
diff --git a/benchmark/BM_determinant.cpp → benchmarks/BM_determinant.cpp b/benchmark/BM_determinant.cpp → benchmarks/BM_determinant.cpp
diff --git a/benchmark/BM_element_wise_multiplication.cpp → ...hmarks/BM_element_wise_multiplication.cpp b/benchmark/BM_element_wise_multiplication.cpp → ...hmarks/BM_element_wise_multiplication.cpp
diff --git a/benchmark/BM_exp.cpp → benchmarks/BM_exp.cpp b/benchmark/BM_exp.cpp → benchmarks/BM_exp.cpp
diff --git a/benchmark/BM_eye.cpp → benchmarks/BM_eye.cpp b/benchmark/BM_eye.cpp → benchmarks/BM_eye.cpp
diff --git a/benchmark/BM_genfromtxt.cpp → benchmarks/BM_genfromtxt.cpp b/benchmark/BM_genfromtxt.cpp → benchmarks/BM_genfromtxt.cpp
diff --git a/benchmark/BM_get.cpp → benchmarks/BM_get.cpp b/benchmark/BM_get.cpp → benchmarks/BM_get.cpp
diff --git a/benchmark/BM_indexing.cpp → benchmarks/BM_indexing.cpp b/benchmark/BM_indexing.cpp → benchmarks/BM_indexing.cpp
diff --git a/benchmark/BM_init.cpp → benchmarks/BM_init.cpp b/benchmark/BM_init.cpp → benchmarks/BM_init.cpp
diff --git a/benchmark/BM_inverse.cpp → benchmarks/BM_inverse.cpp b/benchmark/BM_inverse.cpp → benchmarks/BM_inverse.cpp
diff --git a/benchmark/BM_log.cpp → benchmarks/BM_log.cpp b/benchmark/BM_log.cpp → benchmarks/BM_log.cpp
diff --git a/benchmark/BM_matmul.cpp → benchmarks/BM_matmul.cpp b/benchmark/BM_matmul.cpp → benchmarks/BM_matmul.cpp
diff --git a/benchmark/BM_max.cpp → benchmarks/BM_max.cpp b/benchmark/BM_max.cpp → benchmarks/BM_max.cpp
diff --git a/benchmark/BM_mean.cpp → benchmarks/BM_mean.cpp b/benchmark/BM_mean.cpp → benchmarks/BM_mean.cpp
diff --git a/benchmark/BM_min.cpp → benchmarks/BM_min.cpp b/benchmark/BM_min.cpp → benchmarks/BM_min.cpp
diff --git a/benchmark/BM_ones.cpp → benchmarks/BM_ones.cpp b/benchmark/BM_ones.cpp → benchmarks/BM_ones.cpp
diff --git a/benchmark/BM_power.cpp → benchmarks/BM_power.cpp b/benchmark/BM_power.cpp → benchmarks/BM_power.cpp
diff --git a/benchmark/BM_reciprocal.cpp → benchmarks/BM_reciprocal.cpp b/benchmark/BM_reciprocal.cpp → benchmarks/BM_reciprocal.cpp
diff --git a/benchmark/BM_slice.cpp → benchmarks/BM_slice.cpp b/benchmark/BM_slice.cpp → benchmarks/BM_slice.cpp
diff --git a/benchmark/BM_slice_select.cpp → benchmarks/BM_slice_select.cpp b/benchmark/BM_slice_select.cpp → benchmarks/BM_slice_select.cpp
diff --git a/benchmark/BM_sqrt.cpp → benchmarks/BM_sqrt.cpp b/benchmark/BM_sqrt.cpp → benchmarks/BM_sqrt.cpp
diff --git a/benchmark/BM_std.cpp → benchmarks/BM_std.cpp b/benchmark/BM_std.cpp → benchmarks/BM_std.cpp
diff --git a/benchmark/BM_sum.cpp → benchmarks/BM_sum.cpp b/benchmark/BM_sum.cpp → benchmarks/BM_sum.cpp
diff --git a/benchmark/BM_to_double.cpp → benchmarks/BM_to_double.cpp b/benchmark/BM_to_double.cpp → benchmarks/BM_to_double.cpp
diff --git a/benchmark/BM_unary_minus.cpp → benchmarks/BM_unary_minus.cpp b/benchmark/BM_unary_minus.cpp → benchmarks/BM_unary_minus.cpp
diff --git a/benchmark/BM_zeros.cpp → benchmarks/BM_zeros.cpp b/benchmark/BM_zeros.cpp → benchmarks/BM_zeros.cpp
diff --git a/benchmark/CMakeLists.txt → benchmarks/CMakeLists.txt b/benchmark/CMakeLists.txt → benchmarks/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_dependencies(example
+add_dependencies(benchmarks
 	BM_abs
 	BM_addition
 	BM_all

diff --git a/benchmark/result.txt → benchmarks/result.txt b/benchmark/result.txt → benchmarks/result.txt
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_dependencies(example
+add_dependencies(examples
 	abs
 	addition
 	argmin_argmax