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

Incline rocm 5.6.0 dev #53

Merged
merged 15 commits into from
Nov 3, 2023
Merged

Incline rocm 5.6.0 dev #53

merged 15 commits into from
Nov 3, 2023

Conversation

cameronrutherford
Copy link
Collaborator

No description provided.

Comment on lines 72 to 74
cc: amdclang
cxx: amdclang++
f77: /share/apps/gcc/8.4.0/bin/gfortran
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Here we pray amdclang is on the path @ryandanehy

@cameronrutherford cameronrutherford mentioned this pull request Nov 2, 2023
@cameronrutherford cameronrutherford added this to the Hackathon milestone Nov 3, 2023
@cameronrutherford cameronrutherford linked an issue Nov 3, 2023 that may be closed by this pull request
Comment on lines +9 to +11
unset ROCR_VISIBLE_DEVICES
unset CUDA_VISIBLE_DEVICES
unset GPU_DEVICE_ORDINAL
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Crazy that this is the fix we need for CI...

Comment on lines +21 to +32
- compiler:
spec: clang@16.0.0-rocm5.6.0
paths:
cc: amdclang
cxx: amdclang++
f77: /share/apps/gcc/8.4.0/bin/gfortran
fc: /share/apps/gcc/8.4.0/bin/gfortran
flags:
cxxflags: --gcc-toolchain=/share/apps/gcc/8.4.0
operating_system: centos7
target: x86_64
modules: []
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@ryandanehy this would be way easier if we just managed compilers as modules within spack like ORNL does...

Comment on lines +22 to +25
# TODO - This is a bit heavy-handed, but otherwise you get gcc which is not ideal
# - if(NOT CMAKE_C_COMPILER) wasn't working at top of file...
set(CMAKE_C_COMPILER @CMAKE_C_COMPILER@)
set(CMAKE_CXX_COMPILER @CMAKE_CXX_COMPILER@)
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Some extra eyes here would be appreciated...

# This is just an agly hack to make HIP build work
get_target_property(hip_includes hip::device INTERFACE_INCLUDE_DIRECTORIES)
message(STATUS "HIP include directories: ${hip_includes}")
include_directories(${hip_includes})
target_include_directories(ReSolve::resolve_hip INTERFACE $<BUILD_INTERFACE:${hip_includes}>)
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This way we don't propagate hard-coded install dir

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Although this is still a hack...

Comment on lines 37 to 41
LinSolverDirectCuSolverGLU.hpp
LinSolverDirectCuSolverRf.hpp
LinSolverDirectRocSolverRf.hpp
LinSolverDirectKLU.hpp
LinSolverIterativeFGMRES.hpp
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Maybe these should be installed based on the backend configured?

@@ -8,7 +8,6 @@
#include <rocblas/rocblas.h>
#include <rocsolver/rocsolver.h>
#include <hip/hip_runtime.h>
#include <roctracer/roctx.h>
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Spack installation of roctx sucks. There is no exported CMake configuration to consume. I was able to install the libs with packages roctracer-dev and roctracer-dev-api, but it wasn't immediately obvious of a good way to support this without an obvious hack

f77: /share/apps/gcc/8.4.0/bin/gfortran
fc: /share/apps/gcc/8.4.0/bin/gfortran
flags:
cxxflags: --gcc-toolchain=/share/apps/gcc/8.4.0
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

FYI spack refuses to function if there is a training slash here ( --gcc-toolchain=/share/apps/gcc/8.4.0/)

resolve/cpu/CMakeLists.txt Outdated Show resolved Hide resolved
resolve/cpu/CMakeLists.txt Outdated Show resolved Hide resolved
@pelesh pelesh merged commit 4b3bcf5 into hip-first-take-dev Nov 3, 2023
5 checks passed
@ryandanehy ryandanehy deleted the incline-rocm-5.6.0-dev branch November 27, 2023 21:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Use target commands to specify include directories in ReSolve
3 participants