Skip to content

Commit

Permalink
Switch boost version
Browse files Browse the repository at this point in the history
  • Loading branch information
wvangeit committed Dec 10, 2024
1 parent 5e22f9c commit e8af258
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand All @@ -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/",
Expand All @@ -79,4 +79,4 @@ BUILD_SHARED_LIBS = "OFF"
CMAKE_POSITION_INDEPENDENT_CODE = "ON"

[tool.pytest.ini_options]
addopts = "--ignore=dakota/"
addopts = "--ignore=dakota/"
22 changes: 22 additions & 0 deletions src_patches/find_python.patch
Original file line number Diff line number Diff line change
@@ -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}")

0 comments on commit e8af258

Please sign in to comment.