diff options
| author | TomasKulhanek <tomas.kulhanek@stfc.ac.uk> | 2018-12-06 14:56:39 +0000 |
|---|---|---|
| committer | TomasKulhanek <tomas.kulhanek@stfc.ac.uk> | 2018-12-06 14:56:39 +0000 |
| commit | c04b85a6fdd8c63e3363c8072cbfe4b97409dc60 (patch) | |
| tree | 0b12e391692854435319ee72199cfa57908bcff8 /Wrappers/Python/ccpi | |
| parent | c4d1fccb8fb4a2beaf9b9cfb8e2f38b9cfeac283 (diff) | |
| parent | 3bce1f1410303a6833d1e647fba9692ea40fa878 (diff) | |
| download | regularization-c04b85a6fdd8c63e3363c8072cbfe4b97409dc60.tar.gz regularization-c04b85a6fdd8c63e3363c8072cbfe4b97409dc60.tar.bz2 regularization-c04b85a6fdd8c63e3363c8072cbfe4b97409dc60.tar.xz regularization-c04b85a6fdd8c63e3363c8072cbfe4b97409dc60.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'Wrappers/Python/ccpi')
| -rw-r--r-- | Wrappers/Python/ccpi/filters/regularisers.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Wrappers/Python/ccpi/filters/regularisers.py b/Wrappers/Python/ccpi/filters/regularisers.py index bf7e23c..0a65590 100644 --- a/Wrappers/Python/ccpi/filters/regularisers.py +++ b/Wrappers/Python/ccpi/filters/regularisers.py @@ -4,7 +4,7 @@ script which assigns a proper device core function based on a flag ('cpu' or 'gp from ccpi.filters.cpu_regularisers import TV_ROF_CPU, TV_FGP_CPU, TV_SB_CPU, dTV_FGP_CPU, TNV_CPU, NDF_CPU, Diff4th_CPU, TGV_CPU, LLT_ROF_CPU, PATCHSEL_CPU, NLTV_CPU try: - from ccpi.filters.gpu_regularisers import TV_ROF_GPU, TV_FGP_GPU, TV_SB_GPU, dTV_FGP_GPU, NDF_GPU, Diff4th_GPU, TGV_GPU, LLT_ROF_GPU + from ccpi.filters.gpu_regularisers import TV_ROF_GPU, TV_FGP_GPU, TV_SB_GPU, dTV_FGP_GPU, NDF_GPU, Diff4th_GPU, TGV_GPU, LLT_ROF_GPU, PATCHSEL_GPU gpu_enabled = True except ImportError: gpu_enabled = False @@ -153,7 +153,11 @@ def PatchSelect(inputData, searchwindow, patchwindow, neighbours, edge_parameter neighbours, edge_parameter) elif device == 'gpu' and gpu_enabled: - return 1 + return PATCHSEL_GPU(inputData, + searchwindow, + patchwindow, + neighbours, + edge_parameter) else: if not gpu_enabled and device == 'gpu': raise ValueError ('GPU is not available') |