Bugfix for single_predict

josephjaspers · Nov 17, 2019 · 7d28487 · 7d28487
1 parent 42a9491
commit 7d28487
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 63 deletions.
diff --git a/include/neural_networks/Network.h b/include/neural_networks/Network.h
@@ -168,6 +168,7 @@ struct NeuralNetwork {
 
 	void move_training_data_to_single_predict(int batch_index) {
 		m_layer_chain.for_each([&](auto& layer) {
+			layer.zero_time_index();
 			layer.move_training_data_to_single_predict(batch_index);
 		});
 	}

diff --git a/include/shape/Dim.h b/include/shape/Dim.h
@@ -149,59 +149,16 @@ struct Dim {
 public:
 
 
-	BCINLINE auto operator + (const Dim& other) const {
-		return op_impl(BC::oper::Add(), other);
+#define BC_DIM_OP(op, functor)\
+	Dim operator op(const Dim& other) const {                           \
+		return this->op_impl(BC::oper::functor(), other);                 \
 	}
 
-	BCINLINE auto operator - (const Dim& other) const {
-		return op_impl(BC::oper::Sub(), other);
+#define BC_DIM_INPLACE_OP(op, functor)\
+	Dim operator op##=(const Dim& other) {                              \
+		return this->inplace_op_impl(BC::oper::functor(), other);         \
 	}
 
-	BCINLINE auto operator / (const Dim& other) const {
-		return op_impl(BC::oper::Div(), other);
-	}
-
-	BCINLINE auto operator * (const Dim& other) const {
-		return op_impl(BC::oper::Mul(), other);
-	}
-
-	BCINLINE auto operator > (const Dim& other) const {
-		return op_impl(BC::oper::Greater(), other);
-	}
-
-	BCINLINE auto operator < (const Dim& other) const {
-		return op_impl(BC::oper::Lesser(), other);
-	}
-
-	BCINLINE auto operator >= (const Dim& other) const {
-		return op_impl(BC::oper::Greater_Equal(), other);
-	}
-
-	BCINLINE auto operator <= (const Dim& other) const {
-		return op_impl(BC::oper::Lesser_Equal(), other);
-	}
-
-	BCINLINE auto equal(const Dim& other) const {
-		return op_impl(BC::oper::Equal(), other);
-	}
-
-	BCINLINE Dim& operator += (const Dim& other) {
-		return inplace_op_impl(BC::oper::Add(), other);
-	}
-
-	BCINLINE Dim& operator -= (const Dim& other) {
-		return inplace_opother_impl(BC::oper::Sub(), other);
-	}
-
-	BCINLINE Dim& operator /= (const Dim& other) {
-		return inplace_op_impl(BC::oper::Div(), other);
-	}
-
-	BCINLINE Dim& operator *= (const Dim& other) {
-		return inplace_op_impl(BC::oper::Mul(), other);
-	}
-
-
 #define BC_DIM_INPLACE_SCALAR_OP(op, functor)                           \
 	friend Dim operator op##=(Dim &dim, const value_type& scalar) {     \
 		return dim.inplace_scalar_op_impl(BC::oper::functor(), scalar); \
@@ -216,24 +173,30 @@ struct Dim {
 		return dim.scalar_op_impl(BC::oper::functor(), scalar);         \
 	}
 
-#define BC_DIM_SCALAR_OP_BOTH(op, functor) \
-	BC_DIM_INPLACE_SCALAR_OP(op, functor)  \
-	BC_DIM_SCALAR_OP(op, functor)
-
+#define BC_DIM_OP_FACTORY(op, functor) \
+BC_DIM_OP(op, functor)                 \
+BC_DIM_SCALAR_OP(op, functor)
 
-BC_DIM_SCALAR_OP_BOTH(+, Add)
-BC_DIM_SCALAR_OP_BOTH(-, Sub)
-BC_DIM_SCALAR_OP_BOTH(/, Div)
-BC_DIM_SCALAR_OP_BOTH(*, Mul)
-BC_DIM_SCALAR_OP(<, Lesser)
-BC_DIM_SCALAR_OP(<=, Lesser_Equal)
-BC_DIM_SCALAR_OP(>, Greater)
-BC_DIM_SCALAR_OP(>=, Greater_Equal)
+#define BC_DIM_OP_BOTH(op, functor)   \
+BC_DIM_OP_FACTORY(op, functor)        \
+BC_DIM_INPLACE_OP(op, functor)        \
+BC_DIM_INPLACE_SCALAR_OP(op, functor)
 
+BC_DIM_OP_BOTH(+, Add)
+BC_DIM_OP_BOTH(-, Sub)
+BC_DIM_OP_BOTH(/, Div)
+BC_DIM_OP_BOTH(*, Mul)
+BC_DIM_OP_FACTORY(<, Lesser)
+BC_DIM_OP_FACTORY(<=, Lesser_Equal)
+BC_DIM_OP_FACTORY(>, Greater)
+BC_DIM_OP_FACTORY(>=, Greater_Equal)
 
-#undef BC_DIM_SCALAR_OP
+#undef BC_DIM_OP
+#undef BC_DIM_INPLACE_OP
 #undef BC_DIM_INPLACE_SCALAR_OP
-
+#undef BC_DIM_SCALAR_OP
+#undef BC_DIM_OP_FACTORY
+#undef BC_DIM_OP_BOTH
 
 	BCINLINE
 	bool all(size_t start, size_t end) const {