From c242dcbd9771609c2a9c2dd7651979c1298514c0 Mon Sep 17 00:00:00 2001 From: PBerger Date: Tue, 24 Sep 2013 00:22:34 +0200 Subject: [PATCH] Refactored CMakeLists.txt for better editing and overview Refactored all Defines for Gurobi, TBB, etc into the storm-config file Fixed a missing cast int SymbolicModelAdapter.h Fixed changed iterator structures in SparseMatrix.h Fixed bugs in CuddUtility.cpp where a 64bit shift was executed on a 32bit literal (1 should be 1ull) Fixed a Type Error in graph.h Former-commit-id: 797b4da2ebecb716c793d0529b7012737e448b2a --- CMakeLists.txt | 312 +++++++++++------- .../3rdparty/gmm-4.2/include/gmm/gmm_blas.h | 15 +- src/adapters/SymbolicModelAdapter.h | 2 +- .../MinimalLabelSetGenerator.h | 11 +- src/storage/SparseMatrix.h | 46 ++- src/utility/CuddUtility.cpp | 18 +- src/utility/graph.h | 2 +- storm-config.h.in | 23 +- 8 files changed, 264 insertions(+), 165 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bf95171fb..c2095c18e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,15 +7,24 @@ project (storm CXX C) set (STORM_CPP_VERSION_MAJOR 1) set (STORM_CPP_VERSION_MINOR 0) -# Set all Eigen references the version in the repository -set(EIGEN3_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/resources/3rdparty/eigen) -message(STATUS "EIGEN3_INCLUDE_DIR is ${EIGEN3_INCLUDE_DIR}") +# Add base folder for better inclusion paths +include_directories("${PROJECT_SOURCE_DIR}") +include_directories("${PROJECT_SOURCE_DIR}/src") -# Set all Eigen references the version in the repository -set(GMMXX_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/resources/3rdparty/gmm-4.2/include) -message(STATUS "GMMXX_INCLUDE_DIR is ${GMMXX_INCLUDE_DIR}") +# Add the version of Eigen3 in the repository to the include pathes +set(EIGEN3_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/resources/3rdparty/eigen") +include_directories(${EIGEN3_INCLUDE_DIR}) + +# Add the version of GMM in the repository to the include pathes +set(GMMXX_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/resources/3rdparty/gmm-4.2/include") +include_directories(${GMMXX_INCLUDE_DIR}) -# Now define all available custom options + +############################################################# +## +## CMake options of StoRM +## +############################################################# option(DEBUG "Sets whether the DEBUG mode is used" ON) option(USE_POPCNT "Sets whether the popcnt instruction is going to be used." ON) option(USE_BOOST_STATIC_LIBRARIES "Sets whether the Boost libraries should be linked statically." ON) @@ -27,14 +36,47 @@ set(ADDITIONAL_INCLUDE_DIRS "" CACHE STRING "Additional directories added to the set(ADDITIONAL_LINK_DIRS "" CACHE STRING "Additional directories added to the link directories.") set(CUSTOM_BOOST_ROOT "" CACHE STRING "A custom path to the Boost root directory.") +############################################################# +## +## Inclusion of required libraries +## +############################################################# + +set(TBB_INSTALL_DIR "${PROJECT_SOURCE_DIR}/resources/3rdparty/tbb41_20130314_merged-win-lin-mac/") +if(MSVC) + set(ENV{TBB_ARCH_PLATFORM} "intel64/vc11") +elseif(CMAKE_COMPILER_IS_GNUCC) + set(ENV{TBB_ARCH_PLATFORM} "intel64/gcc4.4") +else(CLANG) + set(ENV{TBB_ARCH_PLATFORM} "intel64/clang3.2") +endif() + +# Add the resources/cmake folder to Module Search Path for FindTBB.cmake +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/resources/cmake/") + +# Boost Option variables +set(Boost_USE_STATIC_LIBS ON) +set(Boost_USE_MULTITHREADED ON) +set(Boost_USE_STATIC_RUNTIME OFF) + +# If a custom boost root directory was specified, we set the corresponding hint for the script to find it. +if(CUSTOM_BOOST_ROOT) + message(STATUS "StoRM - Using Boost from CUSTOM_BOOST_ROOT located at ${CUSTOM_BOOST_ROOT}") + set(BOOST_ROOT "${CUSTOM_BOOST_ROOT}") +endif(CUSTOM_BOOST_ROOT) + +find_package(Boost REQUIRED) +find_package(Doxygen REQUIRED) +find_package(TBB) +find_package(Threads REQUIRED) + # If the DEBUG option was turned on, we will target a debug version and a release version otherwise if (DEBUG) set (CMAKE_BUILD_TYPE "DEBUG") - message(STATUS "Building DEBUG version.") else() set (CMAKE_BUILD_TYPE "RELEASE") - message(STATUS "Building RELEASE version.") endif() +message(STATUS "StoRM - Building ${CMAKE_BUILD_TYPE} version.") if ("${GUROBI_ROOT}" STREQUAL "") set(ENABLE_GUROBI OFF) @@ -42,14 +84,21 @@ else() set(ENABLE_GUROBI ON) endif() -message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") -message(STATUS "CMAKE_BUILD_TYPE (ENV): $ENV{CMAKE_BUILD_TYPE}") +message(STATUS "StoRM - CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") +message(STATUS "StoRM - CMAKE_BUILD_TYPE (ENV): $ENV{CMAKE_BUILD_TYPE}") + + +############################################################# +## +## Compiler specific settings and definitions +## +############################################################# # Path to the no-strict-aliasing target set(CONVERSIONHELPER_TARGET "${PROJECT_SOURCE_DIR}/src/utility/ConversionHelper.cpp") if(CMAKE_COMPILER_IS_GNUCC) - message(STATUS "Using GCC") + message(STATUS "StoRM - Using Compiler Configuration: GCC") # Set standard flags for GCC set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -funroll-loops") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -pedantic") @@ -65,7 +114,7 @@ if(CMAKE_COMPILER_IS_GNUCC) # Set the no-strict-aliasing target for GCC set_source_files_properties(${CONVERSIONHELPER_TARGET} PROPERTIES COMPILE_FLAGS " -fno-strict-aliasing ") elseif(MSVC) - message(STATUS "Using MSVC") + message(STATUS "StoRM - Using Compiler Configuration: MSVC") # required for GMM to compile, ugly error directive in their code add_definitions(/D_SCL_SECURE_NO_DEPRECATE /D_CRT_SECURE_NO_WARNINGS) # required as the PRCTL Parser bloats object files (COFF) beyond their maximum size (see http://msdn.microsoft.com/en-us/library/8578y171(v=vs.110).aspx) @@ -75,15 +124,17 @@ elseif(MSVC) # MSVC does not do strict-aliasing, so no option needed else(CLANG) - message(STATUS "Using CLANG") + message(STATUS "StoRM - Using Compiler Configuration: Clang (LLVM)") # As CLANG is not set as a variable, we need to set it in case we have not matched another compiler. set (CLANG ON) # Set standard flags for clang set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -funroll-loops -O3") if(UNIX AND NOT APPLE) set(CLANG_STDLIB libstdc++) + message(STATUS "StoRM - Linking against libstdc++") else() set(CLANG_STDLIB libc++) + message(STATUS "StoRM - Linking against libc++") # Disable Cotire set(STORM_USE_COTIRE OFF) # Set up some Xcode specific settings @@ -104,14 +155,40 @@ else(CLANG) set_source_files_properties(${CONVERSIONHELPER_TARGET} PROPERTIES COMPILE_FLAGS " -fno-strict-aliasing ") endif() -# Add the binary folder to the search path for include files so that we will find storm-config.h -include_directories("${PROJECT_BINARY_DIR}") - +############################################################# +## +## CMake-generated Config File for StoRM +## +############################################################# # Base path for test files -set(STORM_CPP_TESTS_BASE_PATH ${PROJECT_SOURCE_DIR}/test) -message(STATUS "STORM_CPP_TESTS_BASE_PATH is ${STORM_CPP_TESTS_BASE_PATH}") +set(STORM_CPP_TESTS_BASE_PATH "${PROJECT_SOURCE_DIR}/test") +# Gurobi Defines +if (ENABLE_GUROBI) + set(STORM_CPP_GUROBI_DEF "define") +else() + set(STORM_CPP_GUROBI_DEF "undef") +endif() + +# Intel TBB Defines +if (TBB_FOUND AND USE_INTELTBB) + set(STORM_CPP_INTELTBB_DEF "define") +else() + set(STORM_CPP_INTELTBB_DEF "undef") +endif() -# Main Sources +# Configure a header file to pass some of the CMake settings to the source code +configure_file ( + "${PROJECT_SOURCE_DIR}/storm-config.h.in" + "${PROJECT_BINARY_DIR}/include/storm-config.h" +) +# Add the binary dir include directory for storm-config.h +include_directories("${PROJECT_BINARY_DIR}/include") + +############################################################# +## +## Source file aggregation and clustering +## +############################################################# file(GLOB_RECURSE STORM_HEADERS ${PROJECT_SOURCE_DIR}/src/*.h) file(GLOB_RECURSE STORM_SOURCES_WITHOUT_MAIN ${PROJECT_SOURCE_DIR}/src/*/*.cpp) file(GLOB_RECURSE STORM_MAIN_FILE ${PROJECT_SOURCE_DIR}/src/storm.cpp) @@ -140,6 +217,9 @@ file(GLOB_RECURSE STORM_IR_EXPRESSIONS_FILES ${PROJECT_SOURCE_DIR}/src/ir/expres file(GLOB_RECURSE STORM_FUNCTIONAL_TEST_FILES ${STORM_CPP_TESTS_BASE_PATH}/functional/*.h ${STORM_CPP_TESTS_BASE_PATH}/functional/*.cpp) file(GLOB_RECURSE STORM_PERFORMANCE_TEST_FILES ${STORM_CPP_TESTS_BASE_PATH}/performance/*.h ${STORM_CPP_TESTS_BASE_PATH}/performance/*.cpp) +# Additional include files like the storm-config.h +file(GLOB_RECURSE STORM_BUILD_HEADERS ${PROJECT_BINARY_DIR}/include/*.h) + # Group the headers and sources source_group(main FILES ${STORM_MAIN_FILE}) source_group(adapters FILES ${STORM_ADAPTERS_FILES}) @@ -149,6 +229,9 @@ source_group(formula\\abstract FILES ${STORM_FORMULA_ABSTRACT_FILES}) source_group(formula\\csl FILES ${STORM_FORMULA_CSL_FILES}) source_group(formula\\ltl FILES ${STORM_FORMULA_LTL_FILES}) source_group(formula\\prctl FILES ${STORM_FORMULA_PRCTL_FILES}) +source_group(generated FILES ${STORM_BUILD_HEADERS}) +source_group(ir FILES ${STORM_IR_FILES}) +source_group(ir\\expressions FILES ${STORM_IR_EXPRESSIONS_FILES}) source_group(modelchecker FILES ${STORM_MODELCHECKER_FILES}) source_group(counterexamples FILES ${STORM_COUNTEREXAMPLES_FILES}) source_group(models FILES ${STORM_MODELS_FILES}) @@ -158,92 +241,57 @@ source_group(settings FILES ${STORM_SETTINGS_FILES}) source_group(solver FILES ${STORM_SOLVER_FILES}) source_group(storage FILES ${STORM_STORAGE_FILES}) source_group(utility FILES ${STORM_UTILITY_FILES}) -source_group(ir FILES ${STORM_IR_FILES}) -source_group(ir\\expressions FILES ${STORM_IR_EXPRESSIONS_FILES}) source_group(functional-test FILES ${STORM_FUNCTIONAL_TEST_FILES}) source_group(performance-test FILES ${STORM_PERFORMANCE_TEST_FILES}) -# Add base folder for better inclusion paths -include_directories("${PROJECT_SOURCE_DIR}") -include_directories("${PROJECT_SOURCE_DIR}/src") - -# Preset pathes for Intel TBB to internal copy in /resources/3rdParty/tbb41_20130314_mergedWindowsLinuxMacOSX -set(TBB_INSTALL_DIR "${PROJECT_SOURCE_DIR}/resources/3rdparty/tbb41_20130314_merged-win-lin-mac/") -if(MSVC) - set(ENV{TBB_ARCH_PLATFORM} "intel64/vc11") -elseif(CMAKE_COMPILER_IS_GNUCC) - set(ENV{TBB_ARCH_PLATFORM} "intel64/gcc4.4") -else(CLANG) - set(ENV{TBB_ARCH_PLATFORM} "intel64/clang3.2") -endif() - -# Add the resources/cmake folder to Module Search Path for FindTBB.cmake -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/resources/cmake/") - -# Set required external packages -find_package(Threads REQUIRED) -find_package(Doxygen REQUIRED) -set(Boost_USE_STATIC_LIBS ON) -set(Boost_USE_MULTITHREADED ON) -set(Boost_USE_STATIC_RUNTIME OFF) - -# If a custom boost root directory was specified, we set the corresponding hint for the script to find it. -if(CUSTOM_BOOST_ROOT) - set(BOOST_ROOT "${CUSTOM_BOOST_ROOT}") -endif(CUSTOM_BOOST_ROOT) -find_package(Boost REQUIRED COMPONENTS program_options) -find_package(TBB) - -if(Boost_FOUND) - if ((NOT Boost_LIBRARY_DIRS) OR ("${Boost_LIBRARY_DIRS}" STREQUAL "")) - set(Boost_LIBRARY_DIRS "${Boost_INCLUDE_DIRS}/stage/lib") - endif () - - message(STATUS "BOOST_INCLUDE_DIRS is ${Boost_INCLUDE_DIRS}") - message(STATUS "BOOST_LIBRARY_DIRS is ${Boost_LIBRARY_DIRS}") - - include_directories(${Boost_INCLUDE_DIRS}) - link_directories(${Boost_LIBRARY_DIRS}) -endif(Boost_FOUND) - -# Intels Thread Building Blocks -if (TBB_FOUND) - message(STATUS "Found TBB with Interface Version ${TBB_INTERFACE_VERSION}") - - if(USE_INTELTBB) - add_definitions(-DGMM_USE_TBB) - endif() - - include_directories(${TBB_INCLUDE_DIRS}) - link_directories(${TBB_LIBRARY_DIRS}) -endif(TBB_FOUND) - -# Add Eigen to the included directories -include_directories(${EIGEN3_INCLUDE_DIR}) - -# Add GMMXX to the included directories -include_directories(${GMMXX_INCLUDE_DIR}) - # Add custom additional include or link directories if (ADDITIONAL_INCLUDE_DIRS) - message(STATUS "Using additional include directories ${ADDITIONAL_INCLUDE_DIRS}") + message(STATUS "StoRM - Using additional include directories ${ADDITIONAL_INCLUDE_DIRS}") include_directories(${ADDITIONAL_INCLUDE_DIRS}) endif(ADDITIONAL_INCLUDE_DIRS) if (ADDITIONAL_LINK_DIRS) - message(STATUS "Using additional link directories ${ADDITIONAL_LINK_DIRS}") + message(STATUS "StoRM - Using additional link directories ${ADDITIONAL_LINK_DIRS}") link_directories(${ADDITIONAL_LINK_DIRS}) endif(ADDITIONAL_LINK_DIRS) -# Add the executables -# Must be created *after* Boost was added because of LINK_DIRECTORIES -add_executable(storm ${STORM_SOURCES} ${STORM_HEADERS}) -add_executable(storm-functional-tests ${STORM_FUNCTIONAL_TEST_FILES} ${STORM_SOURCES_WITHOUT_MAIN} ${STORM_HEADERS}) -add_executable(storm-performance-tests ${STORM_PERFORMANCE_TEST_FILES} ${STORM_SOURCES_WITHOUT_MAIN} ${STORM_HEADERS}) +############################################################# +## +## Pre executable-creation link_directories setup +## +############################################################# +if (ENABLE_GUROBI) + link_directories("${GUROBI_ROOT}/lib") +endif() +if ((NOT Boost_LIBRARY_DIRS) OR ("${Boost_LIBRARY_DIRS}" STREQUAL "")) + set(Boost_LIBRARY_DIRS "${Boost_INCLUDE_DIRS}/stage/lib") +endif () +link_directories(${Boost_LIBRARY_DIRS}) +if (TBB_FOUND AND USE_INTELTBB) + link_directories(${TBB_LIBRARY_DIRS}) +endif() -# Add target link deps for Boost program options +############################################################################### +## # +## Executable Creation # +## # +## All link_directories() calls MUST be made before this point # +## # +############################################################################### +add_executable(storm ${STORM_SOURCES} ${STORM_HEADERS} ${STORM_BUILD_HEADERS}) +add_executable(storm-functional-tests ${STORM_FUNCTIONAL_TEST_FILES} ${STORM_SOURCES_WITHOUT_MAIN} ${STORM_HEADERS} ${STORM_BUILD_HEADERS}) +add_executable(storm-performance-tests ${STORM_PERFORMANCE_TEST_FILES} ${STORM_SOURCES_WITHOUT_MAIN} ${STORM_HEADERS} ${STORM_BUILD_HEADERS}) + +############################################################# +## +## Boost +## +############################################################# +include_directories(${Boost_INCLUDE_DIRS}) target_link_libraries(storm ${Boost_LIBRARIES}) target_link_libraries(storm-functional-tests ${Boost_LIBRARIES}) target_link_libraries(storm-performance-tests ${Boost_LIBRARIES}) +#message(STATUS "BOOST_INCLUDE_DIRS is ${Boost_INCLUDE_DIRS}") +#message(STATUS "BOOST_LIBRARY_DIRS is ${Boost_LIBRARY_DIRS}") ############################################################# ## @@ -273,6 +321,19 @@ target_link_libraries(storm ltl2dstar) target_link_libraries(storm-functional-tests ltl2dstar) target_link_libraries(storm-performance-tests ltl2dstar) +############################################################# +## +## Gurobi (optional) +## +############################################################# +if (ENABLE_GUROBI) + message (STATUS "StoRM - Linking with Gurobi") + include_directories("${GUROBI_ROOT}/include") + target_link_libraries(storm "gurobi55") + target_link_libraries(storm-functional-tests "gurobi55") + target_link_libraries(storm-performance-tests "gurobi55") +endif(ENABLE_GUROBI) + ############################################################# ## ## Google Test gtest @@ -310,6 +371,35 @@ if (UNIX AND NOT APPLE) target_link_libraries(storm-performance-tests rt) endif(UNIX AND NOT APPLE) +############################################################# +## +## Intel Threading Building Blocks (optional) +## +############################################################# +if (TBB_FOUND) + message(STATUS "StoRM - Found Intel TBB with Interface Version ${TBB_INTERFACE_VERSION}") + if (USE_INTELTBB) + message(STATUS "StoRM - Linking with Intel TBB for activated Matrix/Vector MT") + include_directories(${TBB_INCLUDE_DIRS}) + target_link_libraries(storm tbb tbbmalloc) + target_link_libraries(storm-functional-tests tbb tbbmalloc) + target_link_libraries(storm-performance-tests tbb tbbmalloc) + endif(USE_INTELTBB) +endif(TBB_FOUND) + +############################################################# +## +## Threads +## +############################################################# +include_directories(${THREADS_INCLUDE_DIRS}) +target_link_libraries(storm ${CMAKE_THREAD_LIBS_INIT}) +if (STORM_USE_COTIRE) + target_link_libraries(storm_unity ${CMAKE_THREAD_LIBS_INIT}) +endif(STORM_USE_COTIRE) +target_link_libraries(storm-functional-tests ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(storm-performance-tests ${CMAKE_THREAD_LIBS_INIT}) + if (MSVC) # Add the DebugHelper DLL set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} Dbghelp.lib") @@ -318,14 +408,8 @@ if (MSVC) target_link_libraries(storm-performance-tests "Dbghelp.lib") endif(MSVC) -if (USE_INTELTBB) - target_link_libraries(storm tbb tbbmalloc) - target_link_libraries(storm-functional-tests tbb tbbmalloc) - target_link_libraries(storm-performance-tests tbb tbbmalloc) -endif(USE_INTELTBB) - # Print Cotire Usage Status -message (STATUS "Using Cotire: ${STORM_USE_COTIRE}") +message (STATUS "StoRM - Using Cotire: ${STORM_USE_COTIRE}") if (STORM_USE_COTIRE) # Include Cotire for PCH Generation @@ -338,19 +422,9 @@ if (STORM_USE_COTIRE) #cotire(storm-performance-tests) endif() -if (ENABLE_GUROBI) - message (STATUS "Linking in Gurobi.") - include_directories(${GUROBI_ROOT}/include) - link_directories(${GUROBI_ROOT}/lib) - target_link_libraries(storm "gurobi55") - target_link_libraries(storm-functional-tests "gurobi55") - target_link_libraries(storm-performance-tests "gurobi55") - add_definitions(-DHAVE_GUROBI) -endif(ENABLE_GUROBI) - # Link against libc++abi if requested. May be needed to build on Linux systems using clang. if (LINK_LIBCXXABI) - message (STATUS "Linking against libc++abi.") + message (STATUS "StoRM - Linking against libc++abi.") target_link_libraries(storm "c++abi") target_link_libraries(storm-functional-tests "c++abi") target_link_libraries(storm-performance-tests "c++abi") @@ -361,27 +435,11 @@ if(DOXYGEN_FOUND) set(CMAKE_DOXYGEN_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/doc") string(REGEX REPLACE ";" " " CMAKE_DOXYGEN_INPUT_LIST "${PROJECT_SOURCE_DIR}/src") - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/doc/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/doc/Doxyfile.in" "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile" @ONLY) - add_custom_target(doc ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile COMMENT "Generating API documentation with Doxygen" VERBATIM) + add_custom_target(doc ${DOXYGEN_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile" DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile" COMMENT "Generating API documentation with Doxygen" VERBATIM) endif(DOXYGEN_FOUND) -if (THREADS_FOUND) - include_directories(${THREADS_INCLUDE_DIRS}) - target_link_libraries(storm ${CMAKE_THREAD_LIBS_INIT}) - if (STORM_USE_COTIRE) - target_link_libraries(storm_unity ${CMAKE_THREAD_LIBS_INIT}) - endif(STORM_USE_COTIRE) - target_link_libraries(storm-functional-tests ${CMAKE_THREAD_LIBS_INIT}) - target_link_libraries(storm-performance-tests ${CMAKE_THREAD_LIBS_INIT}) -endif(THREADS_FOUND) - -# Configure a header file to pass some of the CMake settings to the source code -configure_file ( - "${PROJECT_SOURCE_DIR}/storm-config.h.in" - "${PROJECT_BINARY_DIR}/storm-config.h" -) - add_custom_target(memcheck valgrind --leak-check=full --show-reachable=yes ${PROJECT_BINARY_DIR}/storm -v --fix-deadlocks ${PROJECT_SOURCE_DIR}/examples/dtmc/crowds/crowds5_5.tra examples/dtmc/crowds/crowds5_5.lab DEPENDS storm) add_custom_target(memcheck-functional-tests valgrind --leak-check=full --show-reachable=yes ${PROJECT_BINARY_DIR}/storm-functional-tests -v --fix-deadlocks DEPENDS storm-functional-tests) add_custom_target(memcheck-performance-tests valgrind --leak-check=full --show-reachable=yes ${PROJECT_BINARY_DIR}/storm-performance-tests -v --fix-deadlocks DEPENDS storm-performance-tests) diff --git a/resources/3rdparty/gmm-4.2/include/gmm/gmm_blas.h b/resources/3rdparty/gmm-4.2/include/gmm/gmm_blas.h index 841a06e75..1ec21bb10 100644 --- a/resources/3rdparty/gmm-4.2/include/gmm/gmm_blas.h +++ b/resources/3rdparty/gmm-4.2/include/gmm/gmm_blas.h @@ -38,7 +38,11 @@ #ifndef GMM_BLAS_H__ #define GMM_BLAS_H__ -#ifdef STORM_USE_TBB +// This Version of GMM was modified for StoRM +// To detect whether the usage of TBB is possible, this include is neccessary +#include "storm-config.h" + +#ifdef STORM_HAVE_INTELTBB # include // This fixes a potential dependency ordering problem between GMM and TBB # include "tbb/tbb.h" # include @@ -401,7 +405,7 @@ namespace gmm { return res; } -#ifdef STORM_USE_TBB +#ifdef STORM_HAVE_INTELTBB /* Official Intel Hint on blocked_range vs. linear iterators: http://software.intel.com/en-us/forums/topic/289505 */ @@ -465,7 +469,8 @@ public: vect_sp_sparse_(IT1 it, IT1 ite, const V &v) { typename strongest_numeric_type::value_type, typename linalg_traits::value_type>::T res(0); -#if defined(STORM_USE_TBB) && defined(STORM_USE_TBB_FOR_INNER) +#if defined(STORM_HAVE_INTELTBB) && defined(STORM_USE_TBB_FOR_INNER) + // This is almost never an efficent way, only if there are _many_ states tbbHelper_vect_sp_sparse tbbHelper(&v); tbb::parallel_reduce(forward_range(it, ite), tbbHelper); res = tbbHelper.my_sum; @@ -1749,7 +1754,7 @@ public: } } -#ifdef STORM_USE_TBB +#ifdef STORM_HAVE_INTELTBB /* Official Intel Hint on blocked_range vs. linear iterators: http://software.intel.com/en-us/forums/topic/289505 */ @@ -1820,7 +1825,7 @@ public: typename linalg_traits::iterator it=vect_begin(l3), ite=vect_end(l3); typename linalg_traits::const_row_iterator itr = mat_row_const_begin(l1); -#ifdef STORM_USE_TBB +#ifdef STORM_HAVE_INTELTBB tbb::parallel_for(forward_range_mult::iterator, typename linalg_traits::const_row_iterator>(it, ite, itr), tbbHelper_mult_by_row(&l2)); #else for (; it != ite; ++it, ++itr) diff --git a/src/adapters/SymbolicModelAdapter.h b/src/adapters/SymbolicModelAdapter.h index 90067c5ee..be0729729 100644 --- a/src/adapters/SymbolicModelAdapter.h +++ b/src/adapters/SymbolicModelAdapter.h @@ -206,7 +206,7 @@ private: *systemAdd *= *reachableStates; std::cout << "got " << systemAdd->nodeCount() << " nodes" << std::endl; - std::cout << "and " << systemAdd->CountMinterm(allRowDecisionDiagramVariables.size() + allColumnDecisionDiagramVariables.size()) << std::endl; + std::cout << "and " << systemAdd->CountMinterm(static_cast(allRowDecisionDiagramVariables.size() + allColumnDecisionDiagramVariables.size())) << std::endl; } void createIdentityDecisionDiagrams(storm::ir::Program const& program) { diff --git a/src/counterexamples/MinimalLabelSetGenerator.h b/src/counterexamples/MinimalLabelSetGenerator.h index f9f35411f..6ba3cff90 100644 --- a/src/counterexamples/MinimalLabelSetGenerator.h +++ b/src/counterexamples/MinimalLabelSetGenerator.h @@ -8,7 +8,10 @@ #ifndef STORM_COUNTEREXAMPLES_MINIMALCOMMANDSETGENERATOR_MDP_H_ #define STORM_COUNTEREXAMPLES_MINIMALCOMMANDSETGENERATOR_MDP_H_ -#ifdef HAVE_GUROBI +// To detect whether the usage of Gurobi is possible, this include is neccessary +#include "storm-config.h" + +#ifdef STORM_HAVE_GUROBI extern "C" { #include "gurobi_c.h" @@ -30,7 +33,7 @@ namespace storm { */ template class MinimalLabelSetGenerator { -#ifdef HAVE_GUROBI +#ifdef STORM_HAVE_GUROBI private: /*! * A helper class that provides the functionality to compute a hash value for pairs of state indices. @@ -1052,7 +1055,7 @@ namespace storm { public: static std::unordered_set getMinimalLabelSet(storm::models::Mdp const& labeledMdp, storm::storage::BitVector const& phiStates, storm::storage::BitVector const& psiStates, T probabilityThreshold, bool checkThresholdFeasible = false, bool includeSchedulerCuts = false) { -#ifdef HAVE_GUROBI +#ifdef STORM_HAVE_GUROBI // (0) Check whether the MDP is indeed labeled. if (!labeledMdp.hasChoiceLabels()) { throw storm::exceptions::InvalidArgumentException() << "Minimal label set generation is impossible for unlabeled model."; @@ -1099,7 +1102,7 @@ namespace storm { // (5) Return result. return usedLabelSet; #else - throw storm::exceptions::NotImplementedException() << "This functionality is unavailable if StoRM is compiled without support for Gurobi."; + throw storm::exceptions::NotImplementedException() << "This functionality is unavailable since StoRM has been compiled without support for Gurobi."; #endif } diff --git a/src/storage/SparseMatrix.h b/src/storage/SparseMatrix.h index 96478ff68..d53a5ab97 100644 --- a/src/storage/SparseMatrix.h +++ b/src/storage/SparseMatrix.h @@ -9,7 +9,10 @@ #include #include -#ifdef STORM_USE_TBB +// To detect whether the usage of TBB is possible, this include is neccessary +#include "storm-config.h" + +#ifdef STORM_HAVE_INTELTBB # include // This fixes a potential dependency ordering problem between GMM and TBB # include "tbb/tbb.h" # include @@ -43,6 +46,12 @@ namespace storm { namespace storm { namespace storage { +#ifdef STORM_HAVE_INTELTBB +// Forward declaration of the TBB Helper class +template +class tbbHelper_MatrixRowVectorScalarProduct; +#endif + /*! * A sparse matrix class with a constant number of non-zero entries. * NOTE: Addressing *is* zero-based, so the valid range for getValue and addNextValue is 0..(rows - 1) where rows is the @@ -63,6 +72,14 @@ public: friend class storm::adapters::EigenAdapter; friend class storm::adapters::StormAdapter; +#ifdef STORM_HAVE_INTELTBB + /*! + * Declare the helper class for TBB as friend + */ + template + friend class tbbHelper_MatrixRowVectorScalarProduct; +#endif + /*! * If we only want to iterate over the columns or values of the non-zero entries of * a row, we can simply iterate over the array (part) itself. @@ -1136,7 +1153,7 @@ public: * vector. */ void multiplyWithVector(std::vector const& vector, std::vector& result) const { -#ifdef STORM_USE_TBB +#ifdef STORM_HAVE_INTELTBB tbb::parallel_for(tbb::blocked_range(0, result.size()), tbbHelper_MatrixRowVectorScalarProduct, std::vector, T>(this, &vector, &result)); #else ConstRowIterator rowIt = this->begin(); @@ -1512,7 +1529,7 @@ private: } }; -#ifdef STORM_USE_TBB +#ifdef STORM_HAVE_INTELTBB /*! * This function is a helper for Parallel Execution of the multipliyWithVector functionality. * It uses Intels TBB parallel_for paradigm to split up the row/vector multiplication and summation @@ -1528,24 +1545,19 @@ private: tbbHelper_MatrixRowVectorScalarProduct(M const* matrixA, V const* vectorX, V * resultVector) : matrixA(matrixA), vectorX(vectorX), resultVector(resultVector) {} void operator() (const tbb::blocked_range& r) const { - // Initialize two iterators that - M::ConstRowsIterator matrixElementIt(*matrixA, r.begin()); - M::ConstRowsIterator matrixElementIte(*matrixA, r.begin()); - - for (uint_fast64_t rowNumber = r.begin(); rowNumber != r.end(); ++rowNumber) { - // Put the past-the-end iterator to the correct position. - matrixElementIte.moveToNextRow(); - + for (uint_fast64_t row = r.begin(); row <= r.end(); ++row) { + uint_fast64_t index = matrixA->rowIndications.at(row); + uint_fast64_t indexEnd = matrixA->rowIndications.at(row + 1); + // Initialize the result to be 0. T element = storm::utility::constGetZero(); - - // Perform the scalar product. - for (; matrixElementIt != matrixElementIte; ++matrixElementIt) { - element += matrixElementIt.value() * vectorX->at(matrixElementIt.column()); - } + for (; index != indexEnd; ++index) { + element += matrixA->valueStorage.at(index) * vectorX->at(matrixA->columnIndications.at(index)); + } + // Write back to the result Vector - resultVector->at(rowNumber) = element; + resultVector->at(row) = element; } } diff --git a/src/utility/CuddUtility.cpp b/src/utility/CuddUtility.cpp index ab3d85797..a6c1dc8ac 100644 --- a/src/utility/CuddUtility.cpp +++ b/src/utility/CuddUtility.cpp @@ -51,7 +51,7 @@ ADD* CuddUtility::getConstantEncoding(uint_fast64_t constant, std::vector // Determine whether the new ADD will be rooted by the first variable or its complement. ADD initialNode; - if ((constant & (1 << (variables.size() - 1))) != 0) { + if ((constant & (1ull << (variables.size() - 1))) != 0) { initialNode = *variables[0]; } else { initialNode = ~(*variables[0]); @@ -60,7 +60,7 @@ ADD* CuddUtility::getConstantEncoding(uint_fast64_t constant, std::vector // Add (i.e. multiply) the other variables as well according to whether their bit is set or not. for (uint_fast64_t i = 1; i < variables.size(); ++i) { - if ((constant & (1 << (variables.size() - i - 1))) != 0) { + if ((constant & (1ull << (variables.size() - i - 1))) != 0) { *result *= *variables[i]; } else { *result *= ~(*variables[i]); @@ -81,7 +81,7 @@ void CuddUtility::setValueAtIndex(ADD* add, uint_fast64_t index, std::vector fromVariables, st std::vector permutation; permutation.resize(totalNumberOfVariables); for (uint_fast64_t i = 0; i < totalNumberOfVariables; ++i) { - permutation[i] = i; + permutation[i] = static_cast(i); } for (uint_fast64_t i = 0; i < fromVariables.size(); ++i) { permutation[fromVariables[i]->NodeReadIndex()] = toVariables[i]->NodeReadIndex(); diff --git a/src/utility/graph.h b/src/utility/graph.h index ac06176fa..b084ddfa3 100644 --- a/src/utility/graph.h +++ b/src/utility/graph.h @@ -793,7 +793,7 @@ namespace storm { LOG4CPLUS_INFO(logger, "Performing Dijkstra search."); - const uint_fast64_t noPredecessorValue = storm::utility::constGetZero(); + const uint_fast64_t noPredecessorValue = storm::utility::constGetZero(); std::vector probabilities(model.getNumberOfStates(), storm::utility::constGetZero()); std::vector predecessors(model.getNumberOfStates(), noPredecessorValue); diff --git a/storm-config.h.in b/storm-config.h.in index 0b1cd5134..8f7a83312 100644 --- a/storm-config.h.in +++ b/storm-config.h.in @@ -1,5 +1,26 @@ -// the configured options and settings for STORM +/* + * StoRM - Build-in Options + * + * This file is parsed by CMake during makefile generation + * It contains information such as the base path to the test/example data + */ + +#ifndef STORM_GENERATED_STORMCONFIG_H_ +#define STORM_GENERATED_STORMCONFIG_H_ + +// Version Information #define STORM_CPP_VERSION_MAJOR @STORM_CPP_VERSION_MAJOR@ #define STORM_CPP_VERSION_MINOR @STORM_CPP_VERSION_MINOR@ +// The path of the sources from which StoRM will be/was build #define STORM_CPP_BASE_PATH "@PROJECT_SOURCE_DIR@" +// The path used in the functional and performance tests to load the supplied example files #define STORM_CPP_TESTS_BASE_PATH "@STORM_CPP_TESTS_BASE_PATH@" + +// Whether Gurobi is available and to be used (define/undef) +#@STORM_CPP_GUROBI_DEF@ STORM_HAVE_GUROBI + +// Whether Intel Threading Building Blocks are available and to be used (define/undef) +#@STORM_CPP_INTELTBB_DEF@ STORM_HAVE_INTELTBB + + +#endif // STORM_GENERATED_STORMCONFIG_H_ \ No newline at end of file