diff options
| author | Edoardo Pasca <edo.paskino@gmail.com> | 2019-04-17 11:20:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-17 11:20:58 +0100 |
| commit | 0f73f1fd6227ffb72f93a53bcfcad0ed2e595b85 (patch) | |
| tree | 2dfc32309ab17f2c0739f4eb8e37abed83dd6aa8 /Wrappers | |
| parent | 6298d6c736ffd36354635ab7a335f57fb3bd060f (diff) | |
| parent | 679b12e0e2f1bc362ddfdfc4ccf9819842003f1a (diff) | |
| download | framework-0f73f1fd6227ffb72f93a53bcfcad0ed2e595b85.tar.gz framework-0f73f1fd6227ffb72f93a53bcfcad0ed2e595b85.tar.bz2 framework-0f73f1fd6227ffb72f93a53bcfcad0ed2e595b85.tar.xz framework-0f73f1fd6227ffb72f93a53bcfcad0ed2e595b85.zip | |
Merge pull request #252 from vais-ral/spdhg_to_contrib
Spdhg to contrib
Diffstat (limited to 'Wrappers')
| -rw-r--r-- | Wrappers/Python/ccpi/contrib/__init__.py | 0 | ||||
| -rw-r--r-- | Wrappers/Python/ccpi/contrib/optimisation/__init__.py | 0 | ||||
| -rw-r--r-- | Wrappers/Python/ccpi/contrib/optimisation/algorithms/__init__.py | 0 | ||||
| -rwxr-xr-x | Wrappers/Python/ccpi/contrib/optimisation/algorithms/spdhg.py (renamed from Wrappers/Python/ccpi/optimisation/spdhg.py) | 0 | ||||
| -rw-r--r-- | Wrappers/Python/setup.py | 4 |
5 files changed, 3 insertions, 1 deletions
diff --git a/Wrappers/Python/ccpi/contrib/__init__.py b/Wrappers/Python/ccpi/contrib/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Wrappers/Python/ccpi/contrib/__init__.py diff --git a/Wrappers/Python/ccpi/contrib/optimisation/__init__.py b/Wrappers/Python/ccpi/contrib/optimisation/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Wrappers/Python/ccpi/contrib/optimisation/__init__.py diff --git a/Wrappers/Python/ccpi/contrib/optimisation/algorithms/__init__.py b/Wrappers/Python/ccpi/contrib/optimisation/algorithms/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Wrappers/Python/ccpi/contrib/optimisation/algorithms/__init__.py diff --git a/Wrappers/Python/ccpi/optimisation/spdhg.py b/Wrappers/Python/ccpi/contrib/optimisation/algorithms/spdhg.py index 263a7cd..263a7cd 100755 --- a/Wrappers/Python/ccpi/optimisation/spdhg.py +++ b/Wrappers/Python/ccpi/contrib/optimisation/algorithms/spdhg.py diff --git a/Wrappers/Python/setup.py b/Wrappers/Python/setup.py index 87930b5..a3fde59 100644 --- a/Wrappers/Python/setup.py +++ b/Wrappers/Python/setup.py @@ -35,7 +35,9 @@ setup( 'ccpi.framework', 'ccpi.optimisation', 'ccpi.optimisation.operators', 'ccpi.optimisation.algorithms', - 'ccpi.optimisation.functions'], + 'ccpi.optimisation.functions', + 'ccpi.contrib','ccpi.contrib.optimisation', + 'ccpi.contrib.optimisation.algorithms'], # Project uses reStructuredText, so ensure that the docutils get # installed or upgraded on the target machine |