commit dd3201505150cd9e846965468b8adba1a2b079c8
parent ad4e0624fca9fcf5c74a9b2677ff362933133375
Author: David Freifeld <freifeld.david@gmail.com>
Date: Sun, 29 Nov 2020 10:22:26 -0800
Moved cwise_product() and other macros to bpnn.hpp
Diffstat:
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/bpnn.cpp b/src/bpnn.cpp
@@ -12,20 +12,6 @@
#include <ctime>
#include <random>
-#define SHUFFLED_PATH "./shuffled.txt"
-#define VAL_PATH "./test.txt"
-#define TRAIN_PATH "./train.txt"
-#define VAL_BIN_PATH "./test.bin"
-#define TRAIN_BIN_PATH "./train.bin"
-#define VAL_LZ4_PATH "./test.lz4"
-#define TRAIN_LZ4_PATH "./train.lz4"
-
-#if (AVX)
-#define cwise_product(a,b) avx_product(a, b)
-#else
-#define cwise_product(a,b) (a).cwiseProduct(b)
-#endif
-
Layer::Layer(int batch_sz, int nodes, float a)
:alpha(a)
{
diff --git a/src/bpnn.hpp b/src/bpnn.hpp
@@ -133,4 +133,18 @@ Eigen::MatrixXf l1_deriv(Eigen::MatrixXf m);
#define Ensures(cond) GSL_ASSUME(cond);
#endif
+#define SHUFFLED_PATH "./shuffled.txt"
+#define VAL_PATH "./test.txt"
+#define TRAIN_PATH "./train.txt"
+#define VAL_BIN_PATH "./test.bin"
+#define TRAIN_BIN_PATH "./train.bin"
+#define VAL_LZ4_PATH "./test.lz4"
+#define TRAIN_LZ4_PATH "./train.lz4"
+
+#if (AVX)
+#define cwise_product(a,b) avx_product(a, b)
+#else
+#define cwise_product(a,b) (a).cwiseProduct(b)
+#endif
+
#endif /* MODULE_H */