steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

get rid of underlying>>s, again

db4
Joe Groff 2009-02-09 17:23:56 -06:00
parent bfc2af7ea1
commit fecc989098
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
basis/math/blas/matrices/matrices.factor
View File

@ -47,19 +47,19 @@ GENERIC: (blas-matrix-like) ( data ld rows cols transpose exemplar -- matrix )
A rows>> A rows>>
A cols>> A cols>>
alpha alpha
A underlying>> A
A ld>> A ld>>
x underlying>> x
x inc>> x inc>>
beta beta
y underlying>> y
y inc>> y inc>>
y ; inline y ; inline
: (validate-ger) ( x y A -- ) : (validate-ger) ( x y A -- )
{ {
[ nip [ length>> ] [ Mheight ] bi* = ] [ [ length>> ] [ drop ] [ Mheight ] tri* = ]
[ nipd [ length>> ] [ Mwidth ] bi* = ] [ [ drop ] [ length>> ] [ Mwidth ] tri* = ]
} 3&& } 3&&
[ "Mismatched vertices and matrix in vector outer product" throw ] [ "Mismatched vertices and matrix in vector outer product" throw ]
unless ; unless ;
@ -71,19 +71,19 @@ GENERIC: (blas-matrix-like) ( data ld rows cols transpose exemplar -- matrix )
A rows>> A rows>>
A cols>> A cols>>
alpha alpha
x underlying>> x
x inc>> x inc>>
y underlying>> y
y inc>> y inc>>
A underlying>> A
A ld>> A ld>>
A f >>transpose ; inline A f >>transpose ; inline
: (validate-gemm) ( A B C -- ) : (validate-gemm) ( A B C -- )
{ {
[ drop [ Mwidth ] [ Mheight ] bi* = ] [ [ Mwidth ] [ Mheight ] [ drop ] tri* = ]
[ nip [ Mheight ] bi@ = ] [ [ Mheight ] [ drop ] [ Mheight ] tri* = ]
[ nipd [ Mwidth ] bi@ = ] [ [ drop ] [ Mwidth ] [ Mwidth ] tri* = ]
} 3&& } 3&&
[ "Mismatched matrices in matrix multiplication" throw ] [ "Mismatched matrices in matrix multiplication" throw ]
unless ; unless ;
@ -98,12 +98,12 @@ GENERIC: (blas-matrix-like) ( data ld rows cols transpose exemplar -- matrix )
C cols>> C cols>>
A Mwidth A Mwidth
alpha alpha
A underlying>> A
A ld>> A ld>>
B underlying>> B
B ld>> B ld>>
beta beta
C underlying>> C
C ld>> C ld>>
C f >>transpose ; inline C f >>transpose ; inline