Fixes #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.
mlcpp · Dec 19, 2020 · 1c2ed66 · 1c2ed66
1 parent fae7839
commit 1c2ed66
Show file tree

Hide file tree

Showing 70 changed files with 193 additions and 17 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,21 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
+if(NOT CMAKE_BUILD_TYPE)
+	set(CMAKE_BUILD_TYPE Release)
+endif()
+
+# set(CMAKE_CXX_FLAGS "-Wall -Wextra")
+set(CMAKE_CXX_FLAGS_DEBUG "-g")
+set(CMAKE_CXX_FLAGS_RELEASE "-O3")
+
 include_directories(${Matrix_SOURCE_DIR}/include)
+include_directories(${Matrix_SOURCE_DIR}/lib/benchmark/include)
+link_directories(${Matrix_SOURCE_DIR}/lib/benchmark/build/src)
+
 
+add_custom_target(examples)
 add_subdirectory(examples)
 
+add_custom_target(benchmarks)
+add_subdirectory(benchmarks)
diff --git a/benchmark/linux_binaries/BM_T b/benchmark/linux_binaries/BM_T
diff --git a/benchmark/linux_binaries/BM_abs b/benchmark/linux_binaries/BM_abs
diff --git a/benchmark/linux_binaries/BM_addition b/benchmark/linux_binaries/BM_addition
diff --git a/benchmark/linux_binaries/BM_all b/benchmark/linux_binaries/BM_all
diff --git a/benchmark/linux_binaries/BM_argmax b/benchmark/linux_binaries/BM_argmax
diff --git a/benchmark/linux_binaries/BM_argmin b/benchmark/linux_binaries/BM_argmin
diff --git a/benchmark/linux_binaries/BM_concatenate b/benchmark/linux_binaries/BM_concatenate
diff --git a/benchmark/linux_binaries/BM_delete_ b/benchmark/linux_binaries/BM_delete_
diff --git a/benchmark/linux_binaries/BM_determinant b/benchmark/linux_binaries/BM_determinant
diff --git a/benchmark/linux_binaries/BM_element_wise_multiplication b/benchmark/linux_binaries/BM_element_wise_multiplication
diff --git a/benchmark/linux_binaries/BM_exp b/benchmark/linux_binaries/BM_exp
diff --git a/benchmark/linux_binaries/BM_eye b/benchmark/linux_binaries/BM_eye
diff --git a/benchmark/linux_binaries/BM_genfromtxt b/benchmark/linux_binaries/BM_genfromtxt
diff --git a/benchmark/linux_binaries/BM_get b/benchmark/linux_binaries/BM_get
diff --git a/benchmark/linux_binaries/BM_indexing b/benchmark/linux_binaries/BM_indexing
diff --git a/benchmark/linux_binaries/BM_init b/benchmark/linux_binaries/BM_init
diff --git a/benchmark/linux_binaries/BM_inverse b/benchmark/linux_binaries/BM_inverse
diff --git a/benchmark/linux_binaries/BM_log b/benchmark/linux_binaries/BM_log
diff --git a/benchmark/linux_binaries/BM_matmul b/benchmark/linux_binaries/BM_matmul
diff --git a/benchmark/linux_binaries/BM_max b/benchmark/linux_binaries/BM_max
diff --git a/benchmark/linux_binaries/BM_mean b/benchmark/linux_binaries/BM_mean
diff --git a/benchmark/linux_binaries/BM_min b/benchmark/linux_binaries/BM_min
diff --git a/benchmark/linux_binaries/BM_ones b/benchmark/linux_binaries/BM_ones
diff --git a/benchmark/linux_binaries/BM_power b/benchmark/linux_binaries/BM_power
diff --git a/benchmark/linux_binaries/BM_reciprocal b/benchmark/linux_binaries/BM_reciprocal
diff --git a/benchmark/linux_binaries/BM_slice b/benchmark/linux_binaries/BM_slice
diff --git a/benchmark/linux_binaries/BM_slice_select b/benchmark/linux_binaries/BM_slice_select
diff --git a/benchmark/linux_binaries/BM_sqrt b/benchmark/linux_binaries/BM_sqrt
diff --git a/benchmark/linux_binaries/BM_std b/benchmark/linux_binaries/BM_std
diff --git a/benchmark/linux_binaries/BM_sum b/benchmark/linux_binaries/BM_sum
diff --git a/benchmark/linux_binaries/BM_to_double b/benchmark/linux_binaries/BM_to_double
diff --git a/benchmark/linux_binaries/BM_unary_minus b/benchmark/linux_binaries/BM_unary_minus
diff --git a/benchmark/linux_binaries/BM_zeros b/benchmark/linux_binaries/BM_zeros
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/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt
@@ -0,0 +1,133 @@
+add_dependencies(benchmarks
+	BM_abs
+	BM_addition
+	BM_all
+	BM_argmax
+	BM_argmin
+	BM_concatenate
+	BM_delete_
+	BM_determinant
+	BM_element_wise_multiplication
+	BM_exp
+	BM_eye
+	BM_genfromtxt
+	BM_get
+	BM_indexing
+	BM_init
+	BM_inverse
+	BM_log
+	BM_matmul
+	BM_max
+	BM_mean
+	BM_min
+	BM_ones
+	BM_power
+	BM_reciprocal
+	BM_slice
+	BM_slice_select
+	BM_sqrt
+	BM_std
+	BM_sum
+	BM_T
+	BM_to_double
+	BM_unary_minus
+	BM_zeros
+)
+add_executable(BM_abs BM_abs.cpp)
+target_link_libraries(BM_abs PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_addition BM_addition.cpp)
+target_link_libraries(BM_addition PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_all BM_all.cpp)
+target_link_libraries(BM_all PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_argmax BM_argmax.cpp)
+target_link_libraries(BM_argmax PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_argmin BM_argmin.cpp)
+target_link_libraries(BM_argmin PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_concatenate BM_concatenate.cpp)
+target_link_libraries(BM_concatenate PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_delete_ BM_delete_.cpp)
+target_link_libraries(BM_delete_ PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_determinant BM_determinant.cpp)
+target_link_libraries(BM_determinant PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_element_wise_multiplication BM_element_wise_multiplication.cpp)
+target_link_libraries(BM_element_wise_multiplication PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_exp BM_exp.cpp)
+target_link_libraries(BM_exp PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_eye BM_eye.cpp)
+target_link_libraries(BM_eye PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_genfromtxt BM_genfromtxt.cpp)
+target_link_libraries(BM_genfromtxt PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_get BM_get.cpp)
+target_link_libraries(BM_get PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_indexing BM_indexing.cpp)
+target_link_libraries(BM_indexing PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_init BM_init.cpp)
+target_link_libraries(BM_init PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_inverse BM_inverse.cpp)
+target_link_libraries(BM_inverse PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_log BM_log.cpp)
+target_link_libraries(BM_log PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_matmul BM_matmul.cpp)
+target_link_libraries(BM_matmul PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_max BM_max.cpp)
+target_link_libraries(BM_max PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_mean BM_mean.cpp)
+target_link_libraries(BM_mean PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_min BM_min.cpp)
+target_link_libraries(BM_min PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_ones BM_ones.cpp)
+target_link_libraries(BM_ones PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_power BM_power.cpp)
+target_link_libraries(BM_power PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_reciprocal BM_reciprocal.cpp)
+target_link_libraries(BM_reciprocal PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_slice BM_slice.cpp)
+target_link_libraries(BM_slice PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_slice_select BM_slice_select.cpp)
+target_link_libraries(BM_slice_select PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_sqrt BM_sqrt.cpp)
+target_link_libraries(BM_sqrt PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_std BM_std.cpp)
+target_link_libraries(BM_std PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_sum BM_sum.cpp)
+target_link_libraries(BM_sum PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_T BM_T.cpp)
+target_link_libraries(BM_T PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_to_double BM_to_double.cpp)
+target_link_libraries(BM_to_double PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_unary_minus BM_unary_minus.cpp)
+target_link_libraries(BM_unary_minus PUBLIC benchmark benchmark_main pthread)
+
+add_executable(BM_zeros BM_zeros.cpp)
+target_link_libraries(BM_zeros PUBLIC benchmark benchmark_main pthread)
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,27 +1,56 @@
+add_dependencies(examples
+	abs
+	addition
+	argmin_argmax
+	concatenate
+	delete_
+	determinant
+	element_wise_multiplication
+	exp
+	genfromtxt
+	get_mat
+	indexing
+	initialize
+	inverse
+	log
+	matrix_calc
+	matrix_multiplication
+	min_max
+	power
+	reciprocal
+	slice_matrix
+	slice_out-of-bounds_error
+	slice_select
+	sqrt
+	string_to_double
+	transpose
+	unary_minus
+	view_matrix
+)
 add_executable(abs abs.cpp)
