Skip to content

Commit c688db4

Browse files
committed
Skip Dakota macOS dylib post-processing to avoid install hang
Dakota 6.24's install_macos_libs.py walks the whole install tree spawning otool/install_name_tool per dependency and no longer finishes within CI's time limit. The pass only makes Dakota's own install tree relocatable, which is redundant for Carolina because delocate-wheel already bundles the wheel. Patch the script to a no-op.
1 parent e17c293 commit c688db4

3 files changed

Lines changed: 16 additions & 0 deletions

File tree

.github/workflows/bundle_with_dakota_macos.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ jobs:
161161
cd dakota-${{ inputs.DAKOTA_VERSION }}-public-src-cli
162162
163163
patch -p1 < $CAROLINA_DIR/dakota_manylinux_install_files/CMakeLists_includes.patch
164+
patch -p1 < $CAROLINA_DIR/dakota_manylinux_install_files/install_macos_libs.patch
164165
165166
PYTHON_INCLUDE_DIR="$(python -c "from sysconfig import get_paths as gp; g=gp(); print(f\"{g['include']} \")")"
166167
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
--- a/cmake/install_macos_libs.py
2+
+++ b/cmake/install_macos_libs.py
3+
@@ -297,6 +297,11 @@
4+
if __name__ == '__main__':
5+
logging.basicConfig(filename='process_external_tpls.log', level=logging.DEBUG)
6+
7+
+ # Carolina: Dakota's macOS dylib post-processing does not scale to the
8+
+ # 6.24 install tree (multi-hour otool/install_name_tool walk) and is
9+
+ # redundant here -- delocate-wheel makes the Carolina wheel relocatable.
10+
+ sys.exit(0)
11+
+
12+
if len(sys.argv) == 2:
13+
os.chdir(sys.argv[1])
14+

script/build_boost_dakota.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ tar xf "$CACHE_DIR"/$dakota_file
116116
cd "dakota-${DAKOTA_VERSION}-public-src-cli"
117117

118118
patch -p1 < ../../../dakota_manylinux_install_files/CMakeLists_includes.patch
119+
patch -p1 < ../../../dakota_manylinux_install_files/install_macos_libs.patch
119120

120121
mkdir -p build
121122
cd build

0 commit comments

Comments
 (0)