[Matlisp-commit] [matlisp-git]matlisp branch matlisp-cffi updated. 2012-02-23-33-ge6c4216

[Akshay S. <ak...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "matlisp".

The branch, matlisp-cffi has been updated
       via  e6c42164c51c0fbef18cb02df5c5d8f37ce16ef5 (commit)
       via  035339c307401f593732418ecdba8fa6785b678d (commit)
       via  068408a227df4427520decc0f10fe0a253a5cdbb (commit)
       via  1e8efae3363f6d50e91831cf39da6b64c106cea3 (commit)
       via  91cfba559ec57243acb0d09ae0a9840fb7e4082b (commit)
       via  c889997acda2f13b2d61c442a61f5e3b95004016 (commit)
       via  c9ac9850a4916f2871fa49efd6beb1d5d38b357b (commit)
       via  089a044899e6f499821fbdefa69157e0c329c0cf (commit)
      from  228fb9ad5bc2e26dccbfd4f5ad2d2228bab8c39e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e6c42164c51c0fbef18cb02df5c5d8f37ce16ef5
Merge: 228fb9a 035339c
Author: Akshay Srinivasan <aks...@gm...>
Date:   Fri Mar 9 21:50:22 2012 +0530

    Merge branch 'master' into matlisp-cffi
    
    Conflicts:
    	matlisp.asd
    	src/gemm.lisp

diff --cc matlisp.asd
index 6288219,dc270d0..4632cf4
--- a/matlisp.asd
+++ b/matlisp.asd
@@@ -304,4 -297,20 +309,20 @@@
    :components
    ((:module "src"
      :components
-     ((:file "dlsode")))))
+     ((:file "dlsode")))))
+ 
+ (defmethod perform ((op asdf:test-op) (c (eql (asdf:find-system :matlisp))))
+   (oos 'asdf:test-op 'matlisp-tests))
+ 
+ (asdf:defsystem matlisp-tests
+   :depends-on (matlisp)
+   :in-order-to ((compile-op (load-op :rt))
+ 		(test-op (load-op :rt :matlisp)))
+   :components
+   ((:module "tests"
+ 	    :components
+ 	    ((:file "blas")))))
+ 
+ (defmethod perform ((op test-op) (c (eql (asdf:find-system :matlisp-tests))))
+   (or (funcall (intern "DO-TESTS" (find-package "RT")))
 -      (error "TEST-OP failed for MATLISP-TESTS")))
++      (error "TEST-OP failed for MATLISP-TESTS")))
diff --cc src/ffi-cffi-interpreter-specific.lisp
index 06b7fdb,db2db4c..75afa9a
--- a/src/ffi-cffi-interpreter-specific.lisp
+++ b/src/ffi-cffi-interpreter-specific.lisp
@@@ -93,17 -99,9 +99,17 @@@ Return
    ;; the alien object but before the alien function is called.  Let's
    ;; be safe rather than sorry.
    `(with-fortran-float-modes
 -       (without-gcing
 -	 (let (,@(mapcar #'(lambda (pair)
 -			     `(,(first pair)
 -				(vector-data-address ,(second pair))))
 -			 vlist))
 -	   ,@body))))
 +     (without-gcing
 +       (let (,@(mapcar #'(lambda (lst)
 +			   (destructuring-bind (addr-var var &key inc-type inc) lst
 +			     `(,addr-var ,@(if inc
 +					       `((cffi:inc-pointer (vector-data-address ,var)
 +								   ,@(case inc-type
 +									   (:double-float  `((* ,inc 8)))
 +									   (:single-float `((* ,inc 4)))
 +									   (:complex-double-float  `((* ,inc 16)))
 +									   (:complex-single-float  `((* ,inc 8)))
 +									   (t `(,inc)))))
 +					       `((vector-data-address ,var))))))
 +		       vlist))
- 	 ,@body))))
++	 ,@body))))

-----------------------------------------------------------------------

Summary of changes:
 configure                              |    1 +
 configure.ac                           |    1 +
 lib/lazy-loader.lisp.in                |    2 +-
 matlisp.asd                            |   23 ++++++-
 src/axpy.lisp                          |   10 ++--
 src/copy.lisp                          |    6 +-
 src/diag.lisp                          |    6 +-
 src/f77-mangling.lisp.in               |    1 +
 src/ffi-cffi-interpreter-specific.lisp |   10 ++-
 src/gemm.lisp                          |    2 +-
 src/mplus.lisp                         |   34 +++++-----
 src/ref.lisp                           |  125 +++++++++++++++-----------------
 src/scal.lisp                          |   20 +++---
 src/specfun.lisp                       |    4 +-
 tests/blas.lisp                        |   39 ++++++++++
 15 files changed, 173 insertions(+), 111 deletions(-)
 create mode 100644 tests/blas.lisp


hooks/post-receive
-- 
matlisp