This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

numpy/scipy: correct depends_on openblas

  • Loading branch information...
1 parent 8ac482b commit 451f2f039e9bb59400c5d448cb900d1700bb9185 @samueljohn samueljohn committed Feb 2, 2013
Showing with 6 additions and 6 deletions.
  1. +3 −3 numpy.rb
  2. +3 −3 scipy.rb
View
@@ -42,8 +42,8 @@ class Numpy < Formula
depends_on NoUserConfig.new
depends_on 'suite-sparse' # for libamd and libumfpack
- option 'with-openblas', "Use openBLAS instead of Apple's Accelerate Framework"
- depends_on "openblas" if build.include? 'with-openblas'
+ option 'with-openblas', "Use openBLAS (slower for LAPACK functions) instead of Apple's Accelerate Framework"
+ depends_on "homebrew/science/openblas" => :optional
def patches
# Help numpy/distutils find homebrew's versioned gfortran-4.7 executable,
@@ -72,7 +72,7 @@ def install
EOS
- if build.include? 'with-openblas'
+ if build.with? 'openblas'
openblas_dir = Formula.factory('openblas').opt_prefix
# Setting ATLAS to None is important to prevent numpy from always
# linking against Accelerate.framework.
View
@@ -16,13 +16,13 @@ class Scipy < Formula
depends_on 'numpy'
depends_on 'swig' => :build
- option 'with-openblas', "Use openBLAS instead of Apple's Accelerate Framework"
- depends_on 'openblas' if build.include? 'with-openblas'
+ option 'with-openblas', "Use openBLAS (slower for LAPACK functions) instead of Apple's Accelerate Framework"
+ depends_on 'homebrew/science/openblas' => :optional
def install
ENV.fortran
- if build.include? 'with-openblas'
+ if build.with? 'openblas'
# For maintainers:
# Check which BLAS/LAPACK numpy actually uses via:
# xcrun otool -L /usr/local/Cellar/scipy/0.11.0/lib/python2.7/site-packages/scipy/linalg/_flinalg.so

0 comments on commit 451f2f0

Please sign in to comment.