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

CMake-based Python extension builds #1992

Merged
merged 214 commits into from
Feb 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
214 commits
Select commit Hold shift + click to select a range
882e136
swig extension via cmake
dweindl Feb 15, 2023
054700c
..
dweindl Feb 15, 2023
b35528d
optional hdf5
dweindl Feb 15, 2023
6afe197
fix reading version
dweindl Feb 15, 2023
8e7928f
hdf5-tests
dweindl Feb 15, 2023
327e7ab
..
dweindl Feb 15, 2023
c05f465
optomp
dweindl Feb 15, 2023
f7e0995
paths
dweindl Feb 15, 2023
e6a9fa3
..
dweindl Feb 15, 2023
c8f2906
..
dweindl Feb 15, 2023
aa155b2
..
dweindl Feb 15, 2023
eac2ddd
..
dweindl Feb 15, 2023
402cd01
..
dweindl Feb 15, 2023
f8cb155
..
dweindl Feb 15, 2023
d108942
..
dweindl Feb 15, 2023
a8cda92
..
dweindl Feb 15, 2023
e68a897
ld
dweindl Feb 16, 2023
695bb82
..
dweindl Feb 16, 2023
238cd2b
..
dweindl Feb 16, 2023
bceb543
ninja
dweindl Feb 16, 2023
ca85143
..
dweindl Feb 16, 2023
ba0e829
..
dweindl Feb 16, 2023
85d70ce
subdir
dweindl Feb 16, 2023
00a281b
;
dweindl Feb 16, 2023
5fb1b88
buildpy
dweindl Feb 16, 2023
ffc89ca
..
dweindl Feb 16, 2023
c81d633
path?
dweindl Feb 16, 2023
cdd6ab8
rpath?
dweindl Feb 16, 2023
692482d
..
dweindl Feb 16, 2023
b86ff4e
..
dweindl Feb 16, 2023
e2e01d6
..
dweindl Feb 16, 2023
c2bd2be
win?
dweindl Feb 16, 2023
a749ffd
dbg
dweindl Feb 16, 2023
26529ad
Revert "win?"
dweindl Feb 16, 2023
499800c
win?
dweindl Feb 16, 2023
6565263
dbg
dweindl Feb 16, 2023
9abd455
Merge branch 'develop' into cmake
dweindl Feb 20, 2023
154f1f2
Merge branch 'develop' into cmake
dweindl Feb 20, 2023
67131d6
sundials
dweindl Feb 20, 2023
821867d
Update SuiteSparse
dweindl Feb 20, 2023
df9e81f
..
dweindl Feb 20, 2023
5612861
..
dweindl Feb 20, 2023
65af31d
Update install scripts
dweindl Feb 20, 2023
497f910
Squashed commit of the following:
dweindl Feb 20, 2023
67dbbd8
ncholmod
dweindl Feb 20, 2023
38c87b8
Remove build_clib-related code
dweindl Feb 20, 2023
434e2b4
remove swig-related
dweindl Feb 20, 2023
5f096f4
build model extension via cmake
dweindl Feb 20, 2023
9110a28
Merge remote-tracking branch 'origin/develop' into cmake
dweindl Feb 20, 2023
f414bcd
swig opt; install dir
dweindl Feb 20, 2023
3d23398
remove klu/matlab
dweindl Feb 20, 2023
fd92c48
cleanup, fixup
dweindl Feb 20, 2023
92d7f4e
-CAMD
dweindl Feb 20, 2023
706dea7
-pdf
dweindl Feb 20, 2023
9257cca
-matlab
dweindl Feb 20, 2023
20fc403
prefer static suitesparse
dweindl Feb 20, 2023
0d5415e
pic?
dweindl Feb 20, 2023
38f3bd1
Amici_DIR
dweindl Feb 20, 2023
842bc6f
Amici_DIR
dweindl Feb 20, 2023
cba6b9e
Amici_DIR
dweindl Feb 20, 2023
74400a2
cleanup
dweindl Feb 21, 2023
507fa52
cleanup
dweindl Feb 21, 2023
b35bb78
relocatable package config
dweindl Feb 21, 2023
9193973
..
dweindl Feb 21, 2023
6ed160f
-DALLOW_64BIT_BLAS=OFF
dweindl Feb 21, 2023
50bccbf
..
dweindl Feb 21, 2023
c529004
LIB win
dweindl Feb 21, 2023
c2c4709
exhale
dweindl Feb 21, 2023
90fa9b0
gsl
dweindl Feb 21, 2023
f17f331
dereference
dweindl Feb 22, 2023
be95139
dbg
dweindl Feb 22, 2023
4c7bea8
Merge branch 'develop' into cmake
dweindl Feb 22, 2023
86aa20c
link_directories
dweindl Feb 22, 2023
26e9d74
format
dweindl Feb 22, 2023
dfed824
fix boost
dweindl Feb 22, 2023
35e1b4f
dbg
dweindl Feb 22, 2023
50a18ca
mex c99
dweindl Feb 22, 2023
204ed8f
print mex
dweindl Feb 22, 2023
1072992
update suitesparse files
dweindl Feb 22, 2023
6338348
regenerate models
dweindl Feb 22, 2023
8a07d9b
SYMBOLSUFFIX
dweindl Feb 22, 2023
537dbb9
Revert "SYMBOLSUFFIX"
dweindl Feb 22, 2023
75787e7
no-findblas
dweindl Feb 22, 2023
ae93abb
lcov?
dweindl Feb 22, 2023
b5c818c
win klu path?
dweindl Feb 22, 2023
e0d5a14
cleanup
dweindl Feb 22, 2023
e1477ac
win klu path?
dweindl Feb 22, 2023
4c30413
handle debug and coverage in cmake
dweindl Feb 22, 2023
6bbb809
python_exe
dweindl Feb 22, 2023
8206088
handle amici flags
dweindl Feb 22, 2023
469b54d
dbg
dweindl Feb 22, 2023
3208586
no trace
dweindl Feb 22, 2023
6bfb80d
cleanup
dweindl Feb 22, 2023
eef4fb4
gsl defines
dweindl Feb 22, 2023
c65538f
dbg buildpath
dweindl Feb 22, 2023
48d4fbe
fixup-or
dweindl Feb 22, 2023
ee8bc71
Merge remote-tracking branch 'origin/develop' into cmake
dweindl Feb 22, 2023
36486e4
fix up boost math
dweindl Feb 22, 2023
8ad05c6
werror
dweindl Feb 22, 2023
7caa0c9
win tmpdir?
dweindl Feb 22, 2023
28c0e63
wheel, no pkgconfig
dweindl Feb 22, 2023
c9c3842
str
dweindl Feb 22, 2023
6a48fd2
swig opts cmake
dweindl Feb 22, 2023
6e9e5cb
dbg buildpath
dweindl Feb 22, 2023
f519fe9
ser
dweindl Feb 22, 2023
b9df6d2
np?
dweindl Feb 22, 2023
31ad04f
no wheel?
dweindl Feb 22, 2023
077373f
UNDEBUG
dweindl Feb 22, 2023
47805d7
dbg
dweindl Feb 22, 2023
6753b9f
Revert "no wheel?"
dweindl Feb 22, 2023
3e14c3c
blank
dweindl Feb 22, 2023
8608f0c
dbg
dweindl Feb 22, 2023
13b8acf
fix boost
dweindl Feb 22, 2023
838a0eb
fix klu?
dweindl Feb 22, 2023
047ea33
dbg
dweindl Feb 22, 2023
a723b70
py
dweindl Feb 22, 2023
309aa3a
findklu?
dweindl Feb 22, 2023
eeb3902
verbose
dweindl Feb 22, 2023
a68d340
fix findklu
dweindl Feb 22, 2023
bf7e6e1
no klu debug
dweindl Feb 22, 2023
1108875
fix swig version check
dweindl Feb 22, 2023
45d9346
handle python blas flags
dweindl Feb 22, 2023
0d10bee
fix blas, fix numpy
dweindl Feb 22, 2023
194728e
numpy
dweindl Feb 22, 2023
3afa6d9
BLAS_LIBS
dweindl Feb 22, 2023
8b7a485
blas flags
dweindl Feb 22, 2023
8cca6a5
blas, install, upload
dweindl Feb 22, 2023
8b4308a
blas paths
dweindl Feb 22, 2023
b19b77e
upload
dweindl Feb 22, 2023
9c00880
Revert "upload"
dweindl Feb 22, 2023
b02682b
publ?
dweindl Feb 22, 2023
f3ed291
publ?
dweindl Feb 22, 2023
07ad0dd
Wnoerror
dweindl Feb 22, 2023
d2a0bc2
fix order
dweindl Feb 22, 2023
f8fcf01
lcov dir
dweindl Feb 23, 2023
998b5c8
fix path
dweindl Feb 23, 2023
0fe6190
win dash?
dweindl Feb 23, 2023
845edba
dbg
dweindl Feb 23, 2023
73997bd
fix ext name
dweindl Feb 23, 2023
5d91747
..
dweindl Feb 23, 2023
82c81c8
AMICI_PARALLEL_COMPILE
dweindl Feb 23, 2023
3bd3f62
silence msvc
dweindl Feb 23, 2023
a501266
Remove LD_LIBRARY_PATH logic; now static
dweindl Feb 23, 2023
000564d
fixup
dweindl Feb 23, 2023
14d3a15
dump
dweindl Feb 23, 2023
4715f72
dump?
dweindl Feb 23, 2023
91d5165
bin
dweindl Feb 23, 2023
cdf6eed
lcov?
dweindl Feb 23, 2023
c67c3bd
no warn
dweindl Feb 23, 2023
d58ec43
posix
dweindl Feb 23, 2023
d48b1c3
static
dweindl Feb 23, 2023
e80d033
dbg
dweindl Feb 23, 2023
5b8b288
nologo
dweindl Feb 23, 2023
ae2c6b1
reduce path length
dweindl Feb 23, 2023
aceaef0
??
dweindl Feb 23, 2023
5fcbece
nowarn
dweindl Feb 23, 2023
05482f8
fix path, Wdev
dweindl Feb 23, 2023
641b1bb
par
dweindl Feb 23, 2023
209e6f1
lcov,undebug
dweindl Feb 23, 2023
1d4e4d0
fix path
dweindl Feb 23, 2023
5f6fa4f
nologo
dweindl Feb 23, 2023
b7d8077
nowarn
dweindl Feb 23, 2023
36b6114
faster?
dweindl Feb 23, 2023
6facb21
build-temp
dweindl Feb 23, 2023
2a112f5
remove model prefix
dweindl Feb 23, 2023
d6acc14
shorten path
dweindl Feb 23, 2023
abce208
fixup
dweindl Feb 23, 2023
aca7740
shorten names
dweindl Feb 23, 2023
794ab86
regenerate models
dweindl Feb 23, 2023
4f5bbdb
cleanup
dweindl Feb 23, 2023
0341e4f
cleanup,doc
dweindl Feb 23, 2023
34ad066
include
dweindl Feb 23, 2023
27bab1a
gitignore
dweindl Feb 23, 2023
5b0b94a
..
dweindl Feb 23, 2023
ba2b611
Merge branch 'develop' into cmake
dweindl Feb 23, 2023
a753472
cleanup
dweindl Feb 23, 2023
6dcbad6
Merge remote-tracking branch 'origin/develop' into cmake
dweindl Feb 23, 2023
4994d08
fix matlab msvc warnings?
dweindl Feb 23, 2023
f71a013
fixup
dweindl Feb 23, 2023
c2bf223
remove unused
dweindl Feb 23, 2023
9238a31
remove unused
dweindl Feb 23, 2023
b34270f
cleanup sdist
dweindl Feb 23, 2023
a9ef620
ignore
dweindl Feb 23, 2023
8de4d69
cleanuo
dweindl Feb 23, 2023
4577c3e
ext suffix
dweindl Feb 23, 2023
4dfc9c3
no-dll
dweindl Feb 23, 2023
de26cd4
nodbg
dweindl Feb 23, 2023
74b4bc6
Merge branch 'develop' into cmake
dweindl Feb 24, 2023
a514a68
unsaved
dweindl Feb 24, 2023
ae7c2f9
Test msvc-only flags only with msvc
dweindl Feb 24, 2023
2695680
remove swig version guard
dweindl Feb 24, 2023
8b88d23
link_directories still required?
dweindl Feb 24, 2023
8ccbdd3
Merge remote-tracking branch 'origin/develop' into cmake
dweindl Feb 24, 2023
d5543b2
regenerate
dweindl Feb 24, 2023
0895f07
msg
dweindl Feb 24, 2023
9e3e555
Merge remote-tracking branch 'origin/develop' into cmake
dweindl Feb 24, 2023
04f608f
cleanup
dweindl Feb 25, 2023
40b3154
fixup,cleanup
dweindl Feb 25, 2023
1877eb1
blank
dweindl Feb 25, 2023
8890486
Merge branch 'develop' into cmake
dweindl Feb 25, 2023
b5230d7
Merge remote-tracking branch 'origin/develop' into cmake
dweindl Feb 25, 2023
0291f1a
manifest
dweindl Feb 25, 2023
227d642
pic
dweindl Feb 25, 2023
105b1ba
missing files in container
dweindl Feb 26, 2023
555c5dd
?
dweindl Feb 26, 2023
ae0bf93
cmake
dweindl Feb 26, 2023
b6867d7
..
dweindl Feb 26, 2023
a15dfc2
..
dweindl Feb 26, 2023
002a26e
pic
dweindl Feb 26, 2023
7938dbe
honor SWIG envvar
dweindl Feb 27, 2023
f15857e
fix swig version
dweindl Feb 27, 2023
b480540
lint
dweindl Feb 27, 2023
46a583d
lint
dweindl Feb 27, 2023
6487203
unpin
dweindl Feb 27, 2023
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
2 changes: 2 additions & 0 deletions .github/workflows/deploy_protected.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
pull_request:
paths:
- container/Dockerfile
# ensure all relevant files are still included in sdist
- python/sdist/MANIFEST.in
workflow_dispatch:

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
- run: git fetch --prune --unshallow

