Skip to content
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.

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

Bug fixes #158

Merged
merged 13 commits into from
Jan 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 10 additions & 12 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version: 1.2.3-{build}-{branch}
image: Visual Studio 2017
version: 1.2.4-{build}-{branch}
image: Visual Studio 2019
init:
- choco install wget checksum

Expand All @@ -16,16 +16,14 @@ environment:
CVXOPT_INSTALL_REQUIRES: mkl
GLPK_VERSION: "4.65"
GLPK_SHA256: "4281e29b628864dfe48d393a7bedd781e5b475387c20d8b0158f329994721a10"
SUITESPARSE_VERSION: "5.3.0"
SUITESPARSE_SHA256: "90e69713d8c454da5a95a839aea5d97d8d03d00cc1f667c4bdfca03f640f963d"
SUITESPARSE_VERSION: "5.6.0"
SUITESPARSE_SHA256: "76d34d9f6dafc592b69af14f58c1dc59e24853dcd7c2e8f4c98ffa223f6a1adb"

matrix:
- PYTHON_VERSION: 3.7
CVXOPT_MSVC: 1
- PYTHON_VERSION: 3.6
CVXOPT_MSVC: 1
- PYTHON_VERSION: 3.5
CVXOPT_MSVC: 1
- PYTHON_VERSION: 2.7
COMPILER: mingwpy

Expand All @@ -34,9 +32,9 @@ platform:

install:
- if [%PYTHON_ARCH%]==[64] (
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
) else (
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars32.bat"
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars32.bat"
)

# Set up miniconda build environment
Expand All @@ -48,10 +46,10 @@ install:
- SET CVXOPT_BLAS_LIB_DIR=%PYTHON%\envs\build_env\Library\lib

# Download SuiteSparse and set CVXOPT_SUITESPARSE_SRC_DIR
- wget -nv http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-%SUITESPARSE_VERSION%.tar.gz
- checksum -t sha256 -c %SUITESPARSE_SHA256% SuiteSparse-%SUITESPARSE_VERSION%.tar.gz
- 7z x -bso0 -bsp0 SuiteSparse-%SUITESPARSE_VERSION%.tar.gz && 7z x -bso0 -bsp0 SuiteSparse-%SUITESPARSE_VERSION%.tar
- SET CVXOPT_SUITESPARSE_SRC_DIR=%cd%\SuiteSparse
- wget -nv https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v%SUITESPARSE_VERSION%.tar.gz
- checksum -t sha256 -c %SUITESPARSE_SHA256% v%SUITESPARSE_VERSION%.tar.gz
- 7z x -bso0 -bsp0 v%SUITESPARSE_VERSION%.tar.gz && 7z x -bso0 -bsp0 v%SUITESPARSE_VERSION%.tar
- SET CVXOPT_SUITESPARSE_SRC_DIR=%cd%\SuiteSparse-%SUITESPARSE_VERSION%

