Repository: systemml
Updated Branches:
  refs/heads/master 49f9eeaa3 -> fb675b82c


[HOTFIX] Fix maxpool/avgpool refactoring (start offsets and init)

Project: http://git-wip-us.apache.org/repos/asf/systemml/repo
Commit: http://git-wip-us.apache.org/repos/asf/systemml/commit/fb675b82
Tree: http://git-wip-us.apache.org/repos/asf/systemml/tree/fb675b82
Diff: http://git-wip-us.apache.org/repos/asf/systemml/diff/fb675b82

Branch: refs/heads/master
Commit: fb675b82cfce6912cccbee1875d5df259c44f9ed
Parents: 49f9eea
Author: Matthias Boehm <[email protected]>
Authored: Tue Jul 24 23:08:58 2018 -0700
Committer: Matthias Boehm <[email protected]>
Committed: Tue Jul 24 23:08:58 2018 -0700

----------------------------------------------------------------------
 .../apache/sysml/runtime/matrix/data/LibMatrixDNNPooling.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/systemml/blob/fb675b82/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixDNNPooling.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixDNNPooling.java 
b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixDNNPooling.java
index 7fb33a4..0e6b2ff 100644
--- 
a/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixDNNPooling.java
+++ 
b/src/main/java/org/apache/sysml/runtime/matrix/data/LibMatrixDNNPooling.java
@@ -117,7 +117,7 @@ public class LibMatrixDNNPooling {
                        Arrays.fill(out, rl*CPQ, ru*CPQ, minVal);
                        //quick-path w/o materialized index arrays 
                        for(int i = rl; i < ru; i++)
-                               for (int c = 0, off=ii+(i-rl)*CHW, oix=oi; c < 
C; c++, off+=HW)
+                               for (int c = 0, off=ii+(i-rl)*CHW, 
oix=oi+(i-rl)*CPQ; c < C; c++, off+=HW)
                                        for (int p = 0; p < P; p++, oix+=Q)
                                                for (int h = p; h < 
Math.min(p+R,H); h++)
                                                        for (int q = 0, 
off2=off+h*W; q < Q; q++) {
@@ -139,7 +139,7 @@ public class LibMatrixDNNPooling {
                        _rl = rl; _ru = ru;
                        _params = params;
                        _poolingType = poolingType;
-                       _poolingMultiplier = 1/(params.R*params.S);
+                       _poolingMultiplier = 1d/(params.R*params.S);
                }
                
                @Override

Reply via email to