-add_executable(determinant determinant.cpp)
-add_executable(initialize initialize.cpp)
-add_executable(min_max min_max.cpp)
-add_executable(slice_out-of-bounds_error slice_out-of-bounds_error.cpp)
-add_executable(unary_minus unary_minus.cpp)
 add_executable(addition addition.cpp)
-add_executable(element_wise_multiplication element_wise_multiplication.cpp)
-add_executable(inverse inverse.cpp)
-add_executable(power power.cpp)
-add_executable(slice_select slice_select.cpp)
-add_executable(view_matrix view_matrix.cpp)
 add_executable(argmin_argmax argmin_argmax.cpp)
+add_executable(concatenate concatenate.cpp)
+add_executable(delete_ delete_.cpp)
+add_executable(determinant determinant.cpp)
+add_executable(element_wise_multiplication element_wise_multiplication.cpp)
 add_executable(exp exp.cpp)
-add_executable(log log.cpp)
 add_executable(genfromtxt genfromtxt.cpp)
-add_executable(sqrt sqrt.cpp)
-add_executable(concatenate concatenate.cpp)
 add_executable(get_mat get_mat.cpp)
-add_executable(matrix_calc matrix_calc.cpp)
-add_executable(reciprocal reciprocal.cpp)
-add_executable(string_to_double string_to_double.cpp)
-add_executable(delete_ delete_.cpp)
 add_executable(indexing indexing.cpp)
+add_executable(initialize initialize.cpp)
+add_executable(inverse inverse.cpp)
+add_executable(log log.cpp)
+add_executable(matrix_calc matrix_calc.cpp)
 add_executable(matrix_multiplication matrix_multiplication.cpp)
+add_executable(min_max min_max.cpp)
+add_executable(power power.cpp)
+add_executable(reciprocal reciprocal.cpp)
 add_executable(slice_matrix slice_matrix.cpp)
+add_executable(slice_out-of-bounds_error slice_out-of-bounds_error.cpp)
+add_executable(slice_select slice_select.cpp)
+add_executable(sqrt sqrt.cpp)
+add_executable(string_to_double string_to_double.cpp)
 add_executable(transpose transpose.cpp)
+add_executable(unary_minus unary_minus.cpp)
+add_executable(view_matrix view_matrix.cpp)