- run: echo "AMICI_DIR=$(pwd)" >> $GITHUB_ENV
- run: echo "SWIG=${AMICI_DIR}/ThirdParty/swig-4.0.2/install/bin/swig" >> $GITHUB_ENV
- run: echo "SWIG=${AMICI_DIR}/ThirdParty/swig-4.1.1/install/bin/swig" >> $GITHUB_ENV

- name: Build doxygen
run: |
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/test_python_cplusplus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ jobs:
runs-on: ubuntu-22.04

env:
AMICI_PARALLEL_COMPILE: ""
ENABLE_GCOV_COVERAGE: "TRUE"
CI_SONARCLOUD: "TRUE"

Expand Down Expand Up @@ -117,7 +118,7 @@ jobs:
-d ${AMICI_DIR}/build/CMakeFiles/amici.dir/src \
-b ${AMICI_DIR} -c -o coverage_cpp.info \
&& lcov --compat-libtool --no-external \
-d ${AMICI_DIR}/python/sdist/build/temp.linux-x86_64-$(python -c "import sys; print(sys.implementation.cache_tag)")/amici/src \
-d ${AMICI_DIR}/python/sdist/build/$(python -c "import sys, sysconfig; print(f'temp.{sysconfig.get_platform()}-{sys.implementation.cache_tag}_amici')")/CMakeFiles/amici.dir/src \
-b ${AMICI_DIR}/python/sdist -c -o coverage_py.info \
&& lcov -a coverage_cpp.info -a coverage_py.info -o coverage.info

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/test_python_ver_matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@ jobs:
continue-on-error: ${{ matrix.experimental }}
env:
AMICI_SKIP_CMAKE_TESTS: "TRUE"
AMICI_PARALLEL_COMPILE: ""

strategy:
fail-fast: false
matrix:
python-version: [3.8, 3.9, '3.10', '3.11']
python-version: ['3.8', '3.9', '3.10', '3.11']
experimental: [false]

steps:
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,9 @@ python/sdist/amici/amici.py
python/sdist/amici/amici_wrap.cxx
python/sdist/amici/amici_without_hdf5.py
python/sdist/amici/amici_wrap_without_hdf5.cxx

python/sdist/amici/include/
python/sdist/amici/lib/
python/sdist/amici/share/
python/sdist/build/*
python/sdist/amici/git_version.txt

Expand All @@ -177,6 +179,7 @@ ThirdParty/doxygen/*
ThirdParty/mtocpp-master*
ThirdParty/sundials/build/*
ThirdParty/SuiteSparse/lib/*
ThirdParty/SuiteSparse/include/
ThirdParty/SuiteSparse/share/*
ThirdParty/SuperLU_MT_3.1/
ThirdParty/superlu_mt_3.1.tar.gz
Expand Down
Loading