Skip to content

merging fixes #25

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

Merged
egull merged 3 commits into from
May 11, 2025
Merged

merging fixes #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a9bafef
matching wrong if/else and introducing policy handling for CMP0135
egull May 9, 2025
5b1bf37
Update build.yml
egull May 9, 2025
023a844
Update pyproject.toml
egull May 11, 2025
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
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ jobs:
- name: Install dependencies
run: |
brew install gcc python@${{ matrix.plat.py_version }}
python${{ matrix.plat.py_version }} -m pip install --upgrade pip --break-system-packages
# pip already exists, pip install fails
# python${{ matrix.plat.py_version }} -m pip install --upgrade pip --break-system-packages
pip${{ matrix.plat.py_version }} install numpy==1.26.4 scipy==1.13.0 --break-system-packages
brew install openmpi hdf5
wget https://archives.boost.io/release/1.${{ matrix.plat.boost_version }}.0/source/boost_1_${{ matrix.plat.boost_version }}_0.tar.gz
Expand Down
22 changes: 11 additions & 11 deletions applications/dmrg/tebd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@ if(LAPACK_FOUND AND ALPS_BUILD_FORTRAN)
endforeach(_hdf5_def)
set_target_properties(tebd PROPERTIES COMPILE_DEFINITIONS "${ALPS_TEBD_DEFINITIONS}")
endif(HDF5_DEFINITIONS)
if(ALPS_PYTHON_WHEEL)
install(TARGETS tebd RUNTIME DESTINATION pyalps/bin COMPONENT applications)
if(APPLE)
set_target_properties(tebd PROPERTIES INSTALL_RPATH "@loader_path/../lib" )
else(APPLE)
set_target_properties(tebd PROPERTIES INSTALL_RPATH "$ORIGIN/../lib" )
endif(APPLE)
else()
install(TARGETS tebd RUNTIME DESTINATION bin COMPONENT applications)
endif()
if(ALPS_PYTHON_WHEEL)
install(TARGETS tebd RUNTIME DESTINATION pyalps/bin COMPONENT applications)
if(APPLE)
set_target_properties(tebd PROPERTIES INSTALL_RPATH "@loader_path/../lib" )
else(APPLE)
set_target_properties(tebd PROPERTIES INSTALL_RPATH "$ORIGIN/../lib" )
endif(APPLE)
else()
install(TARGETS tebd RUNTIME DESTINATION bin COMPONENT applications)
endif()
else(LAPACK_FOUND AND ALPS_BUILD_FORTRAN)
message(STATUS "tebd will not be built")
endif(LAPACK_FOUND AND ALPS_BUILD_FORTRAN AND HDF5_STATIC_LIBRARIES)
endif(LAPACK_FOUND AND ALPS_BUILD_FORTRAN)
5 changes: 5 additions & 0 deletions config/FindBoostForALPS.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ if (NOT Boost_SRC_DIR)

include(FetchContent)

# Avoid warning about DOWNLOAD_EXTRACT_TIMESTAMP in CMake 3.24:
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
cmake_policy(SET CMP0135 NEW)
endif()

FetchContent_Declare(
boost_src
URL https://archives.boost.io/release/1.87.0/source/boost_1_87_0.tar.gz
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ authors = [
]
license = {text = "MIT License"}

dependencies = ["numpy<2.1", "scipy"]
dependencies = ["numpy", "scipy"]

description = "Python Applications and Libraries for Physics Simulations"
readme = "README-py.md"
Expand Down
5 changes: 3 additions & 2 deletions src/alps/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,8 @@ if(NOT WIN32 AND NOT APPLE AND NOT ALPS_PYTHON_WHEEL)
PROPERTIES
SOVERSION "${ALPS_VERSION_MAJOR}"
VERSION "${ALPS_VERSION_MAJOR}.${ALPS_VERSION_MINOR}.${ALPS_VERSION_PATCH}" )
endif(NOT WIN32 AND NOT APPLE)
endif(NOT WIN32 AND NOT APPLE AND NOT ALPS_PYTHON_WHEEL)


#boost librt linking
if(NOT WIN32 AND NOT APPLE)
Expand Down Expand Up @@ -255,4 +256,4 @@ else ()
ARCHIVE DESTINATION pyalps/lib
LIBRARY DESTINATION pyalps/lib
RUNTIME DESTINATION pyalps/bin)
endif()
endif()
Loading