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

Fixes crayftn + hip #608

Merged
merged 4 commits into from
Nov 18, 2022
Merged

Fixes crayftn + hip #608

merged 4 commits into from
Nov 18, 2022

Conversation

white238
Copy link
Member

@white238 white238 commented Nov 18, 2022

Fixes #607

Fix originally from Burl Hall! Thanks Burl!

@white238 white238 added flags Issues related to setting compiler flags hip Related to AMD hip fortran Related to Fortran User Request Related to user requests labels Nov 18, 2022
@@ -3,14 +3,11 @@
#
# SPDX-License-Identifier: (BSD-3-Clause)

# Author: Noel Chalmers @ Advanced Micro Devices, Inc.
Copy link
Member Author

Choose a reason for hiding this comment

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

This no longer bears any relevance to what he originally wrote. This should have been removed when @davidbeckingsale completely rewrote this logic.

Comment on lines 69 to 76
if(CMAKE_Fortran_COMPILER_ID STREQUAL "Cray")
set(_blt_hip_compile_flags "$<$<COMPILE_LANGUAGE:CXX>:SHELL:--rocm-path=${ROCM_PATH}>")
else()
set(_blt_hip_compile_flags "--rocm-path=${ROCM_PATH}")
endif()

blt_import_library(NAME blt_hip
COMPILE_FLAGS ${_blt_hip_compile_flags}
Copy link
Member Author

Choose a reason for hiding this comment

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

This is the fix. The rest is just consistent formatting.

Copy link
Member

Choose a reason for hiding this comment

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

It turns out that while crayftn < 15 doesn't support the flag crayftn 15 does and we probably actually want to use it when we can?

Copy link
Member Author

Choose a reason for hiding this comment

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

added a check for this too. Thanks @tomstitt !

Copy link
Member

@kennyweiss kennyweiss left a comment

Choose a reason for hiding this comment

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

Thanks @white238 !

Copy link
Member

@rhornung67 rhornung67 left a comment

Choose a reason for hiding this comment

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

Thanks @white238

@white238 white238 merged commit 8c22999 into develop Nov 18, 2022
@white238 white238 deleted the bugfix/white238/crayftn_hip branch November 18, 2022 18:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
flags Issues related to setting compiler flags fortran Related to Fortran hip Related to AMD hip User Request Related to user requests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Compiler error with blt_hip target using cray fortran compiler
6 participants