From e8af258a48db5314f38b962c715b8dcead8b979c Mon Sep 17 00:00:00 2001 From: Werner Van Geit Date: Tue, 10 Dec 2024 16:23:51 +0100 Subject: [PATCH] Switch boost version --- pyproject.toml | 8 ++++---- src_patches/find_python.patch | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 src_patches/find_python.patch diff --git a/pyproject.toml b/pyproject.toml index 4d67d3e..2a4ae8a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -41,8 +41,8 @@ repair-wheel-command = "auditwheel repair -w {dest_dir} {wheel} && ./scripts/fix build-verbosity = 2 [tool.cibuildwheel.environment] -BOOST_LIBRARYDIR = "/usr/lib64/boost169" -BOOST_INCLUDEDIR = "/usr/include/boost169" +BOOST_LIBRARYDIR = "/usr/lib64/boost1.78" +BOOST_INCLUDEDIR = "/usr/include/boost1.78" [tool.cibuildwheel.linux] environment-pass = [ @@ -54,7 +54,7 @@ before-all = [ "yum install -y epel-release yum-utils", "yum-config-manager --enable epel", "yum makecache --refresh", - "yum install -y lapack-devel boost169-devel blas-devel hdf5-devel zip unzip ccache wget", + "yum install -y lapack-devel boost1.78-devel blas-devel hdf5-devel zip unzip ccache wget", "wget --progress=dot:mega https://github.com/mozilla/sccache/releases/download/v0.8.1/sccache-v0.8.1-x86_64-unknown-linux-musl.tar.gz", "tar xzvf sccache-v0.8.1-x86_64-unknown-linux-musl.tar.gz", "cp sccache-v0.8.1-x86_64-unknown-linux-musl/sccache /usr/bin/", @@ -79,4 +79,4 @@ BUILD_SHARED_LIBS = "OFF" CMAKE_POSITION_INDEPENDENT_CODE = "ON" [tool.pytest.ini_options] -addopts = "--ignore=dakota/" +addopts = "--ignore=dakota/" diff --git a/src_patches/find_python.patch b/src_patches/find_python.patch new file mode 100644 index 0000000..414eae8 --- /dev/null +++ b/src_patches/find_python.patch @@ -0,0 +1,22 @@ +diff --git a/cmake/DakotaFindPython.cmake b/cmake/DakotaFindPython.cmake +index 9ffa1ca..8edd853 100644 +--- a/cmake/DakotaFindPython.cmake ++++ b/cmake/DakotaFindPython.cmake +@@ -8,7 +8,7 @@ macro(dakota_find_python) + if(DAKOTA_PYTHON_DIRECT_INTERFACE OR DAKOTA_PYTHON_SURROGATES OR + DAKOTA_PYTHON_WRAPPER OR DAKOTA_PYBIND11) + message(STATUS "Dakota enabling Python (Development) for direct or surrogate interface") +- list(APPEND dakota_python_components Development) ++ list(APPEND dakota_python_components Development.module) + + if (DAKOTA_PYTHON_DIRECT_INTERFACE_LEGACY) + if (DAKOTA_PYTHON_DIRECT_INTERFACE) +@@ -31,7 +31,7 @@ macro(dakota_find_python) + + endif() + +- find_package(Python REQUIRED ${dakota_python_components}) ++ # find_package(Python REQUIRED ${dakota_python_components}) + + if (DAKOTA_PYTHON_DIRECT_INTERFACE_NUMPY) + message(STATUS "NumPy version ${Python_NumPy_VERSION} found at ${Python_NumPy_INCLUDE_DIRS}")