-
-
Notifications
You must be signed in to change notification settings - Fork 430
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.
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
Adding option for downloading Boost using CMake FetchContent #6424
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
dfe2bbe
Adding boost fetch option and corresponding workflow tests
vrnimje 2c7a068
Added copyright, and renamed file for linux workflow
vrnimje 2942a74
Set activation for macos workflows to pull_request only
vrnimje 23c1d49
Fixing order of steps in macOS workflow
vrnimje 0b69e30
Added variable for Boost variables, and made some misc changes
vrnimje 0287f31
Applying cmake-format to Boost setup file
vrnimje d0f3a32
Removing left-out endif() statement
vrnimje 8a8d6ac
Adding description for fetch option
vrnimje 505853d
Modified commands to build boost using HPX_CXX_STANDARD, and made mis…
vrnimje ecc252e
Changing variable names for consistency
vrnimje 437f365
Renaming variables to be self-explanatory
vrnimje File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
# Copyright (c) 2024 Vedant Nimje | ||
# | ||
# SPDX-License-Identifier: BSL-1.0 | ||
# Distributed under the Boost Software License, Version 1.0. (See accompanying | ||
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) | ||
|
||
name: Linux CI (Debug) with Boost Fetch | ||
|
||
on: [pull_request] | ||
|
||
jobs: | ||
build: | ||
runs-on: ubuntu-latest | ||
container: stellargroup/build_env:14 | ||
|
||
steps: | ||
- uses: actions/checkout@v4 | ||
- name: Configure | ||
shell: bash | ||
run: | | ||
cmake \ | ||
. \ | ||
-Bbuild \ | ||
-GNinja \ | ||
-DCMAKE_BUILD_TYPE=Debug \ | ||
-DHPX_WITH_MALLOC=system \ | ||
-DHPX_WITH_FETCH_ASIO=ON \ | ||
-DHPX_WITH_FETCH_BOOST=ON \ | ||
-DHPX_WITH_EXAMPLES=ON \ | ||
-DHPX_WITH_TESTS=ON \ | ||
-DHPX_WITH_TESTS_MAX_THREADS_PER_LOCALITY=2 \ | ||
-DHPX_WITH_CHECK_MODULE_DEPENDENCIES=On | ||
- name: Build | ||
shell: bash | ||
run: | | ||
cmake --build build --target all | ||
cmake --build build --target examples | ||
- name: Test | ||
shell: bash | ||
run: | | ||
cd build | ||
ctest \ | ||
--output-on-failure \ | ||
--tests-regex tests.examples \ | ||
--exclude-regex tests.examples.transpose.transpose_block_numa |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
# Copyright (c) 2024 Vedant Nimje | ||
# | ||
# SPDX-License-Identifier: BSL-1.0 | ||
# Distributed under the Boost Software License, Version 1.0. (See accompanying | ||
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) | ||
|
||
name: macOS CI (Debug) with Boost Fetch | ||
|
||
on: [pull_request] | ||
|
||
jobs: | ||
build: | ||
runs-on: macos-latest | ||
|
||
steps: | ||
- uses: actions/checkout@v4 | ||
- name: Install dependencies | ||
run: | | ||
# Workaround for https://github.com/actions/virtual-environments/issues/2322 | ||
rm -rf /usr/local/bin/2to3* | ||
rm -rf /usr/local/bin/idle3* | ||
rm -rf /usr/local/bin/pydoc3* | ||
rm -rf /usr/local/bin/python3* | ||
brew upgrade | ||
brew update && \ | ||
brew install --overwrite python-tk && \ | ||
brew install --overwrite hwloc gperftools ninja && \ | ||
brew upgrade cmake | ||
- name: Configure | ||
shell: bash | ||
run: | | ||
cmake \ | ||
-H. \ | ||
-Bbuild \ | ||
-GNinja \ | ||
-DCMAKE_BUILD_TYPE=Debug \ | ||
-DHPX_WITH_FETCH_ASIO=ON \ | ||
-DHPX_WITH_FETCH_BOOST=ON \ | ||
-DHPX_WITH_EXAMPLES=ON \ | ||
-DHPX_WITH_TESTS=ON \ | ||
-DHPX_WITH_TESTS_MAX_THREADS_PER_LOCALITY=2 \ | ||
-DHPX_WITH_CHECK_MODULE_DEPENDENCIES=On | ||
- name: Build | ||
shell: bash | ||
run: | | ||
cmake --build build --target all | ||
cmake --build build --target tests | ||
- name: Test | ||
shell: bash | ||
run: | | ||
cd build | ||
ctest --output-on-failure \ | ||
--exclude-regex \ | ||
"tests.examples.quickstart.1d_wave_equation|\ | ||
tests.examples.transpose.transpose_block_numa|\ | ||
tests.performance.local.wait_all_timings|\ | ||
tests.regressions.components.distributed.tcp.bulk_new_3054|\ | ||
tests.regressions.dynamic_counters_loaded_1508|\ | ||
tests.regressions.lcos.wait_all_hang_1946|\ | ||
tests.regressions.modules.async_combinators.wait_all_hang_1946|\ | ||
tests.regressions.modules.collectives.distributed.tcp.broadcast_apply|\ | ||
tests.regressions.modules.collectives.distributed.tcp.broadcast_unwrap_future_2885|\ | ||
tests.regressions.modules.collectives.distributed.tcp.remote_latch|\ | ||
tests.regressions.modules.compute_local.parallel_fill_4132|\ | ||
tests.regressions.util.distributed.tcp.zero_copy_parcels_1001_no_zero_copy_optimization|\ | ||
tests.regressions.modules.performance_counters.dynamic_counters_loaded_1508|\ | ||
tests.regressions.modules.performance_counters.statistics_2666|\ | ||
tests.unit.modules.runtime_components.distributed.tcp.migrate_component|\ | ||
tests.unit.modules.runtime_components.distributed.tcp.migrate_polymorphic_component|\ | ||
tests.unit.modules.algorithms.default_construct|\ | ||
tests.unit.modules.algorithms.destroy|\ | ||
tests.unit.modules.algorithms.foreach_executors|\ | ||
tests.unit.modules.algorithms.max_element|\ | ||
tests.unit.modules.algorithms.replace_copy_if|\ | ||
tests.unit.modules.compute_local.numa_allocator|\ | ||
tests.unit.modules.execution.standalone_thread_pool_executor|\ | ||
tests.unit.modules.resource_partitioner.used_pus|\ | ||
tests.unit.modules.segmented_algorithms.distributed.tcp.partitioned_vector|\ | ||
tests.unit.threads.distributed.tcp.thread_stacksize|\ | ||
tests.unit.topology.numa_allocator|\ | ||
tests.unit.modules.runtime_components.distributed.tcp.migrate_polymorphic_component" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
# Copyright (c) 2024 Vedant Nimje | ||
# | ||
# SPDX-License-Identifier: BSL-1.0 | ||
# Distributed under the Boost Software License, Version 1.0. (See accompanying | ||
# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) | ||
|
||
name: Windows CI (Debug, VS2022 toolset) with Boost Fetch | ||
|
||
on: [pull_request] | ||
|
||
jobs: | ||
build: | ||
runs-on: windows-latest | ||
|
||
steps: | ||
- uses: actions/checkout@v4 | ||
- uses: jwlawson/actions-setup-cmake@v1.14 | ||
with: | ||
cmake-version: '3.22.x' | ||
- name: Install dependencies | ||
run: | | ||
md C:\projects | ||
$client = new-object System.Net.WebClient | ||
$client.DownloadFile("https://rostam.cct.lsu.edu/download/builder/vcpkg-export-hpx-dependencies-2022.7z","C:\projects\vcpkg-export-hpx-dependencies.7z") | ||
7z x C:\projects\vcpkg-export-hpx-dependencies.7z -y -oC:\projects\vcpkg | ||
- name: Configure | ||
shell: bash | ||
run: | | ||
cmake . -Bbuild -G'Visual Studio 17 2022' \ | ||
-DCMAKE_BUILD_TYPE=Debug \ | ||
-DCMAKE_TOOLCHAIN_FILE='C:/projects/vcpkg/scripts/buildsystems/vcpkg.cmake' \ | ||
-DHPX_WITH_FETCH_BOOST=ON \ | ||
-DHPX_WITH_FETCH_ASIO=ON \ | ||
-DHPX_WITH_EXAMPLES=ON \ | ||
-DHPX_WITH_TESTS=ON \ | ||
-DHPX_WITH_TESTS_UNIT=ON \ | ||
-DHPX_WITH_DEPRECATION_WARNINGS=OFF \ | ||
-DHPX_WITH_TESTS_MAX_THREADS_PER_LOCALITY=2 \ | ||
-DHPX_COROUTINES_WITH_SWAP_CONTEXT_EMULATION=ON \ | ||
-DHPX_WITH_CHECK_MODULE_DEPENDENCIES=On | ||
- name: Build | ||
shell: bash | ||
run: | | ||
cmake --build build --config Debug \ | ||
--target ALL_BUILD \ | ||
-- -maxcpucount:2 -verbosity:minimal -nologo | ||
- name: Install | ||
shell: bash | ||
run: | | ||
cmake --install build --config Debug | ||
- name: Test | ||
run: | | ||
Set-Alias -Name grep -Value 'C:\Program Files\Git\usr\bin\grep.exe' | ||
Set-Alias -Name sed -Value 'C:\Program Files\Git\usr\bin\sed.exe' | ||
cd build | ||
ctest ` | ||
--output-on-failure ` | ||
--build-config Debug ` | ||
--tests-regex tests.examples ` | ||
--exclude-regex ` | ||
$(grep -v -e ^# -e ^$ D:/a/hpx/hpx/.github/workflows/tests.examples.targets | sed ':b;N;$!bb;s/\n/|/g') |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should all of the above go into a separate file
FindBoost.cmake
or similar (just for consistency reasons)? OTOH, this may conflict with the file with the same name in the CMake distribution...