[patch] fixed hdf5 dependencies of python bindings

vigra-1.7.0-0e8b9c541be4.patch (text/plain), 7.36 KB, created by J. M. Gottfried on 2010-04-21 16:29:24 UTC

diff -r c1fedd61994d .hgignore
--- a/.hgignore	Tue Apr 20 18:28:54 2010 +0200
+++ b/.hgignore	Wed Apr 21 18:16:58 2010 +0200
@@ -29,6 +29,7 @@
 ^CMakeCache\.txt$
 ^private$
 ^vigranumpy/private$
+^vigranumpy/lib/__version__.py$
 CMakeFiles/
 \.cmake$
 
diff -r c1fedd61994d CMakeLists.txt
--- a/CMakeLists.txt	Tue Apr 20 18:28:54 2010 +0200
+++ b/CMakeLists.txt	Wed Apr 21 18:16:58 2010 +0200
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8)
 
 ##################################################
 #
diff -r c1fedd61994d docsrc/CMakeLists.txt
--- a/docsrc/CMakeLists.txt	Tue Apr 20 18:28:54 2010 +0200
+++ b/docsrc/CMakeLists.txt	Wed Apr 21 18:16:58 2010 +0200
@@ -31,8 +31,11 @@
 			${DOCDIR}/vigra/documents/tutorial_reference.pdf
 		COMMENT "Postprocessing html files")
 
-	INSTALL(DIRECTORY ${DOCDIR}/
-		DESTINATION ${DOCINSTALL}/)
+	INSTALL(
+		DIRECTORY ${DOCDIR}/
+		DESTINATION ${DOCINSTALL}/
+		OPTIONAL
+	)
 
 ELSE()
 	ADD_CUSTOM_TARGET (doc_cpp 
diff -r c1fedd61994d include/vigra/colorconversions.hxx
--- a/include/vigra/colorconversions.hxx	Tue Apr 20 18:28:54 2010 +0200
+++ b/include/vigra/colorconversions.hxx	Wed Apr 21 18:16:58 2010 +0200
@@ -832,14 +832,14 @@
             The maximum value for each RGB component defaults to 255.
         */
     RGBPrime2XYZFunctor()
-    : max_(component_type(255.0)), gamma_(1.0/ 0.45)
+	: gamma_(1.0/ 0.45), max_(component_type(255.0))
     {}
     
         /** constructor
             \arg max - the maximum value for each RGB component
         */
     RGBPrime2XYZFunctor(component_type max)
-    : max_(max), gamma_(1.0/ 0.45)
+	: gamma_(1.0/ 0.45), max_(max)
     {}
     
         /** apply the transformation
@@ -998,14 +998,14 @@
             The maximum value for each RGB component defaults to 255.
         */
     XYZ2RGBPrimeFunctor()
-    : max_(component_type(255.0)), gamma_(0.45)
+	: gamma_(0.45), max_(component_type(255.0))
     {}
     
         /** constructor
             \arg max - the maximum value for each RGB component
         */
     XYZ2RGBPrimeFunctor(component_type max)
-    : max_(max), gamma_(0.45)
+	: gamma_(0.45), max_(max)
     {}
     
         /** apply the transformation
diff -r c1fedd61994d include/vigra/numpy_array.hxx
--- a/include/vigra/numpy_array.hxx	Tue Apr 20 18:28:54 2010 +0200
+++ b/include/vigra/numpy_array.hxx	Wed Apr 21 18:16:58 2010 +0200
@@ -36,6 +36,7 @@
 #ifndef VIGRA_NUMPY_ARRAY_HXX
 #define VIGRA_NUMPY_ARRAY_HXX
 
+#include <Python.h>
 #include <iostream>
 #include <algorithm>
 #include <complex>
@@ -46,7 +47,6 @@
 #include <vigra/array_vector.hxx>
 #include <vigra/sized_int.hxx>
 #include <vigra/python_utility.hxx>
-#include <Python.h>
 #include <numpy/arrayobject.h>
 
 int _import_array();
diff -r c1fedd61994d include/vigra/python_utility.hxx
--- a/include/vigra/python_utility.hxx	Tue Apr 20 18:28:54 2010 +0200
+++ b/include/vigra/python_utility.hxx	Wed Apr 21 18:16:58 2010 +0200
@@ -36,8 +36,8 @@
 #ifndef VIGRA_PYTHON_UTILITY_HXX
 #define VIGRA_PYTHON_UTILITY_HXX
 
+#include <Python.h>
 #include <algorithm>
-#include <Python.h>
 #include "vigra/error.hxx"
 #include "vigra/tinyvector.hxx"
 
diff -r c1fedd61994d vigranumpy/src/core/CMakeLists.txt
--- a/vigranumpy/src/core/CMakeLists.txt	Tue Apr 20 18:28:54 2010 +0200
+++ b/vigranumpy/src/core/CMakeLists.txt	Wed Apr 21 18:16:58 2010 +0200
@@ -1,3 +1,7 @@
+IF(HDF5_FOUND)
+  ADD_DEFINITIONS(-DHasHDF5 ${HDF5_CPPFLAGS})
+  INCLUDE_DIRECTORIES(${HDF5_INCLUDE_DIR})
+ENDIF(HDF5_FOUND)
 
 # note special treatment of target vigranumpy_core: 
 # module name is automatically changed into vigranumpycore
diff -r c1fedd61994d vigranumpy/src/core/impex.cxx
--- a/vigranumpy/src/core/impex.cxx	Tue Apr 20 18:28:54 2010 +0200
+++ b/vigranumpy/src/core/impex.cxx	Wed Apr 21 18:16:58 2010 +0200
@@ -36,14 +36,14 @@
 #define PY_ARRAY_UNIQUE_SYMBOL vigranumpyimpex_PyArray_API
 //#define NO_IMPORT_ARRAY
 
-#include <iostream>
-#include <cstring>
-#include <cstdio>
 #include "vigra/numpy_array.hxx"
 #include "vigra/impex.hxx"
 #include "vigra/multi_impex.hxx"
 #include <vigra/numpy_array_converters.hxx>
 #include "vigra/hdf5impex.hxx"
+#include <iostream>
+#include <cstring>
+#include <cstdio>
 
 namespace python = boost::python;
 
diff -r c1fedd61994d vigranumpy/src/core/kernel.cxx
--- a/vigranumpy/src/core/kernel.cxx	Tue Apr 20 18:28:54 2010 +0200
+++ b/vigranumpy/src/core/kernel.cxx	Wed Apr 21 18:16:58 2010 +0200
@@ -36,8 +36,8 @@
 #define PY_ARRAY_UNIQUE_SYMBOL vigranumpyfilters_PyArray_API
 #define NO_IMPORT_ARRAY
 
+#include <Python.h>
 #include <iostream>
-#include <Python.h>
 #include <boost/python.hpp>
 #include <vigra/numpy_array.hxx>
 #include <vigra/numpy_array_converters.hxx>
diff -r c1fedd61994d vigranumpy/src/core/random_forest.cxx
--- a/vigranumpy/src/core/random_forest.cxx	Tue Apr 20 18:28:54 2010 +0200
+++ b/vigranumpy/src/core/random_forest.cxx	Wed Apr 21 18:16:58 2010 +0200
@@ -39,7 +39,9 @@
 #include <vigra/numpy_array.hxx>
 #include <vigra/numpy_array_converters.hxx>
 #include <vigra/random_forest.hxx>
+#ifdef HasHDF5
 #include <vigra/random_forest_hdf5_impex.hxx>
+#endif
 #include <set>
 #include <cmath>
 #include <memory>
@@ -85,6 +87,7 @@
     return rf;
 }
 
+#ifdef HasHDF5
 template<class LabelType>
 RandomForest<LabelType> * 
 pythonImportRandomForestFromHDF5(std::string filename, 
@@ -96,7 +99,8 @@
            "RandomForest(): Unable to load from HDF5 file.");
            
     return rf.release();
-}					
+}
+#endif
 
 template<class LabelType, class FeatureType>
 python::tuple
@@ -248,12 +252,14 @@
              "'treeCount' controls the number of trees that are created.\n\n"
              "See RandomForest_ and RandomForestOptions_ in the C++ documentation "
              "for the meaning of the other parameters.\n")
+#ifdef HasHDF5
         .def("__init__",python::make_constructor(&pythonImportRandomForestFromHDF5<UInt32>,
                                                  boost::python::default_call_policies(),
                                                  ( arg("filename"),
                                                    arg("pathInFile")="")),
              "Load from HDF5 file::\n\n"
              "  RandomForest(filename, pathInFile)\n\n")
+#endif
         .def("featureCount",
             &RandomForest<UInt32>::column_count,
              "Returns the number of features the RandomForest works with.\n")
@@ -299,11 +305,13 @@
              "Learn online.\n\n"
              "Works only if forest has been created with prepare_online_learning=true. "
              "Needs the old training data and the new appened, starting at startIndex.\n\n")
+#ifdef HasHDF5
         .def("writeHDF5", &rf_export_HDF5<UInt32>,
              (arg("filename"), arg("pathInFile")="", arg("overwriteflag")=false),
              "Store the random forest in the given HDF5 file 'filname' under the internal\n"
              "path 'pathInFile'. If a dataset already exists, 'overwriteflag' determines\n"
              "if the old data are overwritten.\n")
+#endif
         ;
 }
 
diff -r c1fedd61994d vigranumpy/src/core/vigranumpycore.cxx
--- a/vigranumpy/src/core/vigranumpycore.cxx	Tue Apr 20 18:28:54 2010 +0200
+++ b/vigranumpy/src/core/vigranumpycore.cxx	Wed Apr 21 18:16:58 2010 +0200
@@ -35,8 +35,8 @@
 
 #define PY_ARRAY_UNIQUE_SYMBOL vigranumpycore_PyArray_API
 
+#include <Python.h>
 #include <iostream>
-#include <Python.h>
 #include <boost/python.hpp>
 #include <vigra/numpy_array.hxx>
 #include <vigra/numpy_array_converters.hxx>