Skip to content

Build with scikit build #33

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

Closed
repagh wants to merge 27 commits into from
Closed

Build with scikit build #33

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
dd90059
working on getting 'C' version for td04ad checked
repagh Jun 4, 2018
72a9875
test adding
repagh Jun 6, 2018
46171e5
work in progress
repagh Jun 14, 2018
f897e75
- corrected TD04AD.f to handle the case of 'C' and static gain tf
repagh Jun 15, 2018
3c6f49f
another fix
repagh Jun 15, 2018
253ed42
working TD04AD.f, does not crash any more on edge cases (N=0, NR=0),
repagh Jun 20, 2018
54f0510
fix conda recipe, anaconda 5
repagh Jun 22, 2018
a2298fd
delete separate build.sh/bld.bat
repagh Jun 23, 2018
6d30bd0
further testing
repagh Jun 26, 2018
f01ba18
- re-worked windows build to use Flang fortran and vc14 linkage
repagh Jun 26, 2018
a47bf6f
Merge remote-tracking branch 'python-control/master'
repagh Jul 1, 2018
b7d4048
Merge remote-tracking branch 'python-control/master'
repagh Jul 11, 2018
2ee5339
Conversion to building with scikit-build. Uses cmake for better
repagh Jul 11, 2018
be8cdfa
Add a comment on the many manual selections needed for Windows build.
repagh Jul 11, 2018
078b928
- install cmake and scikit-build with .travis.yml
repagh Jul 26, 2018
dc746ec
pip scikit-build to right location!
repagh Jul 26, 2018
0875919
hack a pip install for scikit-build
repagh Aug 14, 2018
01d85d3
- corrected link libraries for Linux in CMakeLists.txt
repagh Aug 15, 2018
84b4d4a
work in progress status
repagh Aug 15, 2018
0af0b31
- a working version? at least conda build succeeded once
repagh Aug 15, 2018
0b513ad
windows version seems to work now
repagh Aug 16, 2018
5738b11
environment variable use removed again
repagh Aug 16, 2018
04889ce
need fortran compiler env var
repagh Aug 16, 2018
790cc9e
Further tweaks, not works on OSX
repagh Aug 17, 2018
a237ce6
to be sure, also remove dependencies of scikit-build on windows
repagh Aug 17, 2018
d4df101
convert the build system to use scikit-build
repagh Aug 17, 2018
eae3c4b
Merge branch 'build-with-scikit-build' of https://github.com/repagh/S…
repagh Aug 17, 2018
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
Prev Previous commit
Next Next commit
- install cmake and scikit-build with .travis.yml
  • Loading branch information
@repagh
repagh committed Jul 26, 2018
commit 078b928bf74298646d3837cb81b6fc9d19f4b151
4 changes: 4 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ before_install:
- if [[ $TEST_CONDA == 0 ]]; then
sudo apt-get install liblapack-dev libblas-dev;
sudo apt-get install gfortran;
sudo apt-get install cmake;
fi

install:
Expand Down Expand Up @@ -58,13 +59,16 @@ install:
conda config --append channels conda-forge;
conda build --python "$TRAVIS_PYTHON_VERSION" conda-recipe;
conda install -c conda-forge lapack;
conda install -c conda-forge cmake;
conda install --override-channels -c local slycot;
else
LAPACKLIBS=lapack:blas python setup.py install;
fi
#
# coveralls not in conda repos :-(
- pip install coveralls
# and scikit-build in conda repos is currently too old
- pip install https://github.com/scikit-build/scikit-build/archive/0.7.1.zip

script:
# Local unit tests
Expand Down
2 changes: 1 addition & 1 deletion conda-recipe-openblas/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ requirements:
- numpy
- openblas >=0.3.0
- libflang # [win]
- libgfortran # [not win]
- libgfortran # [not win]
- python

build:
Expand Down
2 changes: 1 addition & 1 deletion conda-recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ requirements:
- numpy
- lapack
- libflang # [win]
- libgfortran # [not win]
- libgfortran # [not win]
- python {{PY_VER}}

build:
Expand Down