summaryrefslogtreecommitdiffstats
path: root/Wrappers/Python/test
diff options
context:
space:
mode:
authorDaniil Kazantsev <dkazanc@hotmail.com>2018-02-26 12:50:58 +0000
committerDaniil Kazantsev <dkazanc@hotmail.com>2018-02-26 12:50:58 +0000
commitbcdf186ccdca54a3df383512ad5a117004500a60 (patch)
tree3a2bd95f48618dda9263b02da53ee59eb15defdf /Wrappers/Python/test
parentb9562bbfdf6ca2cc8775e242ae13cbfaeeb2479b (diff)
downloadregularization-bcdf186ccdca54a3df383512ad5a117004500a60.tar.gz
regularization-bcdf186ccdca54a3df383512ad5a117004500a60.tar.bz2
regularization-bcdf186ccdca54a3df383512ad5a117004500a60.tar.xz
regularization-bcdf186ccdca54a3df383512ad5a117004500a60.zip
CPU-GPU naming consistency
Diffstat (limited to 'Wrappers/Python/test')
-rw-r--r--Wrappers/Python/test/test_cpu_vs_gpu.py10
-rw-r--r--Wrappers/Python/test/test_cpu_vs_gpu_regularizers.py8
2 files changed, 14 insertions, 4 deletions
diff --git a/Wrappers/Python/test/test_cpu_vs_gpu.py b/Wrappers/Python/test/test_cpu_vs_gpu.py
new file mode 100644
index 0000000..74d65dd
--- /dev/null
+++ b/Wrappers/Python/test/test_cpu_vs_gpu.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+Created on Wed Feb 21 12:12:22 2018
+
+# CPU vs GPU comparison tests
+
+@author: algol
+"""
+
diff --git a/Wrappers/Python/test/test_cpu_vs_gpu_regularizers.py b/Wrappers/Python/test/test_cpu_vs_gpu_regularizers.py
index d742a7f..6344021 100644
--- a/Wrappers/Python/test/test_cpu_vs_gpu_regularizers.py
+++ b/Wrappers/Python/test/test_cpu_vs_gpu_regularizers.py
@@ -12,8 +12,8 @@ import matplotlib.pyplot as plt
import numpy as np
import os
import timeit
-from ccpi.filters.gpu_regularizers import Diff4thHajiaboli, NML, GPU_ROF_TV
-from ccpi.filters.cpu_regularizers_cython import ROF_TV
+from ccpi.filters.gpu_regularizers import Diff4thHajiaboli, NML, TV_ROF_GPU
+from ccpi.filters.cpu_regularizers_cython import TV_ROF_CPU
###############################################################################
def printParametersToString(pars):
txt = r''
@@ -64,7 +64,7 @@ pars = {'algorithm': ROF_TV , \
}
print ("#################ROF TV CPU#####################")
start_time = timeit.default_timer()
-rof_cpu = ROF_TV(pars['input'],
+rof_cpu = TV_ROF_CPU(pars['input'],
pars['number_of_iterations'],
pars['regularization_parameter'],
pars['time_marching_parameter']
@@ -89,7 +89,7 @@ plt.title('{}'.format('CPU results'))
print ("#################ROF TV GPU#####################")
start_time = timeit.default_timer()
-rof_gpu = GPU_ROF_TV(pars['input'],
+rof_gpu = TV_ROF_GPU(pars['input'],
pars['number_of_iterations'],
pars['time_marching_parameter'],
pars['regularization_parameter'])