Skip to content

Commit 850618b

Browse files
authored
Merge pull request #111 from agunashe/amd/dev/agunashe/5_7_hipVersion
SWDEV-411709 - default hip version to 5.7 and filename/path for .hipVersion
2 parents ecda567 + 1fd67c4 commit 850618b

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

amd/hipcc/bin/hipvars.pm

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use Cwd;
2626
use File::Basename;
2727

2828
$HIP_BASE_VERSION_MAJOR = "5";
29-
$HIP_BASE_VERSION_MINOR = "5";
29+
$HIP_BASE_VERSION_MINOR = "7";
3030
$HIP_BASE_VERSION_PATCH = "0";
3131

3232
#---
@@ -154,7 +154,11 @@ if ($HIP_COMPILER eq "clang") {
154154
#---
155155
# Read .hipVersion
156156
my %hipVersion = ();
157-
parse_config_file("$hipvars::HIP_PATH/bin/.hipVersion", \%hipVersion);
157+
if ($isWindows) {
158+
parse_config_file("$hipvars::HIP_PATH/bin/.hipVersion", \%hipVersion);
159+
} else {
160+
parse_config_file("$hipvars::HIP_PATH/share/hip/version", \%hipVersion);
161+
}
158162
$HIP_VERSION_MAJOR = $hipVersion{'HIP_VERSION_MAJOR'} // $HIP_BASE_VERSION_MAJOR;
159163
$HIP_VERSION_MINOR = $hipVersion{'HIP_VERSION_MINOR'} // $HIP_BASE_VERSION_MINOR;
160164
$HIP_VERSION_PATCH = $hipVersion{'HIP_VERSION_PATCH'} // $HIP_BASE_VERSION_PATCH;

0 commit comments

Comments
 (0)