Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
gaoqiong
MIGraphX
Commits
4f2c6410
Commit
4f2c6410
authored
Feb 01, 2023
by
Alan Turner
Browse files
Fix cmake bug
parent
5aac7a8c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
17 deletions
+8
-17
src/targets/gpu/CMakeLists.txt
src/targets/gpu/CMakeLists.txt
+7
-16
src/targets/gpu/kernels/include/migraphx/kernels/index.hpp
src/targets/gpu/kernels/include/migraphx/kernels/index.hpp
+1
-1
No files found.
src/targets/gpu/CMakeLists.txt
View file @
4f2c6410
...
@@ -201,27 +201,13 @@ if(MIGRAPHX_USE_HIPRTC)
...
@@ -201,27 +201,13 @@ if(MIGRAPHX_USE_HIPRTC)
message
(
STATUS
"MIGraphX is using hipRTC"
)
message
(
STATUS
"MIGraphX is using hipRTC"
)
target_compile_definitions
(
migraphx_gpu PRIVATE -DMIGRAPHX_USE_HIPRTC=1
)
target_compile_definitions
(
migraphx_gpu PRIVATE -DMIGRAPHX_USE_HIPRTC=1
)
else
()
else
()
# Get flags needed to compile hip
include
(
TargetFlags
)
target_flags
(
HIP_COMPILER_FLAGS hip::device
)
# Remove cuda arch flags
string
(
REGEX REPLACE --cuda-gpu-arch=[a-z0-9]+
""
HIP_COMPILER_FLAGS
"
${
HIP_COMPILER_FLAGS
}
"
)
string
(
REGEX REPLACE --offload-arch=[a-z0-9:+-]+
""
HIP_COMPILER_FLAGS
"
${
HIP_COMPILER_FLAGS
}
"
)
# Skip library paths since hip will incorrectly treat it as a source file
string
(
APPEND HIP_COMPILER_FLAGS
" "
)
# Add ck includes
find_path
(
CK_INCLUDE_PATH ck/ck.hpp
)
message
(
STATUS
"CK path:
${
CK_INCLUDE_PATH
}
"
)
string
(
APPEND HIP_COMPILER_FLAGS
" -isystem
${
CK_INCLUDE_PATH
}
"
)
foreach
(
_unused RANGE 2
)
string
(
REGEX REPLACE
" /[^ ]+
\\
.(a|so) "
" "
HIP_COMPILER_FLAGS
"
${
HIP_COMPILER_FLAGS
}
"
)
endforeach
()
message
(
STATUS
"MIGraphX is using HIP Clang"
)
message
(
STATUS
"MIGraphX is using HIP Clang"
)
# Get flags needed to compile hip
# Get flags needed to compile hip
include
(
TargetFlags
)
include
(
TargetFlags
)
message
(
STATUS
"HIP COMPILER FLAGS:
${
HIP_COMPILER_FLAGS
}
"
)
target_flags
(
HIP_COMPILER_FLAGS hip::device
)
target_flags
(
HIP_COMPILER_FLAGS hip::device
)
message
(
STATUS
"HIP COMPILER FLAGS:
${
HIP_COMPILER_FLAGS
}
"
)
# Remove cuda arch flags
# Remove cuda arch flags
string
(
REGEX REPLACE --cuda-gpu-arch=[a-z0-9]+
""
HIP_COMPILER_FLAGS
"
${
HIP_COMPILER_FLAGS
}
"
)
string
(
REGEX REPLACE --cuda-gpu-arch=[a-z0-9]+
""
HIP_COMPILER_FLAGS
"
${
HIP_COMPILER_FLAGS
}
"
)
string
(
REGEX REPLACE --offload-arch=[a-z0-9:+-]+
""
HIP_COMPILER_FLAGS
"
${
HIP_COMPILER_FLAGS
}
"
)
string
(
REGEX REPLACE --offload-arch=[a-z0-9:+-]+
""
HIP_COMPILER_FLAGS
"
${
HIP_COMPILER_FLAGS
}
"
)
...
@@ -233,6 +219,11 @@ endforeach()
...
@@ -233,6 +219,11 @@ endforeach()
string
(
REGEX REPLACE
" /[^ ]+
\\
.(a|so) "
" "
HIP_COMPILER_FLAGS
"
${
HIP_COMPILER_FLAGS
}
"
)
string
(
REGEX REPLACE
" /[^ ]+
\\
.(a|so) "
" "
HIP_COMPILER_FLAGS
"
${
HIP_COMPILER_FLAGS
}
"
)
endforeach
()
endforeach
()
# Add ck includes
find_path
(
CK_INCLUDE_PATH ck/ck.hpp
)
message
(
STATUS
"CK path:
${
CK_INCLUDE_PATH
}
"
)
string
(
APPEND HIP_COMPILER_FLAGS
" -isystem
${
CK_INCLUDE_PATH
}
"
)
message
(
STATUS
"Hip compiler flags:
${
HIP_COMPILER_FLAGS
}
"
)
message
(
STATUS
"Hip compiler flags:
${
HIP_COMPILER_FLAGS
}
"
)
target_compile_definitions
(
migraphx_gpu PRIVATE
target_compile_definitions
(
migraphx_gpu PRIVATE
"-DMIGRAPHX_HIP_COMPILER=
${
CMAKE_CXX_COMPILER
}
"
"-DMIGRAPHX_HIP_COMPILER=
${
CMAKE_CXX_COMPILER
}
"
...
...
src/targets/gpu/kernels/include/migraphx/kernels/index.hpp
View file @
4f2c6410
...
@@ -237,7 +237,7 @@ struct index
...
@@ -237,7 +237,7 @@ struct index
template
<
class
F
,
class
N
>
template
<
class
F
,
class
N
>
__device__
void
group_stride
(
N
n
,
F
f
)
const
__device__
void
group_stride
(
N
n
,
F
f
)
const
{
{
for_stride
(
group
,
n
,
ngroup
(),
f
);
for_stride
<
false
>
(
group
,
n
,
ngroup
(),
f
);
}
}
};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment