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.

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

Update igraph and fix build #589

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 cmake/detect_dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -291,5 +291,5 @@ else()
find_package(igraph REQUIRED)
get_target_property(igraph_LIBRARIES igraph::igraph IMPORTED_LOCATION_RELEASE)
get_target_property(igraph_INCLUDES igraph::igraph INTERFACE_INCLUDE_DIRECTORIES)
message(STATUS "Using system's igraph from ${igraph_LIBRARIES}")
message(STATUS "Using system igraph ${igraph_VERSION} from ${igraph_LIBRARIES}")
endif()
6 changes: 3 additions & 3 deletions deps/igraph-0.10.x/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set (IGRAPH_INCLUDES "${IGRAPH_INSTALL}/include")
set (IGRAPH_LIB "${IGRAPH_INSTALL}/lib/libigraph${CMAKE_SHARED_LIBRARY_SUFFIX}")
set (HAVE_IGRAPH TRUE)

message("-- IGRAPH version 0.10.12 : download and build libigraph${CMAKE_SHARED_LIBRARY_SUFFIX} in ${IGRAPH_BASE}")
message("-- IGRAPH version 0.10.13 : download and build libigraph${CMAKE_SHARED_LIBRARY_SUFFIX} in ${IGRAPH_BASE}")

#Avoid warning about DOWNLOAD_EXTRACT_TIMESTAMP in CMake 3.24
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
Expand All @@ -17,9 +17,9 @@ endif()

ExternalProject_Add(igraph_0_10
PREFIX "${IGRAPH_INSTALL}"
URL "https://github.com/igraph/igraph/releases/download/0.10.12/igraph-0.10.12.tar.gz"
URL "https://github.com/igraph/igraph/releases/download/0.10.13/igraph-0.10.13.tar.gz"
SOURCE_DIR "${IGRAPH_DOWNLOAD}"
CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${IGRAPH_INSTALL}" "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" "-Wno-deprecated" "-DIGRAPH_VERSION=0.10.12"
CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${IGRAPH_INSTALL}" "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" "-Wno-deprecated"
BINARY_DIR "${IGRAPH_BUILD}"
PATCH_COMMAND echo "No patch for igraph-0.10.x required"
INSTALL_DIR "${IGRAPH_INSTALL}"
Expand Down
3 changes: 2 additions & 1 deletion include/hal_core/utilities/utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include "hal_core/defines.h"
#include "hal_core/utilities/result.h"

#include <algorithm>
#include <functional>
#include <set>
#include <sstream>
Expand Down Expand Up @@ -775,4 +776,4 @@ namespace hal
*/
CORE_API Result<u32> wrapped_stoul(const std::string& s, const u32 base = 10);
} // namespace utils
} // namespace hal
} // namespace hal
2 changes: 1 addition & 1 deletion plugins/genlib_writer/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
option(PL_GENLIB_WRITER "PL_GENLIB_WRITER" OFF)
option(PL_GENLIB_WRITER "PL_GENLIB_WRITER" ON)
if(PL_GENLIB_WRITER OR BUILD_ALL_PLUGINS)
file(GLOB_RECURSE GENLIB_WRITER_INC ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h)
file(GLOB_RECURSE GENLIB_WRITER_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
Expand Down
5 changes: 3 additions & 2 deletions plugins/graph_algorithm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ if(PL_GRAPH_ALGORITHM OR BUILD_ALL_PLUGINS)
LINK_LIBRARIES PUBLIC ${igraph_LIBRARIES}
)

add_dependencies(graph_algorithm igraph_0_10)

if(USE_VENDORED_IGRAPH)
add_dependencies(graph_algorithm igraph_0_10)
endif()
endif()
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ namespace hal

const u32 num_threads = std::min(config.m_max_thread_count, std::thread::hardware_concurrency() - 1);

log_info("module_identification", "running with {} threads and {} multithreading priority", num_threads, config.m_multithreading_priority);
log_info("module_identification", "running with {} threads and {} multithreading priority", num_threads, static_cast<std::size_t>(config.m_multithreading_priority));

auto stats = Statistics();

Expand Down Expand Up @@ -561,4 +561,4 @@ namespace hal
return execute_on_structural_candidates(base_to_structural_candidates, config);
}
} // namespace module_identification
} // namespace hal
} // namespace hal
2 changes: 1 addition & 1 deletion plugins/resynthesis/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
option(PL_RESYNTHESIS "PL_RESYNTHESIS" OFF)
option(PL_RESYNTHESIS "PL_RESYNTHESIS" ON)

if(PL_RESYNTHESIS OR BUILD_ALL_PLUGINS)

Expand Down
2 changes: 1 addition & 1 deletion plugins/simulator/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
option(PL_SIMULATOR "PL_SIMULATOR" OFF)
option(PL_SIMULATOR "PL_SIMULATOR" ON)
if(PL_SIMULATOR OR BUILD_ALL_PLUGINS)
include_directories(${CMAKE_CURRENT_SOURCE_DIR})

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
option(PL_NETLIST_SIMULATOR_CONTROLLER "PL_NETLIST_SIMULATOR_CONTROLLER" OFF)
option(PL_NETLIST_SIMULATOR_CONTROLLER "PL_NETLIST_SIMULATOR_CONTROLLER" ON)
if(PL_NETLIST_SIMULATOR_CONTROLLER OR PL_SIMULATOR OR BUILD_ALL_PLUGINS)

find_package(Qt5 COMPONENTS Core REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion plugins/z3_utils/src/simplification.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ namespace hal
return false;

default: {
log_error("z3_utils", "commutative check not implemeted for type {}!", t);
log_error("z3_utils", "commutative check not implemeted for type {}!", static_cast<std::size_t>(t));
return false;
}
}
Expand Down