AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SWDEV-372006 - Removed HSA_PATH variable from hipconfig.pl (#3120)

Browse Source 
HSA_PATH is not required in hipcc and removed from hipvars and hipcc.pl as part of SWDEV-345870.
The incomplete removal is causing build failure in pytorch due to invalid hip version
Removing HSA_PATH from hipconfig.pl, so that hipconfig will provide the hip version without any warning

Depends-On: Ia461cb4da2c0e0967703033f5c2c79b67732f5b5
Change-Id: I8f18b27f40f4080b68a936450ba6e092f997ec47
This commit is contained in:
ROCm CI Service Account
2022-12-20 09:35:27 +05:30
committed by GitHub
parent 0c443d1201
commit e1bbdf5750
1 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/hipconfig.pl
+3 -19
View File
@@ -46,7 +46,6 @@ $CUDA_PATH = $hipvars::CUDA_PATH;
$HIP_PATH = $hipvars::HIP_PATH;
$ROCM_PATH = $hipvars::ROCM_PATH;
$HIP_VERSION = $hipvars::HIP_VERSION;
$HSA_PATH = $hipvars::HSA_PATH;
Getopt::Long::Configure ( qw{bundling no_ignore_case});
GetOptions(
@@ -81,7 +80,7 @@ if ($HIP_COMPILER eq "clang") {
if($isWindows) {
$CPP_CONFIG .= " -I\"$HIP_PATH_INCLUDE\" -I\"$HIP_CLANG_INCLUDE\"";
} else {
$CPP_CONFIG .= " -I$HIP_PATH_INCLUDE -I$HIP_CLANG_INCLUDE -I$HSA_PATH/include";
$CPP_CONFIG .= " -I$HIP_PATH_INCLUDE -I$HIP_CLANG_INCLUDE ";
}
}
if ($HIP_PLATFORM eq "nvidia") {
@@ -162,9 +161,6 @@ if (!$printed or $p_full) {
if ($HIP_COMPILER eq "clang")
{
print "== hip-clang\n";
if (not $isWindows) {
print ("HSA_PATH : $HSA_PATH\n");
}
print ("HIP_CLANG_PATH : $HIP_CLANG_PATH\n");
if ($isWindows) {
system("\"$HIP_CLANG_PATH/clang++\" --version");
@@ -201,10 +197,10 @@ if (!$printed or $p_full) {
print "=== Environment Variables\n";
if ($isWindows) {
print ("PATH=$ENV{PATH}\n");
system("set | findstr //B //C:\"HIP\" //C:\"HSA\" //C:\"CUDA\" //C:\"LD_LIBRARY_PATH\"");
system("set | findstr //B //C:\"HIP\" //C:\"CUDA\" //C:\"LD_LIBRARY_PATH\"");
} else {
system("echo PATH=\$PATH");
system("env | egrep '^HIP|^HSA|^CUDA|^LD_LIBRARY_PATH'");
system("env | egrep '^HIP|^CUDA|^LD_LIBRARY_PATH'");
}
@@ -238,18 +234,6 @@ if ($p_check) {
} else {
printf "good\n";
}
if ($HIP_PLATFORM eq "amd") {
$LD_LIBRARY_PATH=$ENV{'LD_LIBRARY_PATH'};
printf("%-70s", "check LD_LIBRARY_PATH ($LD_LIBRARY_PATH) contains HSA_PATH ($HSA_PATH)...");
if (index($LD_LIBRARY_PATH, $HSA_PATH) == -1) {
print "FAIL\n";
} else {
printf "good\n";
}
# TODO - check hipcc / nvcc found and executable.
}
}
if ($p_newline) {