# Download and build GLPK
- if [%CVXOPT_BUILD_GLPK%]==[1] (
Expand Down
165 changes: 144 additions & 21 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,73 +3,196 @@ notifications:

env:
global:
- SUITESPARSE_VERSION=5.3.0
- SUITESPARSE_SHA256=90e69713d8c454da5a95a839aea5d97d8d03d00cc1f667c4bdfca03f640f963d
- SUITESPARSE_VERSION=5.6.0
- SUITESPARSE_SHA256=76d34d9f6dafc592b69af14f58c1dc59e24853dcd7c2e8f4c98ffa223f6a1adb
- CVXOPT_BUILD_GSL=1
- CVXOPT_BUILD_FFTW=1
- CVXOPT_BUILD_GLPK=1

matrix:
include:
- os: linux
addons:
apt:
packages:
- python-dev
- libopenblas-dev
- libfftw3-dev
- libglpk-dev
- libdsdp-dev
- libgsl0-dev
dist: xenial
sudo: required
language: python
python: '2.7'
env: CVXOPT_BUILD_DSDP=1
- os: linux
addons:
apt:
packages:
- python-dev
- libopenblas-dev
- libfftw3-dev
- libglpk-dev
- libdsdp-dev
- libgsl0-dev
dist: xenial
sudo: required
language: python
python: '2.7'
env: CVXOPT_BUILD_DSDP=1 BUILD_SUITESPARSE=1
python: '3.6'
env: CVXOPT_BUILD_DSDP=1
- os: linux
addons:
apt:
packages:
- python-dev
- libopenblas-dev
- libfftw3-dev
- libglpk-dev
- libdsdp-dev
- libgsl0-dev
dist: xenial
sudo: required
language: python
python: '3.6'
python: '3.7'
env: CVXOPT_BUILD_DSDP=1
- os: linux
addons:
apt:
packages:
- python-dev
- libopenblas-dev
- libfftw3-dev
- libglpk-dev
- libdsdp-dev
- libgsl0-dev
dist: xenial
sudo: required
language: python
python: '3.7'
python: '3.8'
env: CVXOPT_BUILD_DSDP=1
- os: linux
addons:
apt:
packages:
- python-dev
- libopenblas-dev
- libfftw3-dev
- libglpk-dev
- libdsdp-dev
- libgsl0-dev
dist: xenial
sudo: required
language: python
python: '3.8'
env: CVXOPT_BUILD_DSDP=1 BUILD_SUITESPARSE=1
- os: osx
addons:
homebrew:
update: true
packages:
- openblas
- glpk
- gsl
- fftw
- suite-sparse
language: python
env: PYVERSION=2.7
CVXOPT_BUILD_DSDP=1
CVXOPT_BLAS_LIB_DIR=/usr/local/opt/openblas/lib
CVXOPT_BLAS_LIB=openblas
CVXOPT_LAPACK_LIB=openblas
CVXOPT_DSDP_INC_DIR=$HOME/miniconda/envs/myenv/include
CVXOPT_DSDP_LIB_DIR=$HOME/miniconda/envs/myenv/lib
CVXOPT_GSL_INC_DIR=/usr/local/opt/gsl/include
language: generic
- os: osx
addons:
homebrew:
update: true
packages:
- openblas
- glpk
- gsl
- fftw
- suite-sparse
language: python
env: PYVERSION=2.7 CVXOPT_BUILD_DSDP=1 BUILD_SUITESPARSE=1
env: PYVERSION=3.6
CVXOPT_BUILD_DSDP=1
CVXOPT_BLAS_LIB_DIR=/usr/local/opt/openblas/lib
CVXOPT_BLAS_LIB=openblas CVXOPT_LAPACK_LIB=openblas
CVXOPT_BLAS_LIB=openblas
CVXOPT_LAPACK_LIB=openblas
CVXOPT_DSDP_INC_DIR=$HOME/miniconda/envs/myenv/include
CVXOPT_DSDP_LIB_DIR=$HOME/miniconda/envs/myenv/lib
CVXOPT_GSL_INC_DIR=/usr/local/opt/gsl/include
language: generic
- os: osx
addons:
homebrew:
update: true
packages:
- openblas
- glpk
- gsl
- fftw
- suite-sparse
language: python
env: PYVERSION=2.7 CVXOPT_BUILD_DSDP=1
env: PYVERSION=3.7
CVXOPT_BUILD_DSDP=1
CVXOPT_BLAS_LIB_DIR=/usr/local/opt/openblas/lib
CVXOPT_BLAS_LIB=openblas CVXOPT_LAPACK_LIB=openblas
CVXOPT_DSDP_INC_DIR=$HOME/miniconda/envs/myenv/include CVXOPT_DSDP_LIB_DIR=$HOME/miniconda/envs/myenv/lib
CVXOPT_BLAS_LIB=openblas
CVXOPT_LAPACK_LIB=openblas
CVXOPT_DSDP_INC_DIR=$HOME/miniconda/envs/myenv/include
CVXOPT_DSDP_LIB_DIR=$HOME/miniconda/envs/myenv/lib
CVXOPT_GSL_INC_DIR=/usr/local/opt/gsl/include
language: generic
- os: osx
addons:
homebrew:
update: true
packages:
- openblas
- glpk
- gsl
- fftw
- suite-sparse
language: python
env: PYVERSION=3.6 CVXOPT_BUILD_DSDP=1
env: PYVERSION=3.8
CVXOPT_BUILD_DSDP=1
CVXOPT_BLAS_LIB_DIR=/usr/local/opt/openblas/lib
CVXOPT_BLAS_LIB=openblas CVXOPT_LAPACK_LIB=openblas
CVXOPT_DSDP_INC_DIR=$HOME/miniconda/envs/myenv/include CVXOPT_DSDP_LIB_DIR=$HOME/miniconda/envs/myenv/lib
CVXOPT_BLAS_LIB=openblas
CVXOPT_LAPACK_LIB=openblas
CVXOPT_DSDP_INC_DIR=$HOME/miniconda/envs/myenv/include
CVXOPT_DSDP_LIB_DIR=$HOME/miniconda/envs/myenv/lib
CVXOPT_GSL_INC_DIR=/usr/local/opt/gsl/include
language: generic
- os: osx
addons:
homebrew:
update: true
packages:
- openblas
- glpk
- gsl
- fftw
language: python
env: PYVERSION=3.7 CVXOPT_BUILD_DSDP=1
env: PYVERSION=3.8
CVXOPT_BUILD_DSDP=1
BUILD_SUITESPARSE=1
CVXOPT_BLAS_LIB_DIR=/usr/local/opt/openblas/lib
CVXOPT_BLAS_LIB=openblas CVXOPT_LAPACK_LIB=openblas
CVXOPT_DSDP_INC_DIR=$HOME/miniconda/envs/myenv/include CVXOPT_DSDP_LIB_DIR=$HOME/miniconda/envs/myenv/lib
CVXOPT_BLAS_LIB=openblas
CVXOPT_LAPACK_LIB=openblas
CVXOPT_DSDP_INC_DIR=$HOME/miniconda/envs/myenv/include
CVXOPT_DSDP_LIB_DIR=$HOME/miniconda/envs/myenv/lib
CVXOPT_GSL_INC_DIR=/usr/local/opt/gsl/include
language: generic

before_install:
- if [[ "$BUILD_SUITESPARSE" == "1" ]]; then wget http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${SUITESPARSE_VERSION}.tar.gz; echo "${SUITESPARSE_SHA256} SuiteSparse-${SUITESPARSE_VERSION}.tar.gz" > SuiteSparse.sha256; tar -xf SuiteSparse-${SUITESPARSE_VERSION}.tar.gz; export CVXOPT_SUITESPARSE_SRC_DIR=$(pwd)/SuiteSparse; fi
- if [[ "$BUILD_SUITESPARSE" == "1" ]]; then wget https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v${SUITESPARSE_VERSION}.tar.gz; echo "${SUITESPARSE_SHA256} v${SUITESPARSE_VERSION}.tar.gz" > SuiteSparse.sha256; tar -xf v${SUITESPARSE_VERSION}.tar.gz; export CVXOPT_SUITESPARSE_SRC_DIR=$(pwd)/SuiteSparse-${SUITESPARSE_VERSION}; fi
- if [[ "$BUILD_SUITESPARSE" == "1" && "$TRAVIS_OS_NAME" == "linux" ]]; then sha256sum -c SuiteSparse.sha256; fi
- if [[ "$BUILD_SUITESPARSE" == "1" && "$TRAVIS_OS_NAME" == "osx" ]]; then shasum -a 256 -c SuiteSparse.sha256; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install python-dev libopenblas-dev libfftw3-dev libglpk-dev libdsdp-dev libgsl0-dev; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" && -z "$BUILD_SUITESPARSE" ]]; then sudo add-apt-repository ppa:bzindovic/suitesparse-bugfix-1319687 -y; sudo apt-get update; sudo apt-get install libsuitesparse-dev; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install openblas glpk gsl fftw; brew info openblas; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" && -z "$BUILD_SUITESPARSE" ]]; then brew install suite-sparse; brew info suitesparse; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" && -z "$BUILD_SUITESPARSE" ]]; then brew info suitesparse; brew info gsl; brew info openblas; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then wget https://repo.continuum.io/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -O miniconda.sh;bash miniconda.sh -b -p $HOME/miniconda; export PATH="$HOME/miniconda/bin:$PATH" ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then conda create -y -n myenv python=$PYVERSION dsdp && source $HOME/miniconda/bin/activate myenv; fi
- pip install pytest pytest-cov coveralls
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
CVXOPT version 1.2

Copyright (c) 2012-2019 M. Andersen and L. Vandenberghe.
Copyright (c) 2012-2020 M. Andersen and L. Vandenberghe.
Copyright (c) 2010-2011 L. Vandenberghe.
Copyright (c) 2004-2009 J. Dahl and L. Vandenberghe.

Expand Down
Loading