Skip to content

Update Slycot to use LAPACK 3.6.x + #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
murrayrm merged 22 commits into from
Jan 13, 2018
Merged

Update Slycot to use LAPACK 3.6.x + #13

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
2d9a253
adapting slycot to newer LAPACK:
repagh Jun 10, 2017
c1cb581
add an explicit return of ZERO in functions that have alternative
repagh Jun 10, 2017
062585b
fix setup.py abiver detection for python 2.7
repagh Jun 10, 2017
b36bfeb
set flags for lib building
repagh Jun 10, 2017
e25e65f
fix typos
repagh Jun 10, 2017
cb147c9
removed trailing whitespace
repagh Jun 11, 2017
81ebab4
removed working comment
repagh Jun 11, 2017
651ce07
add a test case for sg03ad
repagh Jun 15, 2017
e69c54f
added a test case for sg02ad, ricatti eqn solving
repagh Jun 19, 2017
115ee1c
import linalg from numpy, not scipy
repagh Jun 19, 2017
8cf5e49
reverting the ZLATZM -> ZUNMRZ change, adding SLYCOT specific ZLATZM
repagh Jun 24, 2017
a627f9e
need blas as lib for build on Mac OSX
repagh Jun 24, 2017
25eb04d
testing with openblas??
repagh Jun 28, 2017
8b7e1e3
crazy stuff
Jul 10, 2017
dd7b4b0
revert last 2 edits that should not have gone on master
repagh Jul 19, 2017
9ce23a8
windows build config, with mingw32
Oct 9, 2017
3b7c763
remove local build hack
Oct 9, 2017
92f588c
finally a working recipe for windows build
Oct 9, 2017
080d214
finally a working recipe for windows build
repagh Oct 9, 2017
74d3d83
Merge branch 'winwork' of https://github.com/repagh/Slycot into winwork
repagh Oct 9, 2017
8f93896
Merge remote branch 'origin/winwork'
repagh Oct 9, 2017
bc52eaa
branching linux/osx build conda recipe into proper script
repagh Oct 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion conda-recipe/bld.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
"%PYTHON%" setup.py install
:: Uncoment following two lines for local test build
cd %RECIPE_DIR%
cd ..

"%PYTHON%" setup.py build --compiler=mingw32
"%PYTHON%" setup.py install --skip-build

if errorlevel 1 exit 1

:: Add more build steps here, if they are necessary.
Expand Down
7 changes: 2 additions & 5 deletions conda-recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,12 @@ package:
build:
number: 1

script:
- cd $RECIPE_DIR/..
- LDFLAGS="-shared" FFLAGS=-fPIC $PYTHON setup.py install # [not win]

requirements:
build:
- python
- numpy
- numpy >=1.13.3
- lapack
- m2w64-gcc-fortran # [win]

run:
- python
Expand Down
19 changes: 18 additions & 1 deletion slycot/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,35 @@ def configuration(parent_package='', top_path=None):
pyver = sysconfig.get_config_var('VERSION')

if sys.platform == 'win32':
liblist = ['liblapack', 'libblas']
liblist = [
'lapack', 'lapacke', 'blas', 'gfortran'
]
extra_objects = [
]
ppath = os.sep.join(sys.executable.split(os.sep)[:-1])
library_dirs = [r'\Library\lib', ]
library_dirs = [ppath + l for l in library_dirs]
extra_link_args = [ ]
extra_compile_args = [ ]
else:
# this is needed on Py 3.x, and fails on Py 2.7
try:
abiflags = sys.abiflags
except AttributeError:
abiflags = ''
liblist = ['lapack', 'blas', 'python'+pyver+abiflags]
extra_objects = []
library_dirs = []
extra_link_args = []
extra_compile_args = []

config.add_extension(
name='_wrapper',
libraries=liblist,
extra_objects=extra_objects,
extra_link_args=extra_link_args,
library_dirs=library_dirs,
extra_compile_args=extra_compile_args,
sources=fortran_sources + f2py_sources)

config.make_config_py() # installs __config__.py
Expand Down