Skip to content

Commit 2e30055

Browse files
Fix LoadHIP handling of environment variable paths on Windows. (#3991)
Co-authored-by: Nicolas Hug <[email protected]>
1 parent 46b5dc6 commit 2e30055

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

cmake/LoadHIP.cmake

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if(NOT DEFINED ENV{ROCM_PATH})
77
set(ROCM_PATH C:/opt/rocm)
88
endif()
99
else()
10-
set(ROCM_PATH $ENV{ROCM_PATH})
10+
file(TO_CMAKE_PATH "$ENV{ROCM_PATH}" ROCM_PATH)
1111
endif()
1212

1313
# HIP_PATH
@@ -18,7 +18,7 @@ if(NOT DEFINED ENV{HIP_PATH})
1818
set(HIP_PATH ${ROCM_PATH})
1919
endif()
2020
else()
21-
set(HIP_PATH $ENV{HIP_PATH})
21+
file(TO_CMAKE_PATH "$ENV{HIP_PATH}" HIP_PATH)
2222
endif()
2323

2424
if(NOT EXISTS ${HIP_PATH})
@@ -29,47 +29,47 @@ endif()
2929
if(NOT DEFINED ENV{HCC_PATH})
3030
set(HCC_PATH ${ROCM_PATH}/hcc)
3131
else()
32-
set(HCC_PATH $ENV{HCC_PATH})
32+
file(TO_CMAKE_PATH "$ENV{HCC_PATH}" HCC_PATH)
3333
endif()
3434

3535
# HSA_PATH
3636
if(NOT DEFINED ENV{HSA_PATH})
3737
set(HSA_PATH ${ROCM_PATH}/hsa)
3838
else()
39-
set(HSA_PATH $ENV{HSA_PATH})
39+
file(TO_CMAKE_PATH "$ENV{HSA_PATH}" HSA_PATH)
4040
endif()
4141

4242
# ROCBLAS_PATH
4343
if(NOT DEFINED ENV{ROCBLAS_PATH})
4444
set(ROCBLAS_PATH ${ROCM_PATH}/rocblas)
4545
else()
46-
set(ROCBLAS_PATH $ENV{ROCBLAS_PATH})
46+
file(TO_CMAKE_PATH "$ENV{ROCBLAS_PATH}" ROCBLAS_PATH)
4747
endif()
4848

4949
# ROCFFT_PATH
5050
if(NOT DEFINED ENV{ROCFFT_PATH})
5151
set(ROCFFT_PATH ${ROCM_PATH}/rocfft)
5252
else()
53-
set(ROCFFT_PATH $ENV{ROCFFT_PATH})
53+
file(TO_CMAKE_PATH "$ENV{ROCFFT_PATH}" ROCFFT_PATH)
5454
endif()
5555

5656
# HIPFFT_PATH
5757
if(NOT DEFINED ENV{HIPFFT_PATH})
5858
set(HIPFFT_PATH ${ROCM_PATH}/hipfft)
5959
else()
60-
set(HIPFFT_PATH $ENV{HIPFFT_PATH})
60+
file(TO_CMAKE_PATH "$ENV{HIPFFT_PATH}" HIPFFT_PATH)
6161
endif()
6262

6363
# HIPSPARSE_PATH
6464
if(NOT DEFINED ENV{HIPSPARSE_PATH})
6565
set(HIPSPARSE_PATH ${ROCM_PATH}/hipsparse)
6666
else()
67-
set(HIPSPARSE_PATH $ENV{HIPSPARSE_PATH})
67+
file(TO_CMAKE_PATH "$ENV{HIPSPARSE_PATH}" HIPSPARSE_PATH)
6868
endif()
6969

7070
# THRUST_PATH
7171
if(DEFINED ENV{THRUST_PATH})
72-
set(THRUST_PATH $ENV{THRUST_PATH})
72+
file(TO_CMAKE_PATH "$ENV{THRUST_PATH}" THRUST_PATH)
7373
else()
7474
set(THRUST_PATH ${ROCM_PATH}/include)
7575
endif()
@@ -78,56 +78,56 @@ endif()
7878
if(NOT DEFINED ENV{HIPRAND_PATH})
7979
set(HIPRAND_PATH ${ROCM_PATH}/hiprand)
8080
else()
81-
set(HIPRAND_PATH $ENV{HIPRAND_PATH})
81+
file(TO_CMAKE_PATH "$ENV{HIPRAND_PATH}" HIPRAND_PATH)
8282
endif()
8383

8484
# ROCRAND_PATH
8585
if(NOT DEFINED ENV{ROCRAND_PATH})
8686
set(ROCRAND_PATH ${ROCM_PATH}/rocrand)
8787
else()
88-
set(ROCRAND_PATH $ENV{ROCRAND_PATH})
88+
file(TO_CMAKE_PATH "$ENV{ROCRAND_PATH}" ROCRAND_PATH)
8989
endif()
9090

9191
# MIOPEN_PATH
9292
if(NOT DEFINED ENV{MIOPEN_PATH})
9393
set(MIOPEN_PATH ${ROCM_PATH}/miopen)
9494
else()
95-
set(MIOPEN_PATH $ENV{MIOPEN_PATH})
95+
file(TO_CMAKE_PATH "$ENV{MIOPEN_PATH}" MIOPEN_PATH)
9696
endif()
9797

9898
# RCCL_PATH
9999
if(NOT DEFINED ENV{RCCL_PATH})
100100
set(RCCL_PATH ${ROCM_PATH}/rccl)
101101
else()
102-
set(RCCL_PATH $ENV{RCCL_PATH})
102+
file(TO_CMAKE_PATH "$ENV{RCCL_PATH}" RCCL_PATH)
103103
endif()
104104

105105
# ROCPRIM_PATH
106106
if(NOT DEFINED ENV{ROCPRIM_PATH})
107107
set(ROCPRIM_PATH ${ROCM_PATH}/rocprim)
108108
else()
109-
set(ROCPRIM_PATH $ENV{ROCPRIM_PATH})
109+
file(TO_CMAKE_PATH "$ENV{ROCPRIM_PATH}" ROCPRIM_PATH)
110110
endif()
111111

112112
# HIPCUB_PATH
113113
if(NOT DEFINED ENV{HIPCUB_PATH})
114114
set(HIPCUB_PATH ${ROCM_PATH}/hipcub)
115115
else()
116-
set(HIPCUB_PATH $ENV{HIPCUB_PATH})
116+
file(TO_CMAKE_PATH "$ENV{HIPCUB_PATH}" HIPCUB_PATH)
117117
endif()
118118

119119
# ROCTHRUST_PATH
120120
if(NOT DEFINED ENV{ROCTHRUST_PATH})
121121
set(ROCTHRUST_PATH ${ROCM_PATH}/rocthrust)
122122
else()
123-
set(ROCTHRUST_PATH $ENV{ROCTHRUST_PATH})
123+
file(TO_CMAKE_PATH "$ENV{ROCTHRUST_PATH}" ROCTHRUST_PATH)
124124
endif()
125125

126126
# ROCTRACER_PATH
127127
if(NOT DEFINED ENV{ROCTRACER_PATH})
128128
set(ROCTRACER_PATH ${ROCM_PATH}/roctracer)
129129
else()
130-
set(ROCTRACER_PATH $ENV{ROCTRACER_PATH})
130+
file(TO_CMAKE_PATH "$ENV{ROCTRACER_PATH}" ROCTRACER_PATH)
131131
endif()
132132

133133
if(NOT DEFINED ENV{PYTORCH_ROCM_ARCH})

0 commit comments

Comments
 (0)