Merge pull request #128 from ROCm-Developer-Tools/promotion/mainline/…

…2023.08.02 Promote develop branch (as of fea96fc) to mainline
ROCm · Aug 3, 2023 · 7ae382c · 7ae382c
2 parents 1a6bbfe + 065f3f0
commit 7ae382c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/bin/hipcc.pl b/bin/hipcc.pl
@@ -230,7 +230,6 @@ sub get_normalized_path {
 my $hasOMPTargets = 0; # If OMP targets is mentioned
 my $hasC = 0;          # options contain a c-style file
 my $hasCXX = 0;        # options contain a cpp-style file (NVCC must force recognition as GPU file)
-my $hasCU = 0;         # options contain a cu-style file (HCC must force recognition as GPU file)
 my $hasHIP = 0;        # options contain a hip-style file (HIP-Clang must pass offloading options)
 my $printHipVersion = 0;    # print HIP version
 my $printCXXFlags = 0;      # print HIPCXXFLAGS
@@ -441,6 +440,9 @@ sub get_normalized_path {
                 $needCXXFLAGS = 1;
                 if ($HIP_COMPILE_CXX_AS_HIP eq '0' or $HIP_PLATFORM ne "amd" or $hasOMPTargets eq 1) {
                     $hasCXX = 1;
+                    if ($HIP_PLATFORM eq "nvidia") {
+                        $toolArgs .= " -x cu";
+                    }
                 } elsif ($HIP_PLATFORM eq "amd") {
                     $hasHIP = 1;
                     $toolArgs .= " -x hip";
@@ -450,8 +452,8 @@ sub get_normalized_path {
                 if ($HIP_PLATFORM eq "amd") {
                     $hasHIP = 1;
                     $toolArgs .= " -x hip";
-                } else {
-                    $hasCU = 1;
+                } elsif ($HIP_PLATFORM eq "nvidia") {
+                    $toolArgs .= " -x cu";
                 }
             }
         }
@@ -532,10 +534,6 @@ sub get_normalized_path {
     $ENV{HCC_EXTRA_LIBRARIES}="\n";
 }
 
-if ($hasCXX and $HIP_PLATFORM eq 'nvidia') {
-    $HIPCXXFLAGS .= " -x cu";
-}
-
 if ($buildDeps and $HIP_PLATFORM eq 'nvidia') {
     $HIPCXXFLAGS .= " -M -D__CUDACC__";
     $HIPCFLAGS .= " -M -D__CUDACC__";

diff --git a/docs/.sphinx/requirements.in b/docs/.sphinx/requirements.in
@@ -1 +1 @@
-rocm-docs-core==0.19.0
+rocm-docs-core==0.20.0
diff --git a/docs/.sphinx/requirements.txt b/docs/.sphinx/requirements.txt
@@ -92,7 +92,7 @@ requests==2.28.2
     # via
     #   pygithub
     #   sphinx
-rocm-docs-core==0.19.0
+rocm-docs-core==0.20.0
     # via -r requirements.in
 smmap==5.0.0
     # via gitdb