Skip to content

Bump Dakota to 6.24, clean up dead code and CI#145

Open
larsevj wants to merge 6 commits into
mainfrom
misc_fixes
Open

Bump Dakota to 6.24, clean up dead code and CI#145
larsevj wants to merge 6 commits into
mainfrom
misc_fixes

Conversation

@larsevj

@larsevj larsevj commented Jun 11, 2026

Copy link
Copy Markdown
Contributor

Cleans up some unused patches and cpp files.
Bumps dakota to 6.24
Fixes token issue that prevented dependabot from working.

larsevj added 3 commits June 11, 2026 14:54
- Install perl-JSON-PP (new dakota_test.perl dependency in 6.24.0)
- Extract only Eigen3Config.cmake from the Dakota zip to avoid filling the macOS runner disk
- Install generated_ir_types.hpp (generated header 6.24.0 fails to install)
- Drop dakota_ir from the link list (static lib in libdakota_src, not installed)
@larsevj larsevj changed the title Misc fixes Bump Dakota to 6.24, clean up dead code and CI Jun 11, 2026
@larsevj larsevj self-assigned this Jun 11, 2026
@larsevj larsevj added this to SCOUT Jun 11, 2026
@larsevj larsevj moved this to Ready for Review in SCOUT Jun 11, 2026
@larsevj larsevj requested a review from Copilot June 11, 2026 13:05

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR updates Carolina’s Dakota integration to Dakota 6.24, removes unused/dead integration code/patches, and adjusts CI/build tooling to reflect the updated Dakota packaging and reusable-workflow secret handling.

Changes:

  • Bump Dakota version references to 6.24.0 across build scripts and GitHub workflows.
  • Remove unused legacy Python interface implementation files and obsolete patch files; streamline Boost/Python binding compatibility code.
  • Adjust build/packaging scripts (e.g., drop non-installed dakota_ir from link list; ensure build deps include perl-JSON-PP; minor Python 3 cleanups and CI unzip behavior tweak).

Reviewed changes

Copilot reviewed 15 out of 15 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
tests/test_dakota.py Removes Py2-era __future__ import and modernizes super() usage.
src/python_interface.hpp Removes unused legacy NREL Python interface header.
src/python_interface.cpp Removes unused legacy NREL Python interface implementation.
src/dakota.py Python 3 cleanup (no (object) bases) and f-string formatting in input writing / errors.
src/dakota_python_binding.cpp Removes old Boost/Python compatibility branches; keeps NumPy initialization call.
setup.py Drops dakota_ir from Dakota-exported libraries since it’s not installed separately.
script/build_boost_dakota.sh Bumps Dakota version to 6.24.0.
dakota_manylinux_install_files/workdirhelper_boost_filesystem.patch Removes obsolete patch file.
dakota_manylinux_install_files/DakotaFindPython.cmake.patch Removes obsolete patch file.
dakota_manylinux_install_files/CMakeLists_includes.patch Installs additional Dakota headers/includes (Eigen, nlohmann, generated IR types).
dakota_manylinux_install_files/build_deps_gha.sh Adds perl-JSON-PP to build dependencies.
dakota_manylinux_install_files/build_deps_docker.sh Bumps Dakota version and adds perl-JSON-PP dependency.
.github/workflows/bundle_with_dakota_macos.yml Removes required secret from workflow_call; narrows unzip to only extract Eigen config file.
.github/workflows/bundle_with_dakota_linux.yml Removes required secret from workflow_call.
.github/workflows/bundle_with_dakota_caller.yml Bumps Dakota version to 6.24.0 for CI builds.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread src/dakota_python_binding.cpp
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Ready for Review

Development

Successfully merging this pull request may close these issues.

2 participants