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.

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

WIP: Feature/probinso/hipcc support #596

Open
wants to merge 70 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
7563ed8
recursive and regex
chapman39 Aug 3, 2022
0518043
gitignore workspace
chapman39 Aug 3, 2022
efb0907
desc
chapman39 Aug 3, 2022
19311d8
regex for properties
chapman39 Aug 9, 2022
0ce11e4
remove duplicates of entire tree
chapman39 Aug 10, 2022
6b79fce
remove enter
chapman39 Aug 10, 2022
ed3eae6
lowercase a
chapman39 Aug 10, 2022
8c938db
Merge remote-tracking branch 'origin/develop' into feature/chapman39/…
chapman39 Aug 10, 2022
44bdd7a
Update cmake/BLTMacros.cmake
chapman39 Aug 22, 2022
6a37c24
if regex undefined, don't use MATCHES
chapman39 Aug 22, 2022
c7fe954
tlist doesn't need a particular name
chapman39 Aug 22, 2022
9c3c6d2
Merge branch 'develop' into feature/chapman39/print_target_properties…
chapman39 Aug 23, 2022
56b745d
docs and simpler print
chapman39 Aug 23, 2022
76b7512
Merge branch 'feature/chapman39/print_target_properties_recursive' of…
chapman39 Aug 23, 2022
f6b9ac5
adding tioga
chapman39 Aug 23, 2022
4620b70
Merge branch 'develop' into feature/chapman39/replace_corona_with_tioga
chapman39 Aug 23, 2022
e86f979
remove corona and add tioga to ci
chapman39 Aug 23, 2022
fd157dd
Merge branch 'feature/chapman39/replace_corona_with_tioga' of github.…
chapman39 Aug 23, 2022
9d977f5
no --test-serial
chapman39 Aug 23, 2022
b6cb3a4
fix errors
chapman39 Aug 23, 2022
0e79e46
no build_on_tioga
chapman39 Aug 24, 2022
e950724
typo
chapman39 Aug 24, 2022
f697144
patch from ALE3D
robinson96 Aug 30, 2022
1e96e23
cleanup
robinson96 Aug 30, 2022
8cbd0d3
using flux
chapman39 Aug 30, 2022
7f57b0f
update flux cmds
chapman39 Sep 1, 2022
4141f19
fixed host-config path
chapman39 Sep 13, 2022
7b3b13d
Merge pull request #595 from LLNL/feature/chapman39/replace_corona_wi…
chapman39 Sep 13, 2022
6ae5448
Merge branch 'develop' into feature/chapman39/print_target_properties…
chapman39 Sep 13, 2022
3d08ef3
PROPERTY_VALUE_REGEX, prints blt_reg depends_on
chapman39 Sep 14, 2022
62261a0
typo
chapman39 Sep 16, 2022
0fcafac
updated docs, added examples, fixed bugs
chapman39 Sep 16, 2022
78ef818
Merge branch 'feature/chapman39/print_target_properties_recursive' of…
chapman39 Sep 16, 2022
d3c40a1
rename recursive function
chapman39 Sep 16, 2022
f314801
infinite loop edge case fix
chapman39 Sep 19, 2022
fd80b90
explain new print options
chapman39 Sep 21, 2022
376099c
apostrophe
chapman39 Sep 21, 2022
d808991
code style
chapman39 Sep 21, 2022
e31b6de
wording
chapman39 Sep 22, 2022
1f0463a
new macos imagename
chapman39 Sep 23, 2022
401f967
Update RELEASE-NOTES.md
chapman39 Sep 26, 2022
1bfd1d1
Add BLT_CMAKE_IMPLICIT_LINK_LIBRARIES_EXCLUDE variable
bmhan12 Sep 28, 2022
16fd27d
more fixes, switch to using BLT_BULD_HIP_WITH_HIPCC
robinson96 Sep 29, 2022
f2dbca5
clarity/ cleanup suggestions
chapman39 Sep 29, 2022
3a32077
Merge branch 'feature/chapman39/print_target_properties_recursive' of…
chapman39 Sep 29, 2022
74d1cd9
wording
chapman39 Sep 29, 2022
0142ece
wording for print target macro desc
chapman39 Sep 29, 2022
5aa089a
re-add 'property' to target type
chapman39 Oct 3, 2022
197eacc
Merge pull request #590 from LLNL/feature/chapman39/print_target_prop…
white238 Oct 4, 2022
6bd8250
add axom try_compile macro to blt
kennyweiss Oct 4, 2022
8b6a419
turn on CMP0067 even though it only works on some CMake versions
white238 Oct 4, 2022
7901598
documentation and release notes for blt_check_code_compiles
white238 Oct 4, 2022
a3e380e
add clarifying note
white238 Oct 4, 2022
a221641
add comment about bracket arguments
white238 Oct 4, 2022
517ccd4
Merge pull request #600 from LLNL/feature/white238/add_try_compile
white238 Oct 4, 2022
17890f4
Merge branch 'develop' into feature/han12/implicit_libs_exclude
bmhan12 Oct 4, 2022
43f0b41
Merge pull request #598 from LLNL/feature/han12/implicit_libs_exclude
white238 Oct 5, 2022
ee5d430
bump version
white238 Oct 5, 2022
84fe0d1
Merge pull request #601 from LLNL/v0.5.2-rc
white238 Oct 5, 2022
97ea54d
Merge pull request #602 from LLNL/main
white238 Oct 5, 2022
9cc55a2
Guard compiler flag against crayftn
BurlMHall Nov 18, 2022
5fbc647
release notes
white238 Nov 18, 2022
2b6676b
consistent formatting
white238 Nov 18, 2022
a624eb8
allow starting at 15.0.0
white238 Nov 18, 2022
8c22999
Merge pull request #608 from LLNL/bugfix/white238/crayftn_hip
white238 Nov 18, 2022
98ee862
Merge branch 'feature/probinso/hipcc_support' into ale3d
robinson96 Dec 8, 2022
8d39e04
merge blt changes from ale3d develop to new submodule.
robinson96 Jan 11, 2023
bf2d30b
whitespace cleanup.
robinson96 Jan 11, 2023
c92ef98
reduce differences from pristine.
robinson96 Jan 11, 2023
896f04f
fix logic in setting BLT_ADD_ROCM_PATH_COMPILER_FLAG
robinson96 Jan 14, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.code-workspace
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ stages:
include:
- local: .gitlab/build_quartz.yml
- local: .gitlab/build_lassen.yml
- local: .gitlab/build_corona.yml
- local: .gitlab/build_tioga.yml
51 changes: 0 additions & 51 deletions .gitlab/build_corona.yml

