Skip to content
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

Propose update Dakota 6.20 #110

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Propose update Dakota 6.20 #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
384b858
Test building dakota 6.21.0
andreas-el Dec 20, 2024
37dc622
Print ubuntu build
andreas-el Dec 20, 2024
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
6 changes: 5 additions & 1 deletion .github/workflows/bundle_with_dakota_caller.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ env:
ERT_SHOW_BACKTRACE: 1
NO_PROJECT_RES: 1
BOOST_VERSION: 1.84.0
DAKOTA_VERSION: 6.19.0
DAKOTA_VERSION: 6.21.0
INSTALL_DIR: local
NEEDS_REBUILD: true

Expand All @@ -20,6 +20,10 @@ on:
type: boolean
default: false

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

jobs:
build-settings:
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/bundle_with_dakota_linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ jobs:
path: ./deps_build

- name: Build Boost & Dakota
timeout-minutes: 75
if: steps.cache-package-check.outputs.cache-hit != 'true'
uses: docker://quay.io/pypa/manylinux2014_x86_64
env:
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/bundle_with_dakota_macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ jobs:
python -m pip install numpy==1.26.4

- name: Build needed boost libraries
timeout-minutes: 30
if: steps.cache-package.outputs.cache-hit != 'true'
run: |
python --version
Expand All @@ -110,9 +111,12 @@ jobs:
python_bin_include_lib=" using python : $python_version : $(python -c "from sysconfig import get_paths as gp; g=gp(); print(f\"$(which python) : {g['include']} : {g['stdlib']} ;\")")"
sed -i '' "s|.*using python.*|$python_bin_include_lib|" project-config.jam
cd /tmp/build/boost_${BOOST_VERSION_UNDERSCORES}
./b2 install -j4 -a cxxflags="-std=c++17" --prefix=${GITHUB_WORKSPACE}/${INSTALL_DIR}

ncpu=$(sysctl -n hw.ncpu)
./b2 install -j"$ncpu" -a cxxflags="-std=c++17" --prefix=${GITHUB_WORKSPACE}/${INSTALL_DIR}

- name: Build dakota
timeout-minutes: 30
if: steps.cache-package.outputs.cache-hit != 'true'
run: |
python --version
Expand Down Expand Up @@ -173,7 +177,8 @@ jobs:
-DCMAKE_INSTALL_PREFIX="${GITHUB_WORKSPACE}/${INSTALL_DIR}" \
..

make -j4 install
ncpu=$(sysctl -n hw.ncpu)
make -j"$ncpu" install

- name: Package built boost and dakota
if: steps.cache-package.outputs.cache-hit != 'true'
Expand Down
4 changes: 2 additions & 2 deletions dakota_manylinux_install_files/build_deps_gha.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ $($cmake_command &> /github/workspace/trace/dakota_bootstrap.log)

echo "# make --debug=b -j8 install" >> /github/workspace/trace/env
echo "Building Dakota ..."
make --debug=b -j8 install &> /github/workspace/trace/dakota_install.log

#make --debug=b -j8 install &> /github/workspace/trace/dakota_install.log
make --debug=b -j8 install

DEPS_BUILD=/github/workspace/deps_build

Expand Down
Loading