Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revised number of build jobs for resources #585

Merged
merged 1 commit into from
Jul 24, 2024
Merged

Revised number of build jobs for resources #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion resources/3rdparty/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ if (STORM_SHIPPED_CARL)
SOURCE_DIR ${STORM_3RDPARTY_BINARY_DIR}/carl
CONFIGURE_COMMAND ""
BUILD_IN_SOURCE 1
BUILD_COMMAND make lib_carl
BUILD_COMMAND make lib_carl -j${STORM_RESOURCES_BUILD_JOBCOUNT}
INSTALL_COMMAND make install -j${STORM_RESOURCES_BUILD_JOBCOUNT}
LOG_BUILD ON
LOG_INSTALL ON
Expand Down
5 changes: 3 additions & 2 deletions resources/3rdparty/include_cudd.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@ ExternalProject_Add(
PREFIX ${STORM_3RDPARTY_BINARY_DIR}/cudd-3.0.0
PATCH_COMMAND ${CMAKE_COMMAND} -E env ${CUDD_AUTOTOOLS_LOCATIONS} ${AUTORECONF}
CONFIGURE_COMMAND ${STORM_3RDPARTY_SOURCE_DIR}/cudd-3.0.0/configure --enable-shared --enable-obj --with-pic=yes --prefix=${STORM_3RDPARTY_BINARY_DIR}/cudd-3.0.0 --libdir=${CUDD_LIB_DIR} CC=${CMAKE_C_COMPILER} CXX=${CUDD_CXX_COMPILER} ${CUDD_INCLUDE_FLAGS}
BUILD_COMMAND make ${STORM_CUDD_FLAGS} ${CUDD_AUTOTOOLS_LOCATIONS}
INSTALL_COMMAND make install -j${STORM_RESOURCES_BUILD_JOBCOUNT} ${CUDD_AUTOTOOLS_LOCATIONS}
# Multi-threaded compilation could lead to compile issues
BUILD_COMMAND make -j1 ${STORM_CUDD_FLAGS} ${CUDD_AUTOTOOLS_LOCATIONS}
INSTALL_COMMAND make install -j1 ${CUDD_AUTOTOOLS_LOCATIONS}
BUILD_IN_SOURCE 0
LOG_CONFIGURE ON
LOG_BUILD ON
Expand Down
4 changes: 2 additions & 2 deletions resources/3rdparty/include_glpk.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ else()
PREFIX ${STORM_3RDPARTY_BINARY_DIR}/glpk-5.0
SOURCE_DIR ${STORM_3RDPARTY_SOURCE_DIR}/glpk-5.0
CONFIGURE_COMMAND ${STORM_3RDPARTY_SOURCE_DIR}/glpk-5.0/configure --prefix=${STORM_3RDPARTY_BINARY_DIR}/glpk-5.0 --libdir=${GLPK_LIB_DIR} CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} ${GLPK_INCLUDE_FLAGS}
BUILD_COMMAND make "CFLAGS=-O3 -w"
BUILD_COMMAND make "CFLAGS=-O3 -w" -j${STORM_RESOURCES_BUILD_JOBCOUNT}
INSTALL_COMMAND make install -j${STORM_RESOURCES_BUILD_JOBCOUNT}
BUILD_IN_SOURCE 0
LOG_CONFIGURE ON
Expand All @@ -35,4 +35,4 @@ set(STORM_HAVE_GLPK ON)
message (STATUS "Storm - Linking with glpk ${GLPK_VERSION_STRING}")

add_imported_library(glpk SHARED ${GLPK_LIBRARIES} ${GLPK_INCLUDE_DIR})
list(APPEND STORM_DEP_TARGETS glpk_SHARED)
list(APPEND STORM_DEP_TARGETS glpk_SHARED)
2 changes: 1 addition & 1 deletion resources/3rdparty/include_spot.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ if(STORM_USE_SPOT_SHIPPED AND NOT STORM_HAVE_SPOT)
PREFIX ${STORM_3RDPARTY_BINARY_DIR}/spot
CONFIGURE_COMMAND ${STORM_3RDPARTY_BINARY_DIR}/spot_src/configure --prefix=${STORM_3RDPARTY_BINARY_DIR}/spot --disable-python
BUILD_COMMAND make -j${STORM_RESOURCES_BUILD_JOBCOUNT}
INSTALL_COMMAND make install
INSTALL_COMMAND make install -j${STORM_RESOURCES_BUILD_JOBCOUNT}
LOG_CONFIGURE ON
LOG_BUILD ON
LOG_INSTALL ON
Expand Down
Loading