Skip to content
Merged
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 CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
execute_process(COMMAND ${CMAKE_CXX_COMPILER} --version COMMAND head -n1 OUTPUT_VARIABLE ALPS_COMPILER_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
message(STATUS "Compiler version: ${ALPS_COMPILER_VERSION}")

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -DBOOST_NO_AUTO_PTR -DBOOST_FILESYSTEM_NO_CXX20_ATOMIC_REF -DBOOST_TIMER_ENABLE_DEPRECATED")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -DBOOST_NO_AUTO_PTR= -DBOOST_FILESYSTEM_NO_CXX20_ATOMIC_REF -DBOOST_TIMER_ENABLE_DEPRECATED -DBOOST_ALLOW_DEPRECATED_HEADERS -DBOOST_BIND_GLOBAL_PLACEHOLDERS")


# set convenient warning flags for clang
Expand Down
7 changes: 7 additions & 0 deletions src/alps/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,13 @@ endif()

add_library(alps ${ALPS_SOURCES})

if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
# The legacy "lagged_fibonacci607" generator uses a 48-bit word with a 32-bit
# result type, so max() truncates by design; keep it for stream compatibility.
set_source_files_properties(random/rngfactory.C PROPERTIES
COMPILE_OPTIONS "-Wno-constant-conversion")
endif()

find_package(HDF5)
if (Boost_FOUND)
# link to ${Boost_LIBRARIES} when precompiled Boost libraries found
Expand Down
1 change: 1 addition & 0 deletions src/alps/mcbase.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ namespace alps {
#endif

mcbase(parameters_type const & parms, std::size_t seed_offset = 0);
virtual ~mcbase() {}

virtual void update() = 0;
virtual void measure() = 0;
Expand Down
3 changes: 2 additions & 1 deletion src/alps/scheduler/measurement_operators.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ class EigenvectorMeasurements

template <class LatticeModel>
EigenvectorMeasurements(LatticeModel const&);

virtual ~EigenvectorMeasurements() {}

void write_xml_one_vector(oxstream& out, const boost::filesystem::path&, std::size_t j) const;
XMLTag handle_tag(std::istream& infile, const XMLTag& intag);

Expand Down
10 changes: 10 additions & 0 deletions src/boost/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -307,9 +307,19 @@ endif (BUILD_BOOST_MPI AND BUILD_BOOST_PYTHON AND Boost_ROOT_DIR)
if (NOT Boost_FOUND)
add_library(${ALPS_BOOST_LIBRARY_NAME} ${BOOST_SOURCES})
target_link_libraries(${ALPS_BOOST_LIBRARY_NAME} ${BOOST_LINK_LIBS})
# Boost.Filesystem's directory.cpp uses readdir_r, deprecated by recent
# macOS SDKs and glibc
target_compile_options(${ALPS_BOOST_LIBRARY_NAME} PRIVATE -Wno-deprecated-declarations)
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
# Boost.MPI's environment::abort() is declared noreturn but relies on
# MPI_Abort not returning, which the compiler cannot verify
target_compile_options(${ALPS_BOOST_LIBRARY_NAME} PRIVATE -Wno-invalid-noreturn)
endif()
if(BUILD_BOOST_PYTHON)
add_library(${ALPS_BOOST_PYTHON_LIBRARY_NAME} ${BOOST_PYTHON_SOURCES})
target_link_libraries(${ALPS_BOOST_PYTHON_LIBRARY_NAME} ${BOOST_PYTHON_LINK_LIBS})
# Boost.Python <= 1.87 uses _PyUnicode_AsString, deprecated since Python 3.14
target_compile_options(${ALPS_BOOST_PYTHON_LIBRARY_NAME} PRIVATE -Wno-deprecated-declarations)
endif()
# Boost.Test
if(BUILD_BOOST_TEST)
Expand Down
Loading