AMICI v0.10.19 (#956)

* correct links for pypi. fixes #950 (#951) * fix matlab c++14 (#953) * properly enable multithreading in swig * version bump Co-authored-by: Yannik Schälte <[email protected]>
AMICI-dev · Feb 13, 2020 · 16e3d76 · 16e3d76
1 parent fcd0a4d
commit 16e3d76
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-<img src="./documentation/gfx/banner.png" height="60" align="left">
+<img src="https://raw.githubusercontent.com/ICB-DCM/AMICI/master/documentation/gfx/banner.png" height="60" align="left">
 
 ## Advanced Multilanguage Interface for CVODES and IDAS
 
@@ -105,10 +105,10 @@ and/or
   doi:[10.1093/bioinformatics/btw764](https://doi.org/10.1093/bioinformatics/btw764)
 
 When presenting work that employs AMICI, feel free to use one of the icons in 
-[documentation/gfx/](https://github.com/ICB-DCM/AMICI/tree/master/documentation/gfx), which are available under a [CC0](documentation/gfx/LICENSE.md) license:
+[documentation/gfx/](https://github.com/ICB-DCM/AMICI/tree/master/documentation/gfx), which are available under a [CC0](https://github.com/ICB-DCM/AMICI/tree/master/documentation/gfx/LICENSE.md) license:
 
 <p align="center">
-  <img src="./documentation/gfx/logo_text.png" height="75">
+  <img src="https://raw.githubusercontent.com/ICB-DCM/AMICI/master/documentation/gfx/logo_text.png" height="75">
 </p>
 
 ## Status of SBML support in Python-AMICI

diff --git a/matlab/@amimodel/compileAndLinkModel.m b/matlab/@amimodel/compileAndLinkModel.m
@@ -32,9 +32,9 @@ function compileAndLinkModel(modelname, modelSourceFolder, coptim, debug, funs,
     end
 
     % compile flags
-    COPT = ['COPTIMFLAGS=''' coptim ' -DNDEBUG'' CXXFLAGS=''$CXXFLAGS -std=c++0x'''];
+    COPT = ['COPTIMFLAGS=''' coptim ' -DNDEBUG'' CXXFLAGS=''$CXXFLAGS -std=c++14'''];
     if(debug)
-        DEBUG = ' -g CXXFLAGS=''$CXXFLAGS -Wall  -std=c++0x -Wno-unused-function -Wno-unused-variable'' ';
+        DEBUG = ' -g CXXFLAGS=''$CXXFLAGS -Wall  -std=c++14 -Wno-unused-function -Wno-unused-variable'' ';
         COPT = ''; % no optimization with debug flags!
     else
         DEBUG = '';

diff --git a/python/amici/setuptools.py b/python/amici/setuptools.py
@@ -213,6 +213,7 @@ def generateSwigInterfaceFiles():
     swig_cmd = [swig_exe,
                 '-c++',
                 '-python',
+                '-threads',
                 '-Iamici/swig', '-Iamici/include',
                 '-DAMICI_SWIG_WITHOUT_HDF5',
                 '-outdir', swig_outdir,
@@ -236,6 +237,7 @@ def generateSwigInterfaceFiles():
     swig_cmd = [swig_exe,
                 '-c++',
                 '-python',
+                '-threads',
                 '-Iamici/swig', '-Iamici/include',
                 '-outdir', swig_outdir,
                 '-o', 'amici/amici_wrap.cxx',

diff --git a/swig/amici.i b/swig/amici.i
@@ -1,4 +1,4 @@
-%module("threads=1") amici
+%module amici
 
 %include <exception.i>
 %exception {

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.10.18
+0.10.19