Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
470b191
first draft of mkl pardiso interface
bodono Feb 26, 2022
b93433b
fix workflow
bodono Feb 26, 2022
a39e47d
fix workflow
bodono Feb 26, 2022
884ab4f
fix workflow
bodono Feb 26, 2022
395cf76
fix workflow
bodono Feb 26, 2022
dda321e
fix workflow
bodono Feb 26, 2022
98b5778
fix workflow
bodono Feb 26, 2022
fd000c9
fix workflow
bodono Feb 26, 2022
0467818
fix workflow
bodono Feb 26, 2022
ffd34f7
fix workflow
bodono Feb 26, 2022
5fbea1f
attempt to locate libmkl
bodono Feb 26, 2022
ae41287
fix workflow
bodono Feb 26, 2022
f300ad0
fix workflow
bodono Feb 26, 2022
51218ca
cleanup
bodono Feb 27, 2022
b5d3f11
hack mkl into cmake
bodono Feb 27, 2022
a36efd3
more cmake hacking for mkl
bodono Feb 27, 2022
10627e9
Merge branch 'master' into pardiso_mkl
bodono Feb 28, 2022
4139778
better cmake with mkl
bodono Feb 28, 2022
6245e13
ran cmake-format -i CMakeLists.txt
bodono Feb 28, 2022
e9f8a7c
add cmake mkl workflow
bodono Feb 28, 2022
e9dd16c
fixing workflow
bodono Feb 28, 2022
d7a96e7
rm pardiso_64
bodono Feb 28, 2022
2be3a68
Revert scs_types.h
bodono Feb 28, 2022
38174da
revet pardiso_64 removal
bodono Feb 28, 2022
83b7a18
docs
bodono Mar 2, 2022
808b062
docs tweak
bodono Mar 2, 2022
74931d9
cleanup and better make files
bodono Mar 2, 2022
903b13a
add comment
bodono Mar 2, 2022
7e360c4
tweak valgrind action
bodono Mar 2, 2022
d012a89
cmake-format -i CMakeLists.txt
bodono Mar 3, 2022
148535f
add comment
bodono Mar 3, 2022
4cd9232
docs
bodono Mar 3, 2022
4d9998a
report correct timings when printing summary
bodono Mar 3, 2022
43c91c4
bump to 3.2.1
bodono Mar 3, 2022
32a6635
clang-format -style="{BasedOnStyle: llvm, IndentWidth: 2, AllowShortF…
bodono Mar 3, 2022
93d73bd
cmake-format -i CMakeLists.txt
bodono Mar 3, 2022
86d323e
minor cleanup
bodono Mar 7, 2022
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
3 changes: 1 addition & 2 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 3.2.0
current_version = 3.2.1

[bumpversion:file:README.md]

Expand All @@ -14,4 +14,3 @@ current_version = 3.2.0
[bumpversion:file:docs/src/Doxyfile]

[bumpversion:file:docs/src/citing/index.rst]

39 changes: 39 additions & 0 deletions .github/workflows/build_mkl.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
---
name: Build and Test MKL

on: [push, pull_request]

jobs:
linux:
strategy:
fail-fast: false
matrix:
long: [0, 1]

runs-on: ubuntu-latest

steps:
- name: Intel Apt repository
run: |
wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
sudo apt-get update

- name: Install Intel oneAPI
run: sudo apt-get install intel-mkl

- name: Setup Intel oneAPI environment
run: |
# TODO: hack to set MKLROOT for now
echo "MKLROOT=/usr/lib/x86_64-linux-gnu" >> $GITHUB_ENV
# source /opt/intel/mkl/bin/mklvars.sh

- name: checkout project code
uses: actions/checkout@v2

- name: Build SCS MKL and test
run: |
make DLONG=${{ matrix.long }} mkl
out/run_tests_mkl
9 changes: 4 additions & 5 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- run: sudo apt-get install libopenblas-dev liblapack-dev
- run: mkdir build
- run: |
sudo apt-get install libopenblas-dev liblapack-dev
mkdir build
export INSTALL_DIR=$PWD/out
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$INSTALL_DIR/lib
cd build
Expand All @@ -27,10 +27,9 @@ jobs:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- run: brew install openblas lapack
- run: mkdir cmake_out
- run: mkdir build
- run: |
brew install openblas lapack
mkdir build
export INSTALL_DIR=$PWD/out
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$INSTALL_DIR/lib
cd build
Expand Down
44 changes: 44 additions & 0 deletions .github/workflows/cmake_mkl.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
---
name: CMake MKL

on: [push, pull_request]

jobs:
linux:
runs-on: ubuntu-latest
steps:
- name: Intel Apt repository
run: |
wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB
echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
sudo apt-get update

- name: Install Intel oneAPI
run: sudo apt-get install intel-mkl

- name: Setup Intel oneAPI environment
run: |
# TODO: hack to set MKLROOT for now
echo "MKLROOT=/usr/lib/x86_64-linux-gnu" >> $GITHUB_ENV
# source /opt/intel/mkl/bin/mklvars.sh

- name: checkout project code
uses: actions/checkout@v2

- name: Build SCS MKL and test
run: |
mkdir build
export INSTALL_DIR=$PWD/out
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$INSTALL_DIR/lib
cd build
mkdir out
cmake -DBUILD_TESTING=ON -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_DIR ..
make
make install
ctest --output-on-failure
cd ../docs/src/examples/
gcc -I$INSTALL_DIR/include/scs -L$INSTALL_DIR/lib/ qp.c -o qp.out -lscsmkl
./qp.out

1 change: 1 addition & 0 deletions .github/workflows/valgrind.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- run: sudo apt-get update
- run: sudo apt-get install libopenblas-dev liblapack-dev valgrind
- run: make
- run: make test
Expand Down
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ authors:
- family-names: "Boyd"
given-names: "Stephen"
title: "SCS: Spltting Conic Solver"
version: 3.2.0
version: 3.2.1
date-released: 2021
url: "https://github.com/cvxgrp/scs"

Expand Down
Loading