[med-svn] r22483 - in trunk/packages/insighttoolkit/trunk/debian: . patches

[Gert Wollny]

Author: gert-guest
Date: 2016-07-11 09:21:00 +0000 (Mon, 11 Jul 2016)
New Revision: 22483

Added:
   trunk/packages/insighttoolkit/trunk/debian/patches/vnl_complex_test_accuracy.patch
Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/patches/series
   trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Correct package building on i386 

* fix vnl_complex test to test for floating point value 
  nearness instad of equalness 
* disable wrapping of unsigned long on i386 since the compiler 
  marks it as the same and the PythonTemplate tests fail. 



Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2016-07-10 20:57:54 UTC (rev 22482)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2016-07-11 09:21:00 UTC (rev 22483)
@@ -14,6 +14,10 @@
   * d/copyright: add excludes and update accordingly
   * d/watch, d/rules: add dfsg orig tarball suffix and correct data file 
     accordingly
+  * d/rules: disable unsigned_long wrapping on i386, because the compiler 
+    considers it to be the same like unsigned_int 
+  * d/p/vnl_complex_test_accuracy: correct tests to not test equality but 
+    near-ness of floating point results, test fails otherwise on i386   
 
  -- Gert Wollny <gw.fossdev at gmail.com>  Sun, 29 May 2016 21:54:50 +0000
 

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series	2016-07-10 20:57:54 UTC (rev 22482)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series	2016-07-11 09:21:00 UTC (rev 22483)
@@ -5,3 +5,4 @@
 ITKv3MultiResImageRegistrationTest_correct.patch
 itk4.10-correct_itkMathDetail_include-order.patch
 itk4.10-enable-system-nifti.patch
+vnl_complex_test_accuracy.patch

Added: trunk/packages/insighttoolkit/trunk/debian/patches/vnl_complex_test_accuracy.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/vnl_complex_test_accuracy.patch	                        (rev 0)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/vnl_complex_test_accuracy.patch	2016-07-11 09:21:00 UTC (rev 22483)
@@ -0,0 +1,20 @@
+Index: insighttoolkit4-4.10.0-dfsg1/Modules/ThirdParty/VNL/src/vxl/core/vnl/tests/test_complex.cxx
+===================================================================
+--- insighttoolkit4-4.10.0-dfsg1.orig/Modules/ThirdParty/VNL/src/vxl/core/vnl/tests/test_complex.cxx
++++ insighttoolkit4-4.10.0-dfsg1/Modules/ThirdParty/VNL/src/vxl/core/vnl/tests/test_complex.cxx
+@@ -60,11 +60,11 @@ static void test_vector()
+ 
+   std::complex<double> i(0,1);
+ 
+-  TEST("inner_product() conjugates correctly", inner_product(i*a,b), i*inner_product(a,b));
+-  TEST("inner_product() conjugates correctly", inner_product(a,i*b),-i*inner_product(a,b));
++  TEST_NEAR("inner_product() conjugates correctly", inner_product(i*a,b), i*inner_product(a,b), 1e-12);
++  TEST_NEAR("inner_product() conjugates correctly", inner_product(a,i*b),-i*inner_product(a,b), 1e-12);
+ 
+-  TEST("dot_product() does not conjugate", dot_product(i*a,b), i*dot_product(a,b));
+-  TEST("dot_product() does not conjugate", dot_product(a,i*b), i*dot_product(a,b));
++  TEST_NEAR("dot_product() does not conjugate", dot_product(i*a,b), i*dot_product(a,b), 1e-12);
++  TEST_NEAR("dot_product() does not conjugate", dot_product(a,i*b), i*dot_product(a,b), 1e-12);
+ 
+   double norma=0;
+   for (unsigned n=0; n<a.size(); ++n)

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2016-07-10 20:57:54 UTC (rev 22482)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2016-07-11 09:21:00 UTC (rev 22483)
@@ -13,8 +13,11 @@
 
 ifeq ($(DEB_BUILD_ARCH),i386)
   ENABLE_FFTW=OFF
+#(unsigned long) == (unsigned int) on 32 bit, since itk 4.10 or g++-5.4   
+  ENABLE_UNSIGNED_LONG=OFF 
 else
   ENABLE_FFTW=ON
+  ENABLE_UNSIGNED_LONG=ON 
 endif 
 
 CMAKE_FLAGS = \
@@ -55,7 +58,7 @@
 	-DITK_USE_SYSTEM_SWIG:BOOL=ON \
 	-DITK_USE_SYSTEM_CASTXML:BOOL=ON \
 	-DITK_WRAP_IMAGE_DIMS="2;3;4" \
-	-DITK_WRAP_unsigned_long:BOOL=ON \
+	-DITK_WRAP_unsigned_long:BOOL=$(ENABLE_UNSIGNED_LONG) \
 	-DITK_WRAP_double:BOOL=ON \
         -DITK_WRAP_vector_double:BOOL=ON \
         -DITK_WRAP_covariant_vector_double:BOOL=ON \