diff options
Diffstat (limited to 'python')
64 files changed, 288 insertions, 141 deletions
diff --git a/python/astra/PyAlgorithmFactory.pxd b/python/astra/PyAlgorithmFactory.pxd index 5913697..2503f6e 100644 --- a/python/astra/PyAlgorithmFactory.pxd +++ b/python/astra/PyAlgorithmFactory.pxd @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/PyAlgorithmManager.pxd b/python/astra/PyAlgorithmManager.pxd index 7f2cbb8..6ed9d45 100644 --- a/python/astra/PyAlgorithmManager.pxd +++ b/python/astra/PyAlgorithmManager.pxd @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/PyData2DManager.pxd b/python/astra/PyData2DManager.pxd index 167f840..2b31c4b 100644 --- a/python/astra/PyData2DManager.pxd +++ b/python/astra/PyData2DManager.pxd @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/PyData3DManager.pxd b/python/astra/PyData3DManager.pxd index cc9afad..7e0a75b 100644 --- a/python/astra/PyData3DManager.pxd +++ b/python/astra/PyData3DManager.pxd @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/PyIncludes.pxd b/python/astra/PyIncludes.pxd index f964118..cca99f8 100644 --- a/python/astra/PyIncludes.pxd +++ b/python/astra/PyIncludes.pxd @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/PyIndexManager.pxd b/python/astra/PyIndexManager.pxd index 9d4dff7..f3c3424 100644 --- a/python/astra/PyIndexManager.pxd +++ b/python/astra/PyIndexManager.pxd @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/PyMatrixManager.pxd b/python/astra/PyMatrixManager.pxd index 5f6fb58..90c94d3 100644 --- a/python/astra/PyMatrixManager.pxd +++ b/python/astra/PyMatrixManager.pxd @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/PyProjector2DFactory.pxd b/python/astra/PyProjector2DFactory.pxd index e21c73d..393ea09 100644 --- a/python/astra/PyProjector2DFactory.pxd +++ b/python/astra/PyProjector2DFactory.pxd @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/PyProjector2DManager.pxd b/python/astra/PyProjector2DManager.pxd index cfadb2d..4aa19ca 100644 --- a/python/astra/PyProjector2DManager.pxd +++ b/python/astra/PyProjector2DManager.pxd @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/PyProjector3DFactory.pxd b/python/astra/PyProjector3DFactory.pxd index 191c965..691841e 100644 --- a/python/astra/PyProjector3DFactory.pxd +++ b/python/astra/PyProjector3DFactory.pxd @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/PyProjector3DManager.pxd b/python/astra/PyProjector3DManager.pxd index 56b714c..42213ff 100644 --- a/python/astra/PyProjector3DManager.pxd +++ b/python/astra/PyProjector3DManager.pxd @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/PyXMLDocument.pxd b/python/astra/PyXMLDocument.pxd index e1d606b..8011b89 100644 --- a/python/astra/PyXMLDocument.pxd +++ b/python/astra/PyXMLDocument.pxd @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/__init__.py b/python/astra/__init__.py index d44e5a2..84451f9 100644 --- a/python/astra/__init__.py +++ b/python/astra/__init__.py @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ @@ -41,7 +41,7 @@ from . import log from .optomo import OpTomo from .tests import test, test_noCUDA, test_CUDA -__version__ = '1.9.9.dev' +__version__ = '2.0.0' import os diff --git a/python/astra/algorithm.py b/python/astra/algorithm.py index 8862af3..6b9454e 100644 --- a/python/astra/algorithm.py +++ b/python/astra/algorithm.py @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/algorithm_c.pyx b/python/astra/algorithm_c.pyx index 50f6052..ff35f1d 100644 --- a/python/astra/algorithm_c.pyx +++ b/python/astra/algorithm_c.pyx @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/astra.py b/python/astra/astra.py index e74d29a..1ec39fe 100644 --- a/python/astra/astra.py +++ b/python/astra/astra.py @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/astra_c.pyx b/python/astra/astra_c.pyx index 6289f3e..482a314 100644 --- a/python/astra/astra_c.pyx +++ b/python/astra/astra_c.pyx @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/creators.py b/python/astra/creators.py index ca4916d..0d5d236 100644 --- a/python/astra/creators.py +++ b/python/astra/creators.py @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/data2d.py b/python/astra/data2d.py index cf65ae2..e3b26ae 100644 --- a/python/astra/data2d.py +++ b/python/astra/data2d.py @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/data2d_c.pyx b/python/astra/data2d_c.pyx index d33581a..606381f 100644 --- a/python/astra/data2d_c.pyx +++ b/python/astra/data2d_c.pyx @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/data3d.py b/python/astra/data3d.py index 3eea0e3..a4ae738 100644 --- a/python/astra/data3d.py +++ b/python/astra/data3d.py @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/data3d_c.pyx b/python/astra/data3d_c.pyx index a1b9138..f2128af 100644 --- a/python/astra/data3d_c.pyx +++ b/python/astra/data3d_c.pyx @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/experimental.pyx b/python/astra/experimental.pyx index 08d907d..dd745d9 100644 --- a/python/astra/experimental.pyx +++ b/python/astra/experimental.pyx @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/extrautils.pyx b/python/astra/extrautils.pyx index 2508865..bb78a66 100644 --- a/python/astra/extrautils.pyx +++ b/python/astra/extrautils.pyx @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/functions.py b/python/astra/functions.py index 853c0b9..1279808 100644 --- a/python/astra/functions.py +++ b/python/astra/functions.py @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/log.py b/python/astra/log.py index 28e9bad..d023afb 100644 --- a/python/astra/log.py +++ b/python/astra/log.py @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/log_c.pyx b/python/astra/log_c.pyx index 7701667..000c116 100644 --- a/python/astra/log_c.pyx +++ b/python/astra/log_c.pyx @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/matlab.py b/python/astra/matlab.py index df1135c..af82b9f 100644 --- a/python/astra/matlab.py +++ b/python/astra/matlab.py @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/matrix.py b/python/astra/matrix.py index a097142..f4ecd7b 100644 --- a/python/astra/matrix.py +++ b/python/astra/matrix.py @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/matrix_c.pyx b/python/astra/matrix_c.pyx index 5c56233..57e116b 100644 --- a/python/astra/matrix_c.pyx +++ b/python/astra/matrix_c.pyx @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/optomo.py b/python/astra/optomo.py index 5ecff8f..4efc3da 100644 --- a/python/astra/optomo.py +++ b/python/astra/optomo.py @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/plugin.py b/python/astra/plugin.py index 0ef701e..853db2f 100644 --- a/python/astra/plugin.py +++ b/python/astra/plugin.py @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/plugin_c.pyx b/python/astra/plugin_c.pyx index 2fd9a8f..768ea2e 100644 --- a/python/astra/plugin_c.pyx +++ b/python/astra/plugin_c.pyx @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/plugins/__init__.py b/python/astra/plugins/__init__.py index 0f66907..740838c 100644 --- a/python/astra/plugins/__init__.py +++ b/python/astra/plugins/__init__.py @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/plugins/cgls.py b/python/astra/plugins/cgls.py index 30fe8e6..dfa6b51 100644 --- a/python/astra/plugins/cgls.py +++ b/python/astra/plugins/cgls.py @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/plugins/sirt.py b/python/astra/plugins/sirt.py index c5a8d90..cbdf38c 100644 --- a/python/astra/plugins/sirt.py +++ b/python/astra/plugins/sirt.py @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/projector.py b/python/astra/projector.py index 2fcb889..2535bf3 100644 --- a/python/astra/projector.py +++ b/python/astra/projector.py @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/projector3d.py b/python/astra/projector3d.py index 4d474c3..b92f89e 100644 --- a/python/astra/projector3d.py +++ b/python/astra/projector3d.py @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/projector3d_c.pyx b/python/astra/projector3d_c.pyx index 53d7113..bf1f8b8 100644 --- a/python/astra/projector3d_c.pyx +++ b/python/astra/projector3d_c.pyx @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/projector_c.pyx b/python/astra/projector_c.pyx index 62225dc..80f4412 100644 --- a/python/astra/projector_c.pyx +++ b/python/astra/projector_c.pyx @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/pythonutils.py b/python/astra/pythonutils.py index ef49f97..ef860bd 100644 --- a/python/astra/pythonutils.py +++ b/python/astra/pythonutils.py @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/src/PythonPluginAlgorithm.cpp b/python/astra/src/PythonPluginAlgorithm.cpp index b7ecdb5..e6ad584 100644 --- a/python/astra/src/PythonPluginAlgorithm.cpp +++ b/python/astra/src/PythonPluginAlgorithm.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2016, imec Vision Lab, University of Antwerp - 2014-2018, CWI, Amsterdam +Copyright: 2010-2021, imec Vision Lab, University of Antwerp + 2014-2021, CWI, Amsterdam Contact: astra@astra-toolbox.com Website: http://www.astra-toolbox.com/ diff --git a/python/astra/src/PythonPluginAlgorithm.h b/python/astra/src/PythonPluginAlgorithm.h index 791e9ba..b0a4bfd 100644 --- a/python/astra/src/PythonPluginAlgorithm.h +++ b/python/astra/src/PythonPluginAlgorithm.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2018, imec Vision Lab, University of Antwerp - 2014-2018, CWI, Amsterdam +Copyright: 2010-2021, imec Vision Lab, University of Antwerp + 2014-2021, CWI, Amsterdam Contact: astra@astra-toolbox.com Website: http://www.astra-toolbox.com/ diff --git a/python/astra/src/PythonPluginAlgorithmFactory.cpp b/python/astra/src/PythonPluginAlgorithmFactory.cpp index 8fee6fb..631dd46 100644 --- a/python/astra/src/PythonPluginAlgorithmFactory.cpp +++ b/python/astra/src/PythonPluginAlgorithmFactory.cpp @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- Copyright: 2010-2016, imec Vision Lab, University of Antwerp - 2014-2018, CWI, Amsterdam + 2014-2021, CWI, Amsterdam Contact: astra@astra-toolbox.com Website: http://www.astra-toolbox.com/ diff --git a/python/astra/src/PythonPluginAlgorithmFactory.h b/python/astra/src/PythonPluginAlgorithmFactory.h index 9cb567e..7f4d45a 100644 --- a/python/astra/src/PythonPluginAlgorithmFactory.h +++ b/python/astra/src/PythonPluginAlgorithmFactory.h @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- -Copyright: 2010-2018, imec Vision Lab, University of Antwerp - 2014-2018, CWI, Amsterdam +Copyright: 2010-2021, imec Vision Lab, University of Antwerp + 2014-2021, CWI, Amsterdam Contact: astra@astra-toolbox.com Website: http://www.astra-toolbox.com/ diff --git a/python/astra/tests.py b/python/astra/tests.py index 0d67521..19b42d0 100644 --- a/python/astra/tests.py +++ b/python/astra/tests.py @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ @@ -79,15 +79,18 @@ def _basic_par3d_cuda(): def test_noCUDA(): """Perform a very basic functionality test, without CUDA""" - + + import astra + print("ASTRA Toolbox v%s" % (astra.__version__,)) ok = _basic_par2d() if not ok: raise RuntimeError("Test failed") def test_CUDA(): """Perform a very basic functionality test, including CUDA""" - + import astra + print("ASTRA Toolbox v%s" % (astra.__version__,)) print("Getting GPU info... ", end="") print(astra.get_gpu_info()) ok1 = _basic_par2d() diff --git a/python/astra/utils.pxd b/python/astra/utils.pxd index 69f4e96..27c7c83 100644 --- a/python/astra/utils.pxd +++ b/python/astra/utils.pxd @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/astra/utils.pyx b/python/astra/utils.pyx index 12fc38c..1bc9c0b 100644 --- a/python/astra/utils.pyx +++ b/python/astra/utils.pyx @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ diff --git a/python/builder.py b/python/builder.py index 7b00022..9e35b75 100644 --- a/python/builder.py +++ b/python/builder.py @@ -1,6 +1,6 @@ # ----------------------------------------------------------------------- -# Copyright: 2010-2018, imec Vision Lab, University of Antwerp -# 2013-2018, CWI, Amsterdam +# Copyright: 2010-2021, imec Vision Lab, University of Antwerp +# 2013-2021, CWI, Amsterdam # # Contact: astra@astra-toolbox.com # Website: http://www.astra-toolbox.com/ @@ -74,7 +74,7 @@ for m in ext_modules: 'PythonPluginAlgorithmFactory.cpp')) setup(name='astra-toolbox', - version='1.9.9.dev', + version='2.0.0', description='Python interface to the ASTRA Toolbox', author='D.M. Pelt', author_email='D.M.Pelt@cwi.nl', diff --git a/python/conda/README.txt b/python/conda/README.txt new file mode 100644 index 0000000..cd0bf5a --- /dev/null +++ b/python/conda/README.txt @@ -0,0 +1,14 @@ +Building conda packages: + +Linux: + +start docker +linux_release/release.sh + +Windows: + +Open anaconda command prompt +call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 8.1 -vcvars_ver=14.0 +Change to astra-toolbox\python\conda directory +conda build -m libastra\win64_build_config.yaml libastra +conda build -m astra-toolbox\win64_build_config.yaml astra-toolbox diff --git a/python/conda/astra-toolbox/linux_deb11_build_config.yaml b/python/conda/astra-toolbox/linux_deb11_build_config.yaml new file mode 100644 index 0000000..ba3c945 --- /dev/null +++ b/python/conda/astra-toolbox/linux_deb11_build_config.yaml @@ -0,0 +1,12 @@ +python: + - 3.10 +numpy: + - 1.16 +zip_keys: + - python + - numpy + +c_compiler_version: + - 9.3 +cxx_compiler_version: + - 9.3 diff --git a/python/conda/astra-toolbox/linux_build_config.yaml b/python/conda/astra-toolbox/linux_deb9_build_config.yaml index 91cc0e4..bcde2ce 100644 --- a/python/conda/astra-toolbox/linux_build_config.yaml +++ b/python/conda/astra-toolbox/linux_deb9_build_config.yaml @@ -1,10 +1,16 @@ python: - 2.7 - - 3.6 - 3.7 - 3.8 + - 3.9 numpy: - 1.11 + - 1.11 + - 1.11 + - 1.16 +zip_keys: + - python + - numpy c_compiler_version: - 7.3 diff --git a/python/conda/astra-toolbox/meta.yaml b/python/conda/astra-toolbox/meta.yaml index 0526778..641bb97 100644 --- a/python/conda/astra-toolbox/meta.yaml +++ b/python/conda/astra-toolbox/meta.yaml @@ -1,6 +1,6 @@ package: name: astra-toolbox - version: '1.9.9.dev0' + version: '2.0.0' source: git_url: https://github.com/astra-toolbox/astra-toolbox.git @@ -32,13 +32,13 @@ requirements: - numpy {{ numpy }} - scipy - six - - libastra ==1.9.9.dev0 + - libastra ==2.0.0 run: - python - {{ pin_compatible('numpy', min_pin='x.x', max_pin='x') }} - scipy - six - - libastra ==1.9.9.dev0 + - libastra ==2.0.0 about: diff --git a/python/conda/astra-toolbox/win64_build_config.yaml b/python/conda/astra-toolbox/win64_build_config.yaml new file mode 100644 index 0000000..36ca0ce --- /dev/null +++ b/python/conda/astra-toolbox/win64_build_config.yaml @@ -0,0 +1,11 @@ +python: + - 3.7 + - 3.8 + - 3.9 +numpy: + - 1.11 + - 1.11 + - 1.16 +zip_keys: + - python + - numpy
\ No newline at end of file diff --git a/python/conda/libastra/linux_deb11_build_config.yaml b/python/conda/libastra/linux_deb11_build_config.yaml new file mode 100644 index 0000000..1ab563e --- /dev/null +++ b/python/conda/libastra/linux_deb11_build_config.yaml @@ -0,0 +1,8 @@ +cudatoolkit: + - 11.2 + - 11.3 + - 11.4 +c_compiler_version: # [linux or win] + - 9.3 # [linux or win] +cxx_compiler_version: # [linux or win] + - 9.3 # [linux or win] diff --git a/python/conda/libastra/linux_archive_build_config.yaml b/python/conda/libastra/linux_deb8_build_config.yaml index b415b4a..347557b 100644 --- a/python/conda/libastra/linux_archive_build_config.yaml +++ b/python/conda/libastra/linux_deb8_build_config.yaml @@ -4,6 +4,7 @@ cudatoolkit: - 9.2 - 10.0 - 10.1 + - 10.2 c_compiler_version: # [linux or win] - 5.4 # [linux or win] cxx_compiler_version: # [linux or win] diff --git a/python/conda/libastra/linux_build_config.yaml b/python/conda/libastra/linux_deb9_build_config.yaml index 936879c..61303a3 100644 --- a/python/conda/libastra/linux_build_config.yaml +++ b/python/conda/libastra/linux_deb9_build_config.yaml @@ -1,7 +1,7 @@ cudatoolkit: - - 10.2 - 11.0 + - 11.1 c_compiler_version: # [linux or win] - - 5.4 # [linux or win] + - 7.3 # [linux or win] cxx_compiler_version: # [linux or win] - - 5.4 # [linux or win] + - 7.3 # [linux or win] diff --git a/python/conda/libastra/meta.yaml b/python/conda/libastra/meta.yaml index 16ddf0e..c427b46 100644 --- a/python/conda/libastra/meta.yaml +++ b/python/conda/libastra/meta.yaml @@ -1,6 +1,6 @@ package: name: libastra - version: '1.9.9.dev0' + version: '2.0.0' source: git_url: https://github.com/astra-toolbox/astra-toolbox.git @@ -21,6 +21,11 @@ requirements: host: - boost # [osx or linux] - cudatoolkit {{ cudatoolkit }} # [linux] + # libstdcxx-ng 9.3 introduces extra host system requirements on glibc + # For the older systems (debian8, debian9) we use g++ 5.4 and 7.3, resp. + {% if linux and cxx_compiler_version in ['5.4', '7.3'] -%} + - libstdcxx-ng <9.3 # [linux] + {% endif %} run: # See: https://github.com/conda-forge/conda-forge.github.io/issues/687#issuecomment-460095230 - {{ pin_compatible('cudatoolkit', max_pin='x.x') }} # [linux] diff --git a/python/conda/libastra/win64_build_config.yaml b/python/conda/libastra/win64_build_config.yaml new file mode 100644 index 0000000..cb6373a --- /dev/null +++ b/python/conda/libastra/win64_build_config.yaml @@ -0,0 +1,2 @@ +python: + - 3.9 diff --git a/python/conda/linux_release/buildenv/build.sh b/python/conda/linux_release/build.sh index 1b183b5..0187c5c 100755 --- a/python/conda/linux_release/buildenv/build.sh +++ b/python/conda/linux_release/build.sh @@ -16,14 +16,10 @@ git clone --depth 1 --branch ${BRANCH} ${URL} [ $# -eq 0 ] || perl -pi -e "s/^(\s*string:.+_)[0-9]+/\${1}$2/" astra-toolbox/python/conda/libastra/meta.yaml [ $# -eq 0 ] || perl -pi -e "s/^(\s*-\s*libastra\s*==\s*)[0-9a-z+\.]+$/\${1}$1/" astra-toolbox/python/conda/astra-toolbox/meta.yaml -if [ x$3 = xarchive ]; then - CONF=linux_archive_build_config.yaml -else - CONF=linux_build_config.yaml -fi +CONF=linux_$3_build_config.yaml -conda-build -m astra-toolbox/python/conda/libastra/${CONF} astra-toolbox/python/conda/libastra +conda-build -c nvidia -m astra-toolbox/python/conda/libastra/${CONF} astra-toolbox/python/conda/libastra -[ x$3 = xarchive ] || conda-build -m astra-toolbox/python/conda/astra-toolbox/linux_build_config.yaml astra-toolbox/python/conda/astra-toolbox +[ x$4 = xfull ] && conda-build -c nvidia -m astra-toolbox/python/conda/astra-toolbox/${CONF} astra-toolbox/python/conda/astra-toolbox cp /root/miniconda3/conda-bld/linux-64/*astra* /out diff --git a/python/conda/linux_release/buildenv.deb11/Dockerfile b/python/conda/linux_release/buildenv.deb11/Dockerfile new file mode 100644 index 0000000..9c892f5 --- /dev/null +++ b/python/conda/linux_release/buildenv.deb11/Dockerfile @@ -0,0 +1,50 @@ +FROM debian:11 AS BUILDBASE +ENV DEBIAN_FRONTEND noninteractive +#RUN echo 'deb http://archive.debian.org/debian/ wheezy main' > /etc/apt/sources.list && echo 'deb http://archive.debian.org/debian-security/ wheezy/updates main' >> /etc/apt/sources.list && apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -y perl-modules build-essential autoconf libtool automake libboost-dev git libxml2 && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y perl-modules build-essential autoconf libtool automake libboost-dev git libxml2 && rm -rf /var/lib/apt/lists/* + +ENV PATH /root/miniconda3/bin:$PATH +COPY Miniconda3-py39_4.10.3-Linux-x86_64.sh /root/ +RUN /bin/bash /root/Miniconda3-py39_4.10.3-Linux-x86_64.sh -b && \ + rm -f /root/Miniconda3* + +RUN conda install -y conda-build conda-verify + +FROM BUILDBASE AS CUDA115 +RUN touch /root/cuda115 +COPY cuda_11.5.0_495.29.05_linux.run /root +RUN /bin/bash /root/cuda_11.5.0_495.29.05_linux.run --toolkit --silent --installpath=/usr/local/cuda-11.5 && \ + rm -f /root/cuda_11.5.0_495.29.05_linux.run + + +FROM BUILDBASE AS CUDA114 +RUN touch /root/cuda114 +COPY cuda_11.4.1_470.57.02_linux.run /root +RUN /bin/bash /root/cuda_11.4.1_470.57.02_linux.run --toolkit --silent --installpath=/usr/local/cuda-11.4 && \ + rm -f /root/cuda_11.4.1_470.57.02_linux.run + + +FROM BUILDBASE AS CUDA113 +RUN touch /root/cuda113 +COPY cuda_11.3.1_465.19.01_linux.run /root +RUN /bin/bash /root/cuda_11.3.1_465.19.01_linux.run --toolkit --silent --installpath=/usr/local/cuda-11.3 && \ + rm -f /root/cuda_11.3.1_465.19.01_linux.run + +FROM BUILDBASE AS CUDA112 +RUN touch /root/cuda112 +COPY cuda_11.2.2_460.32.03_linux.run /root +RUN /bin/bash /root/cuda_11.2.2_460.32.03_linux.run --toolkit --silent --installpath=/usr/local/cuda-11.2 && \ + rm -f /root/cuda_11.2.2_460.32.03_linux.run + +FROM BUILDBASE +RUN touch /root/cuda +COPY --from=CUDA115 /usr/local/cuda-11.5 /usr/local/cuda-11.5 +COPY --from=CUDA114 /usr/local/cuda-11.4 /usr/local/cuda-11.4 +COPY --from=CUDA113 /usr/local/cuda-11.3 /usr/local/cuda-11.3 +COPY --from=CUDA112 /usr/local/cuda-11.2 /usr/local/cuda-11.2 + +RUN conda create -y -n prep -c nvidia --download-only cudatoolkit=11.4 && \ + conda create -y -n prep -c nvidia --download-only cudatoolkit=11.3 && \ + conda create -y -n prep -c nvidia --download-only cudatoolkit=11.2 +# 11.5 still has unresolved dependencies in default channels +# conda create -y -n prep -c nvidia --download-only cudatoolkit=11.5 diff --git a/python/conda/linux_release/buildenv/archive.Dockerfile b/python/conda/linux_release/buildenv.deb8/Dockerfile index b3de3ec..be38743 100644 --- a/python/conda/linux_release/buildenv/archive.Dockerfile +++ b/python/conda/linux_release/buildenv.deb8/Dockerfile @@ -4,8 +4,8 @@ ENV DEBIAN_FRONTEND noninteractive RUN apt-get update && apt-get install -y perl-modules build-essential autoconf libtool automake libboost-dev git libxml2 && rm -rf /var/lib/apt/lists/* ENV PATH /root/miniconda3/bin:$PATH -COPY Miniconda3-py38_4.8.3-Linux-x86_64.sh /root/ -RUN /bin/bash /root/Miniconda3-py38_4.8.3-Linux-x86_64.sh -b && \ +COPY Miniconda3-py39_4.10.3-Linux-x86_64.sh /root/ +RUN /bin/bash /root/Miniconda3-py39_4.10.3-Linux-x86_64.sh -b && \ rm -f /root/Miniconda3* RUN conda install -y conda-build conda-verify @@ -16,6 +16,13 @@ RUN conda install -y conda-build conda-verify # TODO: Remove when support for cudatoolkit 8.0 is dropped. RUN conda config --set restore_free_channel true +FROM BUILDBASE AS CUDA102 +RUN touch /root/cuda102 +COPY cuda_10.2.89_440.33.01_linux.run /root +RUN /bin/bash /root/cuda_10.2.89_440.33.01_linux.run --toolkit --silent --installpath=/usr/local/cuda-10.2 && \ + rm -f /root/cuda_10.2.89_440.33.01_linux.run + + FROM BUILDBASE AS CUDA101 RUN touch /root/cuda101 COPY cuda_10.1.243_418.87.00_linux.run /root @@ -51,10 +58,16 @@ RUN /bin/bash /root/cuda_8.0.61.2_linux-run --silent --accept-eula && \ FROM BUILDBASE RUN touch /root/cuda +COPY --from=CUDA102 /usr/local/cuda-10.2 /usr/local/cuda-10.2 COPY --from=CUDA101 /usr/local/cuda-10.1 /usr/local/cuda-10.1 COPY --from=CUDA100 /usr/local/cuda-10.0 /usr/local/cuda-10.0 COPY --from=CUDA92 /usr/local/cuda-9.2 /usr/local/cuda-9.2 COPY --from=CUDA90 /usr/local/cuda-9.0 /usr/local/cuda-9.0 COPY --from=CUDA80 /usr/local/cuda-8.0 /usr/local/cuda-8.0 - +RUN conda create -y -n prep -c nvidia --download-only cudatoolkit=10.2 && \ + conda create -y -n prep -c nvidia --download-only cudatoolkit=10.1 && \ + conda create -y -n prep -c nvidia --download-only cudatoolkit=10.0 && \ + conda create -y -n prep -c nvidia --download-only cudatoolkit=9.2 && \ + conda create -y -n prep -c nvidia --download-only cudatoolkit=9.0 && \ + conda create -y -n prep -c nvidia --download-only cudatoolkit=8.0 diff --git a/python/conda/linux_release/buildenv/Dockerfile b/python/conda/linux_release/buildenv.deb9/Dockerfile index 5c891ce..5bb25f9 100644 --- a/python/conda/linux_release/buildenv/Dockerfile +++ b/python/conda/linux_release/buildenv.deb9/Dockerfile @@ -1,15 +1,21 @@ -FROM debian:8 AS BUILDBASE +FROM debian:9 AS BUILDBASE ENV DEBIAN_FRONTEND noninteractive #RUN echo 'deb http://archive.debian.org/debian/ wheezy main' > /etc/apt/sources.list && echo 'deb http://archive.debian.org/debian-security/ wheezy/updates main' >> /etc/apt/sources.list && apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -y perl-modules build-essential autoconf libtool automake libboost-dev git libxml2 && rm -rf /var/lib/apt/lists/* RUN apt-get update && apt-get install -y perl-modules build-essential autoconf libtool automake libboost-dev git libxml2 && rm -rf /var/lib/apt/lists/* ENV PATH /root/miniconda3/bin:$PATH -COPY Miniconda3-py38_4.8.3-Linux-x86_64.sh /root/ -RUN /bin/bash /root/Miniconda3-py38_4.8.3-Linux-x86_64.sh -b && \ +COPY Miniconda3-py39_4.10.3-Linux-x86_64.sh /root/ +RUN /bin/bash /root/Miniconda3-py39_4.10.3-Linux-x86_64.sh -b && \ rm -f /root/Miniconda3* RUN conda install -y conda-build conda-verify +FROM BUILDBASE AS CUDA111 +RUN touch /root/cuda111 +COPY cuda_11.1.1_455.32.00_linux.run /root +RUN /bin/bash /root/cuda_11.1.1_455.32.00_linux.run --toolkit --silent --installpath=/usr/local/cuda-11.1 && \ + rm -f /root/cuda_11.1.1_455.32.00_linux.run + FROM BUILDBASE AS CUDA110 RUN touch /root/cuda110 COPY cuda_11.0.3_450.51.06_linux.run /root @@ -17,15 +23,10 @@ RUN /bin/bash /root/cuda_11.0.3_450.51.06_linux.run --toolkit --silent --install rm -f /root/cuda_11.0.3_450.51.06_linux.run -FROM BUILDBASE AS CUDA102 -RUN touch /root/cuda102 -COPY cuda_10.2.89_440.33.01_linux.run /root -RUN /bin/bash /root/cuda_10.2.89_440.33.01_linux.run --toolkit --silent --installpath=/usr/local/cuda-10.2 && \ - rm -f /root/cuda_10.2.89_440.33.01_linux.run - FROM BUILDBASE RUN touch /root/cuda +COPY --from=CUDA111 /usr/local/cuda-11.1 /usr/local/cuda-11.1 COPY --from=CUDA110 /usr/local/cuda-11.0 /usr/local/cuda-11.0 -COPY --from=CUDA102 /usr/local/cuda-10.2 /usr/local/cuda-10.2 - +RUN conda create -y -n prep -c nvidia --download-only cudatoolkit=11.1 && \ + conda create -y -n prep -c nvidia --download-only cudatoolkit=11.0 diff --git a/python/conda/linux_release/release.sh b/python/conda/linux_release/release.sh index c3b5431..75e64c8 100644 --- a/python/conda/linux_release/release.sh +++ b/python/conda/linux_release/release.sh @@ -4,25 +4,50 @@ set -e D=`mktemp -d` -for F in https://repo.anaconda.com/miniconda/Miniconda3-py38_4.8.3-Linux-x86_64.sh http://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda_10.2.89_440.33.01_linux.run https://developer.download.nvidia.com/compute/cuda/11.0.3/local_installers/cuda_11.0.3_450.51.06_linux.run ; do - [ -f buildenv/`basename $F` ] || (cd buildenv; wget $F ) +for F in \ + https://repo.anaconda.com/miniconda/Miniconda3-py39_4.10.3-Linux-x86_64.sh \ + https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run \ + https://developer.nvidia.com/compute/cuda/8.0/Prod2/patches/2/cuda_8.0.61.2_linux-run \ + https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run \ + https://developer.nvidia.com/compute/cuda/9.2/Prod2/local_installers/cuda_9.2.148_396.37_linux \ + https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_410.48_linux \ + http://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.243_418.87.00_linux.run \ + http://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda_10.2.89_440.33.01_linux.run \ +; do + [ -f buildenv.deb8/`basename $F` ] || (cd buildenv.deb8; wget $F ) done - -for F in https://repo.anaconda.com/miniconda/Miniconda3-py38_4.8.3-Linux-x86_64.sh https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run https://developer.nvidia.com/compute/cuda/8.0/Prod2/patches/2/cuda_8.0.61.2_linux-run https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run https://developer.nvidia.com/compute/cuda/9.2/Prod2/local_installers/cuda_9.2.148_396.37_linux https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_410.48_linux http://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.243_418.87.00_linux.run ; do - [ -f buildenv/`basename $F` ] || (cd buildenv; wget $F ) +for F in \ + https://repo.anaconda.com/miniconda/Miniconda3-py39_4.10.3-Linux-x86_64.sh \ + https://developer.download.nvidia.com/compute/cuda/11.0.3/local_installers/cuda_11.0.3_450.51.06_linux.run \ + https://developer.download.nvidia.com/compute/cuda/11.1.1/local_installers/cuda_11.1.1_455.32.00_linux.run \ +; do + [ -f buildenv.deb9/`basename $F` ] || (cd buildenv.deb9; wget $F ) done +for F in \ + https://repo.anaconda.com/miniconda/Miniconda3-py39_4.10.3-Linux-x86_64.sh \ + https://developer.download.nvidia.com/compute/cuda/11.2.2/local_installers/cuda_11.2.2_460.32.03_linux.run \ + https://developer.download.nvidia.com/compute/cuda/11.3.1/local_installers/cuda_11.3.1_465.19.01_linux.run \ + https://developer.download.nvidia.com/compute/cuda/11.4.1/local_installers/cuda_11.4.1_470.57.02_linux.run \ + https://developer.download.nvidia.com/compute/cuda/11.5.0/local_installers/cuda_11.5.0_495.29.05_linux.run \ +; do + [ -f buildenv.deb11/`basename $F` ] || (cd buildenv.deb11; wget $F ) +done -docker build -t astra-build-env buildenv -docker build -t astra-build-env-archive -f buildenv/archive.Dockerfile buildenv +docker build -t astra-build-env-deb8 buildenv.deb8 +docker build -t astra-build-env-deb9 buildenv.deb9 +docker build -t astra-build-env-deb11 buildenv.deb11 -cp buildenv/build.sh $D +cp build.sh $D -V=1.9.9.dev6 +V=2.0.0 -docker run -v $D:/out:z astra-build-env-archive /bin/bash /out/build.sh $V 0 archive -docker run -v $D:/out:z astra-build-env /bin/bash /out/build.sh $V 0 +docker run -v $D:/out:z astra-build-env-deb8 /bin/bash /out/build.sh $V 0 deb8 +docker run -v $D:/out:z astra-build-env-deb9 /bin/bash /out/build.sh $V 0 deb9 full +#Disable this until cython is available for python 3.10 in conda +#docker run -v $D:/out:z astra-build-env-deb11 /bin/bash /out/build.sh $V 0 deb11 full +docker run -v $D:/out:z astra-build-env-deb11 /bin/bash /out/build.sh $V 0 deb11 rm -f $D/build.sh |