From 80501a6b74eb61f8c257ef48d8d673b6ad0bd1ec Mon Sep 17 00:00:00 2001
From: Maxxhim <maxc2507@gmail.com>
Date: Fri, 3 Apr 2020 15:06:58 +0200
Subject: [PATCH] reset patch v2
---
functions.py | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/functions.py b/functions.py
index 751a209..dcb4d1b 100644
--- a/functions.py
+++ b/functions.py
@@ -143,13 +143,8 @@ class MatMul(_Function):
# TODO: Implement the derivative dx for this opetation and add the
# result of the chain rule on self.dx.
#######################################################################
-<<<<<<< HEAD
- self.dx = np.add(self.x.data, self.y.data.transpose())
- self.dy = np.add(self.x.data.transpose(), self.y.data)
-=======
- self.dx = grad * np.add(self.x.data.transpose(), self.y.data)
- self.dy = grad * np.add(self.x.data, self.y.data.transpose())
->>>>>>> 23556870b4c6212c974bae80ce7df0d817c2c099
+ self.dx = grad * np.add(self.x, self.y.data.transpose())
+ self.dy = grad * np.add(self.x.data.transpose(), self.y.data)
#######################################################################
# --------------------------- END OF YOUR CODE ------------------------
#######################################################################
--
GitLab