diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 25 | ||||
| -rw-r--r-- | sly/config.scm.in | 6 | ||||
| -rw-r--r-- | sly/wrappers/gsl.scm | 55 |
4 files changed, 1 insertions, 86 deletions
diff --git a/Makefile.am b/Makefile.am index 89bf94d..97fc1c8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -64,7 +64,6 @@ SOURCES = \ WRAPPER_SOURCES = \ sly/wrappers/gl.scm \ - sly/wrappers/gsl.scm \ sly/wrappers/util.scm EXTRA_DIST += \ diff --git a/configure.ac b/configure.ac index f053e73..ff0f6e1 100644 --- a/configure.ac +++ b/configure.ac @@ -27,29 +27,4 @@ GUILE_MODULE_REQUIRED([sdl2 mixer]) GUILE_MODULE_REQUIRED([sdl2 ttf]) GUILE_MODULE_REQUIRED([gl]) -LIBGSLCBLAS="libgslcblas" -LIBGSLCBLAS_LIBDIR="no" -LIBGSLCBLAS_PREFIX="no" - -AC_ARG_WITH([libgslcblas-prefix], - [AS_HELP_STRING([--with-libgslcblas-prefix=DIR], [search for GSL CBLAS in DIR])], - [case "$withval" in - yes|no) - ;; - *) - LIBGSLCBLAS="$withval/lib/libgslcblas" - LIBGSLCBLAS_PREFIX="$withval" - LIBGSLCBLAS_LIBDIR="$withval/lib" - ;; - esac]) - -dnl Library name suitable for `dynamic-link'. -AC_MSG_CHECKING([for libgslcblas shared library name]) -AC_MSG_RESULT([$LIBGSLCBLAS]) -AC_SUBST([LIBGSLCBLAS]) -AC_SUBST([LIBGSLCBLAS_PREFIX]) -AC_SUBST([LIBGSLCBLAS_LIBDIR]) - -PKG_CHECK_MODULES([GSL], [gsl]) - AC_OUTPUT diff --git a/sly/config.scm.in b/sly/config.scm.in index e0f2cc9..46f8bfe 100644 --- a/sly/config.scm.in +++ b/sly/config.scm.in @@ -23,8 +23,7 @@ (define-module (sly config) #:export (%datadir - scope-datadir - %libgslcblas)) + scope-datadir)) (define %datadir (or (getenv "SLY_DATADIR") "@sly_datadir@/sly")) @@ -32,6 +31,3 @@ (define (scope-datadir file) "Append the Sly data directory to FILE." (string-append %datadir file)) - -(define %libgslcblas - "@LIBGSLCBLAS@") diff --git a/sly/wrappers/gsl.scm b/sly/wrappers/gsl.scm deleted file mode 100644 index 3146757..0000000 --- a/sly/wrappers/gsl.scm +++ /dev/null @@ -1,55 +0,0 @@ -;;; Sly -;;; Copyright (C) 2014 David Thompson <davet@gnu.org> -;;; -;;; Sly is free software: you can redistribute it and/or modify it -;;; under the terms of the GNU General Public License as published by -;;; the Free Software Foundation, either version 3 of the License, or -;;; (at your option) any later version. -;;; -;;; Sly is distributed in the hope that it will be useful, but WITHOUT -;;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -;;; or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public -;;; License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with this program. If not, see -;;; <http://www.gnu.org/licenses/>. - -;;; Commentary: -;; -;; Wrapper for functions from the GNU Scientific Library. -;; -;;; Code: - -(define-module (sly wrappers gsl) - #:use-module (system foreign) - #:use-module (sly config) - #:export (cblas-row-major - cblas-no-trans - cblas-sgemm - cblas-sgemv)) - -;;; -;;; Constants -;;; - -(define cblas-row-major 101) -(define cblas-no-trans 111) - -;;; -;;; GSL CBLAS Functions -;;; - -(define libgslcblas (dynamic-link %libgslcblas)) - -(define-syntax-rule (define-foreign name ret string-name args) - (define name - (pointer->procedure ret (dynamic-func string-name libgslcblas) args))) - -(define-foreign cblas-sgemm - void "cblas_sgemm" (list int int int int int int float '* - int '* int float '* int)) - -(define-foreign cblas-sgemv - void "cblas_sgemv" (list int int int int float '* int '* - int float '* int)) |