Skip to content
Snippets Groups Projects
Commit cd620537 authored by Maxxhim's avatar Maxxhim
Browse files

Merge branch 'master' of ssh://ssh.hesge.ch:10572/maxime.clercq/hpc_machine_learning_tp_final

parents e2bbbdf7 23556870
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 5 additions and 0 deletions
functions.py
+ 5
− 0
View file @ cd620537
...@@ -143,8 +143,13 @@ class MatMul(_Function): ...@@ -143,8 +143,13 @@ class MatMul(_Function):
# TODO: Implement the derivative dx for this opetation and add the # TODO: Implement the derivative dx for this opetation and add the
# result of the chain rule on self.dx. # result of the chain rule on self.dx.
####################################################################### #######################################################################
<<<<<<< HEAD
self.dx = np.add(self.x.data, self.y.data.transpose()) self.dx = np.add(self.x.data, self.y.data.transpose())
self.dy = np.add(self.x.data.transpose(), self.y.data) 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
####################################################################### #######################################################################
# --------------------------- END OF YOUR CODE ------------------------ # --------------------------- END OF YOUR CODE ------------------------
####################################################################### #######################################################################
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment