[clfft] 16/32: fix another silly bug

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Tue Apr 26 08:34:09 UTC 2016


This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository clfft.

commit 88b562de7e980220174ef26de79c57210f41950b
Author: Timmy <timmy.liu at amd.com>
Date:   Thu Mar 31 09:06:56 2016 -0500

    fix another silly bug
---
 src/library/enqueue.cpp          | 9 +++++++++
 src/library/plan.cpp             | 4 ++--
 src/tests/accuracy_test_pow3.cpp | 7 +++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/library/enqueue.cpp b/src/library/enqueue.cpp
index a4b9660..befdf65 100644
--- a/src/library/enqueue.cpp
+++ b/src/library/enqueue.cpp
@@ -625,6 +625,15 @@ clfftStatus FFTAction::enqueue(clfftPlanHandle plHandle,
     std::vector< size_t > lWorkSize;
     clfftStatus result = this->getWorkSizes (gWorkSize, lWorkSize);
 	//std::cout << "work sizes are " << gWorkSize[0] << ", " << lWorkSize[0] << std::endl;
+	/*
+	std::cout << "work sizes are ";
+	for (auto itor = gWorkSize.begin(); itor != gWorkSize.end(); itor++)
+		std::cout << *itor << " ";
+	std::cout << ", ";
+	for (auto itor = lWorkSize.begin(); itor != lWorkSize.end(); itor++)
+		std::cout << *itor << " ";
+	std::cout << std::endl;
+	*/
     // TODO:  if getWorkSizes returns CLFFT_INVALID_GLOBAL_WORK_SIZE, that means
     // that this multidimensional input data array is too large to be transformed
     // with a single call to clEnqueueNDRangeKernel.  For now, we will just return
diff --git a/src/library/plan.cpp b/src/library/plan.cpp
index 8cb07cd..ea13c0a 100644
--- a/src/library/plan.cpp
+++ b/src/library/plan.cpp
@@ -961,10 +961,10 @@ clfftStatus	clfftBakePlan( clfftPlanHandle plHandle, cl_uint numQueues, cl_comma
 							the iDist should decrease accordingly. Push back to length will cause a 3D transpose
 							*/
 							trans3Plan->batchsize = trans3Plan->batchsize * fftPlan->length[index];
-							trans3Plan->iDist = trans3Plan->iDist / fftPlan->length[index];
+							//trans3Plan->iDist = trans3Plan->iDist / fftPlan->length[index];//silly Timmy
 							//trans3Plan->inStride.push_back(trans3Plan->iDist);
 							trans3Plan->inStride.push_back(fftPlan->inStride[index]);
-							trans3Plan->iDist *= fftPlan->length[index];
+							//trans3Plan->iDist *= fftPlan->length[index];//silly Timmy
 							trans3Plan->outStride.push_back(fftPlan->outStride[index]);
 						}
 					}
diff --git a/src/tests/accuracy_test_pow3.cpp b/src/tests/accuracy_test_pow3.cpp
index 132e780..67f8699 100644
--- a/src/tests/accuracy_test_pow3.cpp
+++ b/src/tests/accuracy_test_pow3.cpp
@@ -1833,6 +1833,13 @@ void huge_1D_forward_in_place_complex_to_complex(size_t lenSize, size_t batchSiz
 	data_pattern pattern = sawtooth;
 	complex_to_complex<T, cl_T, fftw_T>(pattern, direction, lengths, batch, input_strides, output_strides, input_distance, output_distance, in_layout, out_layout, placeness);
 }
+
+TEST_F(accuracy_test_pow3_double, huge_1D_forward_in_place_complex_planar_to_complex_planar_5292_10)
+{
+	try { huge_1D_forward_in_place_complex_to_complex< double, cl_double, fftw_complex >(5292, 10, layout::complex_planar, direction::backward); }
+	catch (const std::exception& err) { handle_exception(err); }
+}
+
 //177147 = 243 * 243 * 3, backward and forward, planar and interleaved, single and double, batch size 1 and 3
 TEST_F(accuracy_test_pow3_single, huge_1D_forward_in_place_complex_planar_to_complex_planar_177147_1)
 {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clfft.git



More information about the debian-science-commits mailing list