[131492] trunk/dports/python/py-scipy
sean at macports.org
sean at macports.org
Mon Jan 12 16:59:10 PST 2015
Revision: 131492
https://trac.macports.org/changeset/131492
Author: sean at macports.org
Date: 2015-01-12 16:59:09 -0800 (Mon, 12 Jan 2015)
Log Message:
-----------
py-scipy: update to 0.15; add patches to fix #46428
Modified Paths:
--------------
trunk/dports/python/py-scipy/Portfile
Added Paths:
-----------
trunk/dports/python/py-scipy/files/
trunk/dports/python/py-scipy/files/patch-accelerate.diff
Modified: trunk/dports/python/py-scipy/Portfile
===================================================================
--- trunk/dports/python/py-scipy/Portfile 2015-01-13 00:59:07 UTC (rev 131491)
+++ trunk/dports/python/py-scipy/Portfile 2015-01-13 00:59:09 UTC (rev 131492)
@@ -7,8 +7,7 @@
PortGroup compilers 1.0
name py-scipy
-version 0.14.1
-revision 2
+version 0.15.0
platforms darwin
license BSD
maintainers sean michaelld openmaintainer
@@ -19,8 +18,8 @@
master_sites sourceforge:project/scipy/scipy/${version}/
distname scipy-${version}
-checksums rmd160 137ac20d4fad632b42c3c5ce9ca759aad22715c1 \
- sha256 ab75f161107ee411c054abc35e28ec2d19bb5ec8437aaf6c32b80916568f7dad
+checksums rmd160 b7b65e13a6ba97d5daa2fbb9433445a99a76cb97 \
+ sha256 0c74e31e08acc8bf9b6ceb9bced73df2ae0cc76003e0366350bc7b26292bf8b1
python.versions 26 27 33 34
@@ -41,21 +40,27 @@
destroot.env-append CCFLAGS="-I${prefix}/include -L${prefix}/lib"
configure.fflags-append -fno-second-underscore
- pre-configure {
- if {![fortran_variant_isset]} {
- configure.fflags-append -ff2c
+ # https://trac.macports.org/ticket/46395
+ # https://trac.macports.org/ticket/46428
+ # https://github.com/scipy/scipy/issues/4383
+ # remove this patch after next version update
+ patch.pre_args -p1
+ patchfiles-append patch-accelerate.diff
+
+ post-patch {
+ if {![variant_isset atlas] && [gcc_variant_isset]} {
+ reinplace "s,#include <Accelerate/Accelerate.h>,#include <cblas.h>,g" \
+ ${worksrcpath}/scipy/_build_utils/src/wrap_accelerate_c.c \
+ ${worksrcpath}/scipy/_build_utils/src/wrap_g77_abi_c.c
}
+ }
+ pre-configure {
set fc_options "config_fc --fcompiler gnu95 --f77exec ${configure.f77} --f77flags='${configure.f77_archflags} ${configure.fflags}' --f90exec ${configure.f90} --f90flags='${configure.f90_archflags} ${configure.fflags}'"
set config_options "config --cc ${configure.cc} --include-dirs ${prefix}/include --library-dirs ${prefix}/lib"
build.cmd-append ${fc_options} ${config_options}
destroot.cmd-append ${fc_options} ${config_options}
- if {![variant_isset atlas]} {
- # https://trac.macports.org/ticket/46395
- configure.cppflags-append -D__ACCELERATE__
- }
-
build.env-append CC="${configure.cc}" \
CXX="${configure.cxx}" \
CFLAGS="${configure.cc_archflags}" \
Added: trunk/dports/python/py-scipy/files/patch-accelerate.diff
===================================================================
--- trunk/dports/python/py-scipy/files/patch-accelerate.diff (rev 0)
+++ trunk/dports/python/py-scipy/files/patch-accelerate.diff 2015-01-13 00:59:09 UTC (rev 131492)
@@ -0,0 +1,609 @@
+From 7dc0eee577529422e0631fafe4220a128203cac9 Mon Sep 17 00:00:00 2001
+From: Pauli Virtanen <pav at iki.fi>
+Date: Mon, 12 Jan 2015 11:15:02 +0200
+Subject: [PATCH] BUG: bundle cblas.h in Accelerate ABI wrappers to enable
+ compilation with gcc
+
+Apple's Accelerate/Accelerate.h uses clang extensions apparently not
+available on gcc, and cannot be used with gcc. The path to the system
+cblas.h is apparently not easily found, so we bundle it instead.
+
+Fixes gh-4383
+---
+ scipy/_build_utils/src/cblas.h | 565 +++++++++++++++++++++++++++++
+ scipy/_build_utils/src/wrap_accelerate_c.c | 2 +-
+ scipy/_build_utils/src/wrap_g77_abi_c.c | 2 +-
+ 3 files changed, 567 insertions(+), 2 deletions(-)
+ create mode 100644 scipy/_build_utils/src/cblas.h
+
+diff --git a/scipy/_build_utils/src/cblas.h b/scipy/_build_utils/src/cblas.h
+new file mode 100644
+index 0000000..d57b1ae
+--- /dev/null
++++ b/scipy/_build_utils/src/cblas.h
+@@ -0,0 +1,565 @@
++#ifndef CBLAS_H
++#define CBLAS_H
++#include <stddef.h>
++
++/*
++ * Enumerated and derived types
++ */
++#define CBLAS_INDEX size_t /* this may vary between platforms */
++enum CBLAS_ORDER {CblasRowMajor=101, CblasColMajor=102};
++enum CBLAS_TRANSPOSE {CblasNoTrans=111, CblasTrans=112, CblasConjTrans=113};
++enum CBLAS_UPLO {CblasUpper=121, CblasLower=122};
++enum CBLAS_DIAG {CblasNonUnit=131, CblasUnit=132};
++enum CBLAS_SIDE {CblasLeft=141, CblasRight=142};
++
++/*
++ * ===========================================================================
++ * Prototypes for level 1 BLAS functions (complex are recast as routines)
++ * ===========================================================================
++ */
++float cblas_sdsdot(const int N, const float alpha, const float *X,
++ const int incX, const float *Y, const int incY);
++double cblas_dsdot(const int N, const float *X, const int incX, const float *Y,
++ const int incY);
++float cblas_sdot(const int N, const float *X, const int incX,
++ const float *Y, const int incY);
++double cblas_ddot(const int N, const double *X, const int incX,
++ const double *Y, const int incY);
++
++/*
++ * Functions having prefixes Z and C only
++ */
++void cblas_cdotu_sub(const int N, const void *X, const int incX,
++ const void *Y, const int incY, void *dotu);
++void cblas_cdotc_sub(const int N, const void *X, const int incX,
++ const void *Y, const int incY, void *dotc);
++
++void cblas_zdotu_sub(const int N, const void *X, const int incX,
++ const void *Y, const int incY, void *dotu);
++void cblas_zdotc_sub(const int N, const void *X, const int incX,
++ const void *Y, const int incY, void *dotc);
++
++
++/*
++ * Functions having prefixes S D SC DZ
++ */
++float cblas_snrm2(const int N, const float *X, const int incX);
++float cblas_sasum(const int N, const float *X, const int incX);
++
++double cblas_dnrm2(const int N, const double *X, const int incX);
++double cblas_dasum(const int N, const double *X, const int incX);
++
++float cblas_scnrm2(const int N, const void *X, const int incX);
++float cblas_scasum(const int N, const void *X, const int incX);
++
++double cblas_dznrm2(const int N, const void *X, const int incX);
++double cblas_dzasum(const int N, const void *X, const int incX);
++
++
++/*
++ * Functions having standard 4 prefixes (S D C Z)
++ */
++CBLAS_INDEX cblas_isamax(const int N, const float *X, const int incX);
++CBLAS_INDEX cblas_idamax(const int N, const double *X, const int incX);
++CBLAS_INDEX cblas_icamax(const int N, const void *X, const int incX);
++CBLAS_INDEX cblas_izamax(const int N, const void *X, const int incX);
++
++/*
++ * ===========================================================================
++ * Prototypes for level 1 BLAS routines
++ * ===========================================================================
++ */
++
++/*
++ * Routines with standard 4 prefixes (s, d, c, z)
++ */
++void cblas_sswap(const int N, float *X, const int incX,
++ float *Y, const int incY);
++void cblas_scopy(const int N, const float *X, const int incX,
++ float *Y, const int incY);
++void cblas_saxpy(const int N, const float alpha, const float *X,
++ const int incX, float *Y, const int incY);
++
++void cblas_dswap(const int N, double *X, const int incX,
++ double *Y, const int incY);
++void cblas_dcopy(const int N, const double *X, const int incX,
++ double *Y, const int incY);
++void cblas_daxpy(const int N, const double alpha, const double *X,
++ const int incX, double *Y, const int incY);
++
++void cblas_cswap(const int N, void *X, const int incX,
++ void *Y, const int incY);
++void cblas_ccopy(const int N, const void *X, const int incX,
++ void *Y, const int incY);
++void cblas_caxpy(const int N, const void *alpha, const void *X,
++ const int incX, void *Y, const int incY);
++
++void cblas_zswap(const int N, void *X, const int incX,
++ void *Y, const int incY);
++void cblas_zcopy(const int N, const void *X, const int incX,
++ void *Y, const int incY);
++void cblas_zaxpy(const int N, const void *alpha, const void *X,
++ const int incX, void *Y, const int incY);
++
++
++/*
++ * Routines with S and D prefix only
++ */
++void cblas_srotg(float *a, float *b, float *c, float *s);
++void cblas_srotmg(float *d1, float *d2, float *b1, const float b2, float *P);
++void cblas_srot(const int N, float *X, const int incX,
++ float *Y, const int incY, const float c, const float s);
++void cblas_srotm(const int N, float *X, const int incX,
++ float *Y, const int incY, const float *P);
++
++void cblas_drotg(double *a, double *b, double *c, double *s);
++void cblas_drotmg(double *d1, double *d2, double *b1, const double b2, double *P);
++void cblas_drot(const int N, double *X, const int incX,
++ double *Y, const int incY, const double c, const double s);
++void cblas_drotm(const int N, double *X, const int incX,
++ double *Y, const int incY, const double *P);
++
++
++/*
++ * Routines with S D C Z CS and ZD prefixes
++ */
++void cblas_sscal(const int N, const float alpha, float *X, const int incX);
++void cblas_dscal(const int N, const double alpha, double *X, const int incX);
++void cblas_cscal(const int N, const void *alpha, void *X, const int incX);
++void cblas_zscal(const int N, const void *alpha, void *X, const int incX);
++void cblas_csscal(const int N, const float alpha, void *X, const int incX);
++void cblas_zdscal(const int N, const double alpha, void *X, const int incX);
++
++/*
++ * ===========================================================================
++ * Prototypes for level 2 BLAS
++ * ===========================================================================
++ */
++
++/*
++ * Routines with standard 4 prefixes (S, D, C, Z)
++ */
++void cblas_sgemv(const enum CBLAS_ORDER order,
++ const enum CBLAS_TRANSPOSE TransA, const int M, const int N,
++ const float alpha, const float *A, const int lda,
++ const float *X, const int incX, const float beta,
++ float *Y, const int incY);
++void cblas_sgbmv(const enum CBLAS_ORDER order,
++ const enum CBLAS_TRANSPOSE TransA, const int M, const int N,
++ const int KL, const int KU, const float alpha,
++ const float *A, const int lda, const float *X,
++ const int incX, const float beta, float *Y, const int incY);
++void cblas_strmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
++ const int N, const float *A, const int lda,
++ float *X, const int incX);
++void cblas_stbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
++ const int N, const int K, const float *A, const int lda,
++ float *X, const int incX);
++void cblas_stpmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
++ const int N, const float *Ap, float *X, const int incX);
++void cblas_strsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
++ const int N, const float *A, const int lda, float *X,
++ const int incX);
++void cblas_stbsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
++ const int N, const int K, const float *A, const int lda,
++ float *X, const int incX);
++void cblas_stpsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
++ const int N, const float *Ap, float *X, const int incX);
++
++void cblas_dgemv(const enum CBLAS_ORDER order,
++ const enum CBLAS_TRANSPOSE TransA, const int M, const int N,
++ const double alpha, const double *A, const int lda,
++ const double *X, const int incX, const double beta,
++ double *Y, const int incY);
++void cblas_dgbmv(const enum CBLAS_ORDER order,
++ const enum CBLAS_TRANSPOSE TransA, const int M, const int N,
++ const int KL, const int KU, const double alpha,
++ const double *A, const int lda, const double *X,
++ const int incX, const double beta, double *Y, const int incY);
++void cblas_dtrmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
++ const int N, const double *A, const int lda,
++ double *X, const int incX);
++void cblas_dtbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
++ const int N, const int K, const double *A, const int lda,
++ double *X, const int incX);
++void cblas_dtpmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
++ const int N, const double *Ap, double *X, const int incX);
++void cblas_dtrsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
++ const int N, const double *A, const int lda, double *X,
++ const int incX);
++void cblas_dtbsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
++ const int N, const int K, const double *A, const int lda,
++ double *X, const int incX);
++void cblas_dtpsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
++ const int N, const double *Ap, double *X, const int incX);
++
++void cblas_cgemv(const enum CBLAS_ORDER order,
++ const enum CBLAS_TRANSPOSE TransA, const int M, const int N,
++ const void *alpha, const void *A, const int lda,
++ const void *X, const int incX, const void *beta,
++ void *Y, const int incY);
++void cblas_cgbmv(const enum CBLAS_ORDER order,
++ const enum CBLAS_TRANSPOSE TransA, const int M, const int N,
++ const int KL, const int KU, const void *alpha,
++ const void *A, const int lda, const void *X,
++ const int incX, const void *beta, void *Y, const int incY);
++void cblas_ctrmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
++ const int N, const void *A, const int lda,
++ void *X, const int incX);
++void cblas_ctbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
++ const int N, const int K, const void *A, const int lda,
++ void *X, const int incX);
++void cblas_ctpmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
++ const int N, const void *Ap, void *X, const int incX);
++void cblas_ctrsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
++ const int N, const void *A, const int lda, void *X,
++ const int incX);
++void cblas_ctbsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
++ const int N, const int K, const void *A, const int lda,
++ void *X, const int incX);
++void cblas_ctpsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
++ const int N, const void *Ap, void *X, const int incX);
++
++void cblas_zgemv(const enum CBLAS_ORDER order,
++ const enum CBLAS_TRANSPOSE TransA, const int M, const int N,
++ const void *alpha, const void *A, const int lda,
++ const void *X, const int incX, const void *beta,
++ void *Y, const int incY);
++void cblas_zgbmv(const enum CBLAS_ORDER order,
++ const enum CBLAS_TRANSPOSE TransA, const int M, const int N,
++ const int KL, const int KU, const void *alpha,
++ const void *A, const int lda, const void *X,
++ const int incX, const void *beta, void *Y, const int incY);
++void cblas_ztrmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
++ const int N, const void *A, const int lda,
++ void *X, const int incX);
++void cblas_ztbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
++ const int N, const int K, const void *A, const int lda,
++ void *X, const int incX);
++void cblas_ztpmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
++ const int N, const void *Ap, void *X, const int incX);
++void cblas_ztrsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
++ const int N, const void *A, const int lda, void *X,
++ const int incX);
++void cblas_ztbsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
++ const int N, const int K, const void *A, const int lda,
++ void *X, const int incX);
++void cblas_ztpsv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE TransA, const enum CBLAS_DIAG Diag,
++ const int N, const void *Ap, void *X, const int incX);
++
++
++/*
++ * Routines with S and D prefixes only
++ */
++void cblas_ssymv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const int N, const float alpha, const float *A,
++ const int lda, const float *X, const int incX,
++ const float beta, float *Y, const int incY);
++void cblas_ssbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const int N, const int K, const float alpha, const float *A,
++ const int lda, const float *X, const int incX,
++ const float beta, float *Y, const int incY);
++void cblas_sspmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const int N, const float alpha, const float *Ap,
++ const float *X, const int incX,
++ const float beta, float *Y, const int incY);
++void cblas_sger(const enum CBLAS_ORDER order, const int M, const int N,
++ const float alpha, const float *X, const int incX,
++ const float *Y, const int incY, float *A, const int lda);
++void cblas_ssyr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const int N, const float alpha, const float *X,
++ const int incX, float *A, const int lda);
++void cblas_sspr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const int N, const float alpha, const float *X,
++ const int incX, float *Ap);
++void cblas_ssyr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const int N, const float alpha, const float *X,
++ const int incX, const float *Y, const int incY, float *A,
++ const int lda);
++void cblas_sspr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const int N, const float alpha, const float *X,
++ const int incX, const float *Y, const int incY, float *A);
++
++void cblas_dsymv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const int N, const double alpha, const double *A,
++ const int lda, const double *X, const int incX,
++ const double beta, double *Y, const int incY);
++void cblas_dsbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const int N, const int K, const double alpha, const double *A,
++ const int lda, const double *X, const int incX,
++ const double beta, double *Y, const int incY);
++void cblas_dspmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const int N, const double alpha, const double *Ap,
++ const double *X, const int incX,
++ const double beta, double *Y, const int incY);
++void cblas_dger(const enum CBLAS_ORDER order, const int M, const int N,
++ const double alpha, const double *X, const int incX,
++ const double *Y, const int incY, double *A, const int lda);
++void cblas_dsyr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const int N, const double alpha, const double *X,
++ const int incX, double *A, const int lda);
++void cblas_dspr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const int N, const double alpha, const double *X,
++ const int incX, double *Ap);
++void cblas_dsyr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const int N, const double alpha, const double *X,
++ const int incX, const double *Y, const int incY, double *A,
++ const int lda);
++void cblas_dspr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const int N, const double alpha, const double *X,
++ const int incX, const double *Y, const int incY, double *A);
++
++
++/*
++ * Routines with C and Z prefixes only
++ */
++void cblas_chemv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const int N, const void *alpha, const void *A,
++ const int lda, const void *X, const int incX,
++ const void *beta, void *Y, const int incY);
++void cblas_chbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const int N, const int K, const void *alpha, const void *A,
++ const int lda, const void *X, const int incX,
++ const void *beta, void *Y, const int incY);
++void cblas_chpmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const int N, const void *alpha, const void *Ap,
++ const void *X, const int incX,
++ const void *beta, void *Y, const int incY);
++void cblas_cgeru(const enum CBLAS_ORDER order, const int M, const int N,
++ const void *alpha, const void *X, const int incX,
++ const void *Y, const int incY, void *A, const int lda);
++void cblas_cgerc(const enum CBLAS_ORDER order, const int M, const int N,
++ const void *alpha, const void *X, const int incX,
++ const void *Y, const int incY, void *A, const int lda);
++void cblas_cher(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const int N, const float alpha, const void *X, const int incX,
++ void *A, const int lda);
++void cblas_chpr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const int N, const float *alpha, const void *X,
++ const int incX, void *A);
++void cblas_cher2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, const int N,
++ const void *alpha, const void *X, const int incX,
++ const void *Y, const int incY, void *A, const int lda);
++void cblas_chpr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, const int N,
++ const void *alpha, const void *X, const int incX,
++ const void *Y, const int incY, void *Ap);
++
++void cblas_zhemv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const int N, const void *alpha, const void *A,
++ const int lda, const void *X, const int incX,
++ const void *beta, void *Y, const int incY);
++void cblas_zhbmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const int N, const int K, const void *alpha, const void *A,
++ const int lda, const void *X, const int incX,
++ const void *beta, void *Y, const int incY);
++void cblas_zhpmv(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const int N, const void *alpha, const void *Ap,
++ const void *X, const int incX,
++ const void *beta, void *Y, const int incY);
++void cblas_zgeru(const enum CBLAS_ORDER order, const int M, const int N,
++ const void *alpha, const void *X, const int incX,
++ const void *Y, const int incY, void *A, const int lda);
++void cblas_zgerc(const enum CBLAS_ORDER order, const int M, const int N,
++ const void *alpha, const void *X, const int incX,
++ const void *Y, const int incY, void *A, const int lda);
++void cblas_zher(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const int N, const double alpha, const void *X, const int incX,
++ void *A, const int lda);
++void cblas_zhpr(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo,
++ const int N, const double *alpha, const void *X,
++ const int incX, void *A);
++void cblas_zher2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, const int N,
++ const void *alpha, const void *X, const int incX,
++ const void *Y, const int incY, void *A, const int lda);
++void cblas_zhpr2(const enum CBLAS_ORDER order, const enum CBLAS_UPLO Uplo, const int N,
++ const void *alpha, const void *X, const int incX,
++ const void *Y, const int incY, void *Ap);
++
++/*
++ * ===========================================================================
++ * Prototypes for level 3 BLAS
++ * ===========================================================================
++ */
++
++/*
++ * Routines with standard 4 prefixes (S, D, C, Z)
++ */
++void cblas_sgemm(const enum CBLAS_ORDER Order, const enum CBLAS_TRANSPOSE TransA,
++ const enum CBLAS_TRANSPOSE TransB, const int M, const int N,
++ const int K, const float alpha, const float *A,
++ const int lda, const float *B, const int ldb,
++ const float beta, float *C, const int ldc);
++void cblas_ssymm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side,
++ const enum CBLAS_UPLO Uplo, const int M, const int N,
++ const float alpha, const float *A, const int lda,
++ const float *B, const int ldb, const float beta,
++ float *C, const int ldc);
++void cblas_ssyrk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE Trans, const int N, const int K,
++ const float alpha, const float *A, const int lda,
++ const float beta, float *C, const int ldc);
++void cblas_ssyr2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE Trans, const int N, const int K,
++ const float alpha, const float *A, const int lda,
++ const float *B, const int ldb, const float beta,
++ float *C, const int ldc);
++void cblas_strmm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side,
++ const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA,
++ const enum CBLAS_DIAG Diag, const int M, const int N,
++ const float alpha, const float *A, const int lda,
++ float *B, const int ldb);
++void cblas_strsm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side,
++ const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA,
++ const enum CBLAS_DIAG Diag, const int M, const int N,
++ const float alpha, const float *A, const int lda,
++ float *B, const int ldb);
++
++void cblas_dgemm(const enum CBLAS_ORDER Order, const enum CBLAS_TRANSPOSE TransA,
++ const enum CBLAS_TRANSPOSE TransB, const int M, const int N,
++ const int K, const double alpha, const double *A,
++ const int lda, const double *B, const int ldb,
++ const double beta, double *C, const int ldc);
++void cblas_dsymm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side,
++ const enum CBLAS_UPLO Uplo, const int M, const int N,
++ const double alpha, const double *A, const int lda,
++ const double *B, const int ldb, const double beta,
++ double *C, const int ldc);
++void cblas_dsyrk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE Trans, const int N, const int K,
++ const double alpha, const double *A, const int lda,
++ const double beta, double *C, const int ldc);
++void cblas_dsyr2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE Trans, const int N, const int K,
++ const double alpha, const double *A, const int lda,
++ const double *B, const int ldb, const double beta,
++ double *C, const int ldc);
++void cblas_dtrmm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side,
++ const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA,
++ const enum CBLAS_DIAG Diag, const int M, const int N,
++ const double alpha, const double *A, const int lda,
++ double *B, const int ldb);
++void cblas_dtrsm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side,
++ const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA,
++ const enum CBLAS_DIAG Diag, const int M, const int N,
++ const double alpha, const double *A, const int lda,
++ double *B, const int ldb);
++
++void cblas_cgemm(const enum CBLAS_ORDER Order, const enum CBLAS_TRANSPOSE TransA,
++ const enum CBLAS_TRANSPOSE TransB, const int M, const int N,
++ const int K, const void *alpha, const void *A,
++ const int lda, const void *B, const int ldb,
++ const void *beta, void *C, const int ldc);
++void cblas_csymm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side,
++ const enum CBLAS_UPLO Uplo, const int M, const int N,
++ const void *alpha, const void *A, const int lda,
++ const void *B, const int ldb, const void *beta,
++ void *C, const int ldc);
++void cblas_csyrk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE Trans, const int N, const int K,
++ const void *alpha, const void *A, const int lda,
++ const void *beta, void *C, const int ldc);
++void cblas_csyr2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE Trans, const int N, const int K,
++ const void *alpha, const void *A, const int lda,
++ const void *B, const int ldb, const void *beta,
++ void *C, const int ldc);
++void cblas_ctrmm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side,
++ const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA,
++ const enum CBLAS_DIAG Diag, const int M, const int N,
++ const void *alpha, const void *A, const int lda,
++ void *B, const int ldb);
++void cblas_ctrsm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side,
++ const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA,
++ const enum CBLAS_DIAG Diag, const int M, const int N,
++ const void *alpha, const void *A, const int lda,
++ void *B, const int ldb);
++
++void cblas_zgemm(const enum CBLAS_ORDER Order, const enum CBLAS_TRANSPOSE TransA,
++ const enum CBLAS_TRANSPOSE TransB, const int M, const int N,
++ const int K, const void *alpha, const void *A,
++ const int lda, const void *B, const int ldb,
++ const void *beta, void *C, const int ldc);
++void cblas_zsymm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side,
++ const enum CBLAS_UPLO Uplo, const int M, const int N,
++ const void *alpha, const void *A, const int lda,
++ const void *B, const int ldb, const void *beta,
++ void *C, const int ldc);
++void cblas_zsyrk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE Trans, const int N, const int K,
++ const void *alpha, const void *A, const int lda,
++ const void *beta, void *C, const int ldc);
++void cblas_zsyr2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE Trans, const int N, const int K,
++ const void *alpha, const void *A, const int lda,
++ const void *B, const int ldb, const void *beta,
++ void *C, const int ldc);
++void cblas_ztrmm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side,
++ const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA,
++ const enum CBLAS_DIAG Diag, const int M, const int N,
++ const void *alpha, const void *A, const int lda,
++ void *B, const int ldb);
++void cblas_ztrsm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side,
++ const enum CBLAS_UPLO Uplo, const enum CBLAS_TRANSPOSE TransA,
++ const enum CBLAS_DIAG Diag, const int M, const int N,
++ const void *alpha, const void *A, const int lda,
++ void *B, const int ldb);
++
++
++/*
++ * Routines with prefixes C and Z only
++ */
++void cblas_chemm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side,
++ const enum CBLAS_UPLO Uplo, const int M, const int N,
++ const void *alpha, const void *A, const int lda,
++ const void *B, const int ldb, const void *beta,
++ void *C, const int ldc);
++void cblas_cherk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE Trans, const int N, const int K,
++ const float alpha, const void *A, const int lda,
++ const float beta, void *C, const int ldc);
++void cblas_cher2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE Trans, const int N, const int K,
++ const void *alpha, const void *A, const int lda,
++ const void *B, const int ldb, const float beta,
++ void *C, const int ldc);
++
++void cblas_zhemm(const enum CBLAS_ORDER Order, const enum CBLAS_SIDE Side,
++ const enum CBLAS_UPLO Uplo, const int M, const int N,
++ const void *alpha, const void *A, const int lda,
++ const void *B, const int ldb, const void *beta,
++ void *C, const int ldc);
++void cblas_zherk(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE Trans, const int N, const int K,
++ const double alpha, const void *A, const int lda,
++ const double beta, void *C, const int ldc);
++void cblas_zher2k(const enum CBLAS_ORDER Order, const enum CBLAS_UPLO Uplo,
++ const enum CBLAS_TRANSPOSE Trans, const int N, const int K,
++ const void *alpha, const void *A, const int lda,
++ const void *B, const int ldb, const double beta,
++ void *C, const int ldc);
++
++#endif
+diff --git a/scipy/_build_utils/src/wrap_accelerate_c.c b/scipy/_build_utils/src/wrap_accelerate_c.c
+index f8fccbb..0d8aab0 100644
+--- a/scipy/_build_utils/src/wrap_accelerate_c.c
++++ b/scipy/_build_utils/src/wrap_accelerate_c.c
+@@ -1,4 +1,4 @@
+-#include <Accelerate/Accelerate.h>
++#include "cblas.h"
+
+ #define WRAP_F77(a) a##_
+
+diff --git a/scipy/_build_utils/src/wrap_g77_abi_c.c b/scipy/_build_utils/src/wrap_g77_abi_c.c
+index 0a25632..75d5760 100644
+--- a/scipy/_build_utils/src/wrap_g77_abi_c.c
++++ b/scipy/_build_utils/src/wrap_g77_abi_c.c
+@@ -1,4 +1,4 @@
+-#include <Accelerate/Accelerate.h>
++#include "cblas.h"
+
+ #define WRAP_F77(a) a##_
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150112/7cabb311/attachment-0001.html>
More information about the macports-changes
mailing list