This file was deleted.

26 changes: 26 additions & 0 deletions .gitlab/build_tioga.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
####
# This is the shared configuration of jobs for tioga
.on_tioga:
tags:
- shell
- tioga
rules:
- if: '$CI_COMMIT_BRANCH =~ /_qnone/ || $ON_TIOGA == "OFF"' #run except if ...
when: never
- when: on_success

####
# Template
.src_build_on_tioga:
stage: build
variables:
ALLOC_COMMAND: "flux mini run -t10m -n1"
extends: [.build_script, .on_tioga]

####
# Build jobs
tioga-clang_14_0_0_hip:
variables:
HOST_CONFIG: "clang@14.0.0_hip.cmake"
extends: .src_build_on_tioga
allow_failure: true
21 changes: 19 additions & 2 deletions RELEASE-NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,24 @@ The project release numbers follow [Semantic Versioning](http://semver.org/spec/

## [Unreleased] - Release date yyyy-mm-dd

### Fixed
- Guard HIP compiler flag ``--rocm-path=/path/to/rocm`` against Crayftn compiler earlier than 15.0.0.

## [Version 0.5.2] - Release date 2022-10-05

### Added
- Added 'blt_convert_to_system_includes' macro to convert existing interface includes to system interface includes.
- Added `blt_convert_to_system_includes` macro to convert existing interface includes to system interface includes.
- `blt_check_code_compiles` which compiles a C++ code snippet and returns the result.
- Added variable ``BLT_CMAKE_IMPLICIT_LINK_LIBRARIES_EXCLUDE`` for filtering
link libraries implicitly added by CMake. See the following example host-config:
``host-configs/llnl/blueos_3_ppc64le_ib_p9/clang@upstream_nvcc_xlf.cmake``

### Changed
- Added three extra options to `blt_print_target_properties` macro to print properties of
target's children as well as limit the properties printed with regular expressions:
- CHILDREN (true/ false) whether or not you want to print the target's children's properties as well (recursively)
- PROPERTY_NAME_REGEX (regular expression string) reduce which properties to print by name
- PROPERTY_VALUE_REGEX (regular expression string) reduce which properties to print by value

## [Version 0.5.1] - Release date 2022-04-22

Expand Down Expand Up @@ -255,7 +271,8 @@ The project release numbers follow [Semantic Versioning](http://semver.org/spec/



[Unreleased]: https://github.com/LLNL/blt/compare/v0.5.1...develop
[Unreleased]: https://github.com/LLNL/blt/compare/v0.5.2...develop
[Version 0.5.2]: https://github.com/LLNL/blt/compare/v0.5.1...v0.5.2
[Version 0.5.1]: https://github.com/LLNL/blt/compare/v0.5.0...v0.5.1
[Version 0.5.0]: https://github.com/LLNL/blt/compare/v0.4.1...v0.5.0
[Version 0.4.1]: https://github.com/LLNL/blt/compare/v0.4.0...v0.4.1
Expand Down
13 changes: 11 additions & 2 deletions SetupBLT.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: (BSD-3-Clause)

if (NOT BLT_LOADED)
set(BLT_VERSION "0.5.1" CACHE STRING "")
set(BLT_VERSION "0.5.2" CACHE STRING "")
mark_as_advanced(BLT_VERSION)
message(STATUS "BLT Version: ${BLT_VERSION}")

Expand Down Expand Up @@ -66,6 +66,13 @@ if (NOT BLT_LOADED)
cmake_policy(SET CMP0057 NEW)
endif()

# Make `check_cxx_source_compiles` honor `CMAKE_CXX_STANDARD`
# NOTE: This only works on a few CMake versions even though it was
# added in CMake 3.14. (for example, 3.20.2, 3.21.1, and 3.23.1 did not work)
if(POLICY CMP0067)
cmake_policy(SET CMP0067 NEW)
endif()

# Policy to use <PackageName>_ROOT variable in find_<Package> commands
# Policy added in 3.12+
if(POLICY CMP0074)
Expand Down Expand Up @@ -187,7 +194,9 @@ if (NOT BLT_LOADED)
# File extension lists used to filter sources based on languages for code checks
# and filtering Fortran sources out of cuda/hip source lists
# Note: this filtering is case-insensitive
set(BLT_C_FILE_EXTS ".cpp" ".hpp" ".cxx" ".hxx" ".c" ".h" ".cc" ".hh" ".inl" ".cu" ".cuh"
set(BLT_C_FILE_EXTS ".c" ".h"
CACHE STRING "List of known file extensions used for C/CXX sources")
Copy link
Member

Choose a reason for hiding this comment

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

Update the comment to say C rather than C/CXX. And the following comment should have CXX instead of C/CXX.

Copy link
Member

Choose a reason for hiding this comment

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

This will have pretty large user facing consequences and needs to be considered carefully.

Copy link
Member

Choose a reason for hiding this comment

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

set(BLT_CXX_FILE_EXTS ".cpp" ".hpp" ".cxx" ".hxx" ".cc" ".hh" ".inl" ".cu" ".cuh"
CACHE STRING "List of known file extensions used for C/CXX sources")
set(BLT_Fortran_FILE_EXTS ".f" ".f90"
CACHE STRING "List of known file extensions used for Fortran sources")
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ strategy:
MPI_DIR: '/usr'
CMAKE_FLAGS: '$(C_COMPILERS) $(MPI_FLAGS) -DENABLE_GTEST_DEATH_TESTS=OFF -DENABLE_OPENMP=ON'
osx_gcc:
VM_ImageName: 'macos-1015'
VM_ImageName: 'macos-12'
CMAKE_FLAGS: ''
windows:
VM_ImageName: 'windows-2019'
Expand Down