Changeset 26341 in project


Ignore:
Timestamp:
04/02/12 06:58:13 (9 years ago)
Author:
Ivan Raikov
Message:

atlas-lapack: using bind instead of easyffi

Location:
release/4/atlas-lapack
Files:
6 edited
1 copied

Legend:

Unmodified
Added
Removed
  • release/4/atlas-lapack/tags/3.0/atlas-lapack.meta

    r24313 r26341  
    1818 ; A list of eggs atlas-lapack depends on.
    1919
    20  (needs easyffi blas)
     20 (needs bind blas)
    2121
    2222 (test-depends test)
  • release/4/atlas-lapack/tags/3.0/atlas-lapack.scm

    r24313 r26341  
    33;; library.
    44;;
    5 ;; Copyright 2007-2011 Ivan Raikov and the Okinawa Institute of Science and Technology
     5;; Copyright 2007-2012 Ivan Raikov and the Okinawa Institute of Science and Technology
    66;;
    77;; This program is free software: you can redistribute it and/or
     
    2222
    2323         (
    24           clapack:dgesv
    25           sgesv
    2624                 dgesv
    2725                 cgesv
     
    145143         
    146144    (import scheme chicken data-structures foreign)
    147     (require-extension srfi-4 blas easyffi)
    148 
    149 
    150 #>!
     145    (require-extension srfi-4 blas bind)
     146
     147
     148(bind* #<<EOF
    151149typedef float  CCOMPLEX;
    152150typedef double ZCOMPLEX;
    153 
    154 ___declare(substitute,"clapack_;clapack:")
    155151
    156152
     
    339335                   const int N, const ZCOMPLEX *A, const int lda);
    340336
    341 <#
     337EOF
     338)
    342339
    343340(define (atlas-lapack:error x . rest)
     
    357354      (lambda (x r c)
    358355        (let* ((fn      (cadr x))
    359                (cfname  (string->symbol (conc "clapack:" (symbol->string (car fn)))))
     356               (cfname  (string->symbol (conc "clapack_" (symbol->string (car fn)))))
    360357               (ret     (caddr x))
    361358               (errs    (cadddr x))
  • release/4/atlas-lapack/tags/3.0/atlas-lapack.setup

    r24313 r26341  
    3737
    3838
    39 (compile -O2 -d0 -s atlas-lapack.scm -j atlas-lapack -L "\"" ,ld-options "\"" -X easyffi)
     39(compile -O3 -d0 -s atlas-lapack.scm -j atlas-lapack -L "\"" ,ld-options "\"" )
    4040(compile -O2 -d0 -s atlas-lapack.import.scm)
    4141
     
    4343 'atlas-lapack
    4444 `(,(dynld-name "atlas-lapack") ,(dynld-name "atlas-lapack.import") )
    45  `((version 2.1)
     45 `((version 3.0)
    4646   ))
    4747
  • release/4/atlas-lapack/trunk/atlas-lapack.meta

    r24313 r26341  
    1818 ; A list of eggs atlas-lapack depends on.
    1919
    20  (needs easyffi blas)
     20 (needs bind blas)
    2121
    2222 (test-depends test)
  • release/4/atlas-lapack/trunk/atlas-lapack.scm

    r24313 r26341  
    33;; library.
    44;;
    5 ;; Copyright 2007-2011 Ivan Raikov and the Okinawa Institute of Science and Technology
     5;; Copyright 2007-2012 Ivan Raikov and the Okinawa Institute of Science and Technology
    66;;
    77;; This program is free software: you can redistribute it and/or
     
    2222
    2323         (
    24           clapack:dgesv
    25           sgesv
    2624                 dgesv
    2725                 cgesv
     
    145143         
    146144    (import scheme chicken data-structures foreign)
    147     (require-extension srfi-4 blas easyffi)
    148 
    149 
    150 #>!
     145    (require-extension srfi-4 blas bind)
     146
     147
     148(bind* #<<EOF
    151149typedef float  CCOMPLEX;
    152150typedef double ZCOMPLEX;
    153 
    154 ___declare(substitute,"clapack_;clapack:")
    155151
    156152
     
    339335                   const int N, const ZCOMPLEX *A, const int lda);
    340336
    341 <#
     337EOF
     338)
    342339
    343340(define (atlas-lapack:error x . rest)
     
    357354      (lambda (x r c)
    358355        (let* ((fn      (cadr x))
    359                (cfname  (string->symbol (conc "clapack:" (symbol->string (car fn)))))
     356               (cfname  (string->symbol (conc "clapack_" (symbol->string (car fn)))))
    360357               (ret     (caddr x))
    361358               (errs    (cadddr x))
  • release/4/atlas-lapack/trunk/atlas-lapack.setup

    r24313 r26341  
    3737
    3838
    39 (compile -O2 -d0 -s atlas-lapack.scm -j atlas-lapack -L "\"" ,ld-options "\"" -X easyffi)
     39(compile -O3 -d0 -s atlas-lapack.scm -j atlas-lapack -L "\"" ,ld-options "\"" )
    4040(compile -O2 -d0 -s atlas-lapack.import.scm)
    4141
     
    4343 'atlas-lapack
    4444 `(,(dynld-name "atlas-lapack") ,(dynld-name "atlas-lapack.import") )
    45  `((version 2.1)
     45 `((version 3.0)
    4646   ))
    4747
Note: See TracChangeset for help on using the changeset viewer.