[opengm] 73/386: Merge remote-tracking branch 'opengm/master'
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Wed Aug 31 08:35:07 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch debian/master
in repository opengm.
commit 31a2a73560e82084f1e91f2048a7de7a0952d095
Merge: 082729c 6372dc2
Author: Jan Funke <funke at ini.ch>
Date: Tue Dec 16 17:06:06 2014 +0100
Merge remote-tracking branch 'opengm/master'
Conflicts:
.gitignore
README.md
src/unittest/CMakeLists.txt
.gitignore | 2 +
.travis.yml | 9 +-
CMakeLists.txt | 35 +-
ChangeLog.txt | 90 +
README.md | 126 +-
cmake/modules/FindHDF5.cmake | 2 +-
include/opengm/functions/fieldofexperts.hxx | 276 +
.../decomposition/graphicalmodeldecomposer.hxx | 42 +-
include/opengm/graphicalmodel/graphicalmodel.hxx | 8 +
include/opengm/inference/astar.hxx | 12 +-
.../auxiliary/fusion_move/fusion_mover.hxx | 945 ++-
.../inference/auxiliary/lp_reparametrization.hxx | 10 +-
.../auxiliary/lp_reparametrization_hdf5.hxx | 41 +
include/opengm/inference/auxiliary/lpdef.hxx | 35 +
.../inference/auxiliary/smoothing_to_marginals.hxx | 79 +
include/opengm/inference/combilp.hxx | 2 +-
.../dualdecomposition/dualdecomposition_base.hxx | 34 +-
include/opengm/inference/external/ad3.hxx | 7 +-
include/opengm/inference/external/daoopt.hxx | 27 +-
.../opengm/inference/external/libdai/inference.hxx | 10 +-
include/opengm/inference/fusion_based_inf.hxx | 1373 ++++
include/opengm/inference/graphcut.hxx | 8 +-
include/opengm/inference/hqpbo.hxx | 220 +
include/opengm/inference/infandflip.hxx | 8 +-
include/opengm/inference/lpcplex.hxx | 222 +-
include/opengm/inference/lpgurobi.hxx | 863 +++
include/opengm/inference/lsatr.hxx | 817 +++
.../inference/messagepassing/messagepassing.hxx | 21 +-
.../messagepassing/messagepassing_operations.hxx | 43 +-
.../messagepassing_operations_withFunctors.hxx | 407 ++
include/opengm/inference/mqpbo.hxx | 11 +-
include/opengm/inference/multicut.hxx | 302 +-
include/opengm/inference/reducedinference.hxx | 30 +-
include/opengm/inference/self_fusion.hxx | 453 ++
include/opengm/inference/trws/smooth_nesterov.hxx | 74 +-
.../opengm/inference/trws/smoothing_strategy.hxx | 459 +-
include/opengm/inference/trws/trws_adsal.hxx | 25 +-
include/opengm/inference/trws/trws_base.hxx | 117 +-
.../opengm/inference/trws/trws_decomposition.hxx | 2 +-
.../inference/trws/trws_reparametrization.hxx | 2 +-
.../inference/trws/trws_subproblemsolver.hxx | 272 +-
include/opengm/inference/trws/trws_trws.hxx | 5 +-
include/opengm/inference/visitors/visitors.hxx | 232 +-
include/opengm/unittests/blackboxtester.hxx | 12 +-
include/opengm/utilities/indexing.hxx | 4 +-
include/opengm/utilities/meminfo.hxx | 263 +
src/CMakeLists.txt | 3 +
src/external/patches/AD3/patchAD3.sh | 4 +-
src/external/patches/CMakeLists.txt | 2 +-
src/external/patches/GCO/gco-3.0.2.patch | 1622 +++++
src/external/patches/GCO/patchGCO.sh | 2 +-
src/external/patches/MPLP/mplp_ver2.patch | 6564 +++++++++++++-------
src/interfaces/commandline/double/CMakeLists.txt | 2 +-
.../commandline/double/opengm_min_sum.cxx | 20 +-
src/interfaces/common/caller/adsal_caller.hxx | 6 +-
src/interfaces/common/caller/dd_bundle_caller.hxx | 79 +-
.../common/caller/dd_subgradient_caller.hxx | 78 +-
src/interfaces/common/caller/fusion_caller.hxx | 207 +
.../common/caller/inference_caller_base.hxx | 4 +-
src/interfaces/common/caller/lpcplex_caller.hxx | 146 +
src/interfaces/common/caller/lpgurobi_caller.hxx | 177 +-
src/interfaces/common/caller/lsatr_caller.hxx | 80 +
.../common/caller/messagepassing_caller.hxx | 1 +
src/interfaces/common/caller/selffusion_caller.hxx | 160 +
.../matlab/opengm/m_files/model/openGMModel.m | 10 +
.../matlab/opengm/mex-src/CMakeLists.txt | 10 +
.../opengm/mex-src/model/addPairwiseTerms.cpp | 1 +
.../matlab/opengm/mex-src/model/getPottsModel.cpp | 146 +
.../matlab/opengm/mex-src/model/setPottsModel.cpp | 79 +
src/interfaces/python/CMakeLists.txt | 75 +-
src/interfaces/python/examples/inference_bp.py | 16 +-
.../python/examples/inference_fusion_based.py | 34 +
src/interfaces/python/examples/inference_icm.py | 2 +-
.../{inference_icm.py => inference_self_fusion.py} | 19 +-
src/interfaces/python/examples/markov_chain.py | 4 +-
src/interfaces/python/examples/potts_model.py | 3 +
src/interfaces/python/opengm/__init__.py | 9 +-
.../python/opengm/_to_native_converter.py | 7 +
.../python/opengm/inference/CMakeLists.txt | 4 +
.../python/opengm/inference/inference.cpp | 7 +-
.../python/opengm/inference/multicut_def_suite.hxx | 1 +
.../opengm/inference/param/fusion_based_param.hxx | 88 +
.../opengm/inference/param/multicut_param.hxx | 13 +-
.../opengm/inference/param/self_fusion_param.hxx | 94 +
.../python/opengm/inference/pyFusionBased.cxx | 133 +
.../python/opengm/inference/pyFusionBased.hxx | 3 +
.../python/opengm/inference/pySelfFusion.cxx | 127 +
.../python/opengm/inference/pySelfFusion.hxx | 2 +
.../python/opengm/inference/pyVisitor.hxx | 10 +-
.../python/opengm/opengmcore/__init__.py | 90 +-
.../python/opengm/opengmcore/opengmcore.cpp | 406 +-
.../python/opengm/opengmcore/pyVector.cxx | 11 +-
.../python/opengm/opengmcore/pyVector.hxx | 2 +-
src/tutorials/CMakeLists.txt | 1 +
src/tutorials/README | 41 +
src/tutorials/c++/CMakeLists.txt | 2 +
src/tutorials/c++/applications/CMakeLists.txt | 34 +
src/tutorials/c++/applications/buildFoE.cxx | 87 +
src/tutorials/c++/applications/denoise.cxx | 133 +
src/tutorials/c++/applications/denoise.hxx | 149 +
src/tutorials/c++/applications/imageSegSimple.cxx | 151 +
.../c++/applications/imageSegWithEMLearning.cxx | 291 +
.../c++/applications/photomontage-merging.cxx | 147 +
.../c++/applications/photomontage-merging.hxx | 315 +
.../c++/applications/photomontage-stitching.cxx | 129 +
.../c++/applications/photomontage-stitching.hxx | 240 +
.../c++/applications/utilities/parser/argument.hxx | 185 +
.../utilities/parser/argument_base.hxx | 132 +
.../utilities/parser/argument_holder.hxx | 247 +
.../utilities/parser/argument_name.hxx | 57 +
.../utilities/parser/argument_root.hxx | 101 +
.../utilities/parser/argument_value.hxx | 114 +
.../applications/utilities/parser/cmd_parser.hxx | 295 +
.../c++/applications/utilities/parser/enableif.hxx | 60 +
.../applications/utilities/parser/parser_error.hxx | 34 +
.../applications/utilities/parser/restictor.hxx | 89 +
.../applications/utilities/parser/restrictions.hxx | 94 +
.../utilities/parser/string_utilities.hxx | 598 ++
.../applications/utilities/parser/stringify.hxx | 199 +
.../c++/applications/utilities/pgmimage.hxx | 124 +
src/tutorials/c++/basics/CMakeLists.txt | 24 +
src/tutorials/c++/basics/buildGridModel.cxx | 120 +
src/tutorials/c++/basics/buildHigherOrderModel.cxx | 102 +
src/tutorials/c++/basics/buildModel.cxx | 120 +
src/tutorials/c++/basics/buildModelEfficent.cxx | 382 ++
src/tutorials/c++/basics/doMaxSumInference.cxx | 144 +
src/tutorials/c++/basics/doMinSumInference.cxx | 145 +
.../c++/basics/doMinSumInferenceExternal.cxx | 124 +
src/tutorials/c++/basics/doOrAndInference.cxx | 164 +
src/tutorials/c++/basics/doSumProdInference.cxx | 195 +
src/tutorials/c++/basics/modelIO.cxx | 127 +
src/unittest/CMakeLists.txt | 4 +-
src/unittest/inference/CMakeLists.txt | 74 +-
src/unittest/inference/test_fusion_based_inf.cxx | 199 +
src/unittest/inference/test_libdai.cxx | 69 +
src/unittest/inference/test_lpgurobi.cxx | 74 +
src/unittest/inference/test_lsatr.cxx | 50 +
src/unittest/inference/test_messagepassing.cxx | 81 +
src/unittest/inference/test_multicut.cxx | 109 +-
src/unittest/inference/test_nesterov.cxx | 2 +-
src/unittest/inference/test_self_fusion.cxx | 73 +
src/unittest/test_functions.cxx | 64 +
src/unittest/test_memoryinfo.cxx | 59 +
143 files changed, 21659 insertions(+), 3495 deletions(-)
diff --cc src/unittest/CMakeLists.txt
index b9f3e08,df76d9c..c25f77b
--- a/src/unittest/CMakeLists.txt
+++ b/src/unittest/CMakeLists.txt
@@@ -79,14 -76,8 +79,16 @@@ if(BUILD_TESTING
add_test(test-io-hdf5 ${CMAKE_CURRENT_BINARY_DIR}/test-io-hdf5)
endif()
- # Loop forever - fix and move to subfolder learning
+ if(WITH_GUROBI)
+ ADD_EXECUTABLE(test-learning test_learning.cxx ${headers})
+ target_link_libraries(test-learning ${GUROBI_CXX_LIBRARY} ${GUROBI_LIBRARY})
+ target_link_libraries(test-learning external-library-trws)
+ add_test(test-learning ${CMAKE_CURRENT_BINARY_DIR}/test-learning)
+ endif()
+
+ ADD_EXECUTABLE(test-memoryinfo test_memoryinfo.cxx ${headers})
+ add_test(test-memoryinfo ${CMAKE_CURRENT_BINARY_DIR}/test-memoryinfo)
+
add_subdirectory(inference)
+ add_subdirectory(learning)
endif()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opengm.git
More information about the debian-science-commits
mailing list