Merge pull request #90 from ROCm-Developer-Tools/develop

merge develop into mainline

Author: david-salinas

amd/hipcc/CMakeLists.txt

@@ -41,7 +41,7 @@ if(NOT WIN32)
 endif()
 
 # Copy scripts and batch files to build directory.
-file(COPY ${CMAKE_SOURCE_DIR}/bin/ DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(COPY ${PROJECT_SOURCE_DIR}/bin/ DESTINATION ${PROJECT_BINARY_DIR})
 
 set(CPACK_GENERATOR "DEB;RPM;ZIP" CACHE STRING "Default packaging generators")
 set(CPACK_PACKAGE_CONTACT "ROCm Compiler Support <[email protected]>")
@@ -67,7 +67,7 @@ endif()
 set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
 set(CPACK_RPM_PACKAGE_LICENSE "MIT")
 set(CPACK_RPM_PACKAGE_REQUIRES "perl >= 5.0, perl-File-BaseDir, hip-devel, rocm-core, rocm-llvm")
-set(CPACK_RPM_PACKAGE_AUTOREQROV 0)
+set(CPACK_RPM_PACKAGE_AUTOREQPROV 0)
 if(DEFINED ENV{CPACK_RPM_PACKAGE_RELEASE})
   set(CPACK_RPM_PACKAGE_RELEASE $ENV{CPACK_RPM_PACKAGE_RELEASE})
 else()
@@ -126,4 +126,9 @@ if(NOT WIN32)
   endif()
 endif()
 
+if(NOT ROCM_DEP_ROCMCORE)
+  string(REGEX REPLACE ",? ?rocm-core" "" CPACK_DEBIAN_PACKAGE_DEPENDS ${CPACK_DEBIAN_PACKAGE_DEPENDS})
+  string(REGEX REPLACE ",? ?rocm-core" "" CPACK_RPM_PACKAGE_REQUIRES ${CPACK_RPM_PACKAGE_REQUIRES})
+endif()
+
 include(CPack)

amd/hipcc/bin/hipconfig.pl

@@ -64,19 +64,16 @@ BEGIN
 );
 
 if ($HIP_COMPILER eq "clang") {
-    $HIP_CLANG_VERSION = "";
+    $HIP_CLANG_INCLUDE = "";
     if($isWindows) {
-        $HIP_CLANG_VERSION = `\"$HIP_CLANG_PATH/clang++\" --version`;
+        $HIP_CLANG_INCLUDE = `\"$HIP_CLANG_PATH/clang++\" --print-resource-dir`;
     } else {
-        $HIP_CLANG_VERSION = `$HIP_CLANG_PATH/clang++ --version`;
+        $HIP_CLANG_INCLUDE = `$HIP_CLANG_PATH/clang++ --print-resource-dir`;
     }
-    $HIP_CLANG_VERSION=~/.*clang version (\S+).*/;
-    $HIP_CLANG_VERSION=$1;
 
     $CPP_CONFIG = " -D__HIP_PLATFORM_HCC__= -D__HIP_PLATFORM_AMD__=";
 
     $HIP_PATH_INCLUDE = $HIP_PATH."/include";
-    $HIP_CLANG_INCLUDE = $HIP_CLANG_PATH."/../lib/clang/".$HIP_CLANG_VERSION;
     if($isWindows) {
         $CPP_CONFIG .= " -I\"$HIP_PATH_INCLUDE\" -I\"$HIP_CLANG_INCLUDE\"";
     } else {

amd/hipcc/bin/hipvars.pm

@@ -83,8 +83,8 @@ if (-e "$HIP_PATH/bin/rocm_agent_enumerator") {
 }
 $CUDA_PATH=$ENV{'CUDA_PATH'} // '/usr/local/cuda';
 
-# Windows has a different structure, all binaries are inside hip/bin
-if ($isWindows) {
+# Windows/Distro's have a different structure, all binaries are with hipcc
+if (-e "$HIP_PATH/bin/clang" or -e "$HIP_PATH/bin/clang.exe") {
     $HIP_CLANG_PATH=$ENV{'HIP_CLANG_PATH'} // "$HIP_PATH/bin";
 } else {
     $HIP_CLANG_PATH=$ENV{'HIP_CLANG_PATH'} // "$ROCM_PATH/llvm/bin";

amd/hipcc/docs/.sphinx/requirements.in

@@ -1 +1 @@
-rocm-docs-core==0.13.4
+rocm-docs-core==0.14.0

amd/hipcc/docs/.sphinx/requirements.txt

@@ -94,7 +94,7 @@ requests==2.28.2
     # via
     #   pygithub
     #   sphinx
-rocm-docs-core==0.13.4
+rocm-docs-core==0.14.0
     # via -r requirements.in
 smmap==5.0.0
     # via gitdb

amd/hipcc/src/hipBin_amd.h

@@ -218,11 +218,14 @@ void HipBinAmd::constructCompilerPath() {
     if (osInfo == windows) {
       complierPath = getHipPath();
       hipClangPath = complierPath;
-      hipClangPath /= "bin";
     } else {
       complierPath = getRoccmPath();
       hipClangPath = complierPath;
+    }
+    if (fs::exists("llvm/bin/clang++")) {
       hipClangPath /= "llvm/bin";
+    } else {
+      hipClangPath /= "bin";
     }
     complierPath = hipClangPath.string();
   } else {