fix merge conflicts

peterjunpark · Dec 20, 2024 · 2005e72 · 2005e72
1 parent bf9727d
commit 2005e72
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 8 deletions.
diff --git a/tools/rocm-build/build_rocthrust.sh b/tools/rocm-build/build_rocthrust.sh
@@ -26,8 +26,6 @@ build_rocthrust() {
 
     init_rocm_common_cmake_params
 
-    init_rocm_common_cmake_params
-
     CXX=$(set_build_variables CXX)\
     cmake \
         ${LAUNCHER_FLAGS} \

diff --git a/tools/rocm-build/build_rpp.sh b/tools/rocm-build/build_rpp.sh
@@ -40,8 +40,6 @@ build_rpp() {
 
     mkdir -p $BUILD_DIR && cd $BUILD_DIR
 
-   init_rocm_common_cmake_params
-
     init_rocm_common_cmake_params
 
     cmake \

diff --git a/tools/rocm-build/rocm-6.2.1.xml b/tools/rocm-build/rocm-6.2.1.xml
@@ -26,7 +26,6 @@
     <project name="HIP" />
     <project name="hip-tests" />
     <project name="HIP-Examples" />
-    <project name="HIP-Examples" />
     <project name="HIPIFY" />
     <project name="clr" />
     <project name="hipother" />

diff --git a/tools/rocm-build/rocm-6.2.2.xml b/tools/rocm-build/rocm-6.2.2.xml
@@ -2,7 +2,6 @@
 <manifest>
     <remote name="rocm-org" fetch="https://github.com/ROCm/" />
     <default revision="refs/tags/rocm-6.2.2"
-    <default revision="refs/tags/rocm-6.2.1"
      remote="rocm-org"
      sync-c="true"
      sync-j="4" />

diff --git a/tools/rocm-build/rocm-6.3.0.xml b/tools/rocm-build/rocm-6.3.0.xml
@@ -9,7 +9,6 @@
     <project name="ROCm" revision="roc-6.3.x" />
     <project name="ROCK-Kernel-Driver" />
     <project name="ROCR-Runtime" />
-    <project name="ROCT-Thunk-Interface" />
     <project name="amdsmi" />
     <project name="rdc" />
     <project name="rocm_bandwidth_test" />
@@ -75,4 +74,4 @@
     <project name="aomp" path="openmp-extras/aomp" />
     <project name="aomp-extras" path="openmp-extras/aomp-extras" />
     <project name="flang" path="openmp-extras/flang" />
-</manifest>
+</manifest>
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,8 +40,6 @@ build_rpp() { @@
         mkdir -p $BUILD_DIR && cd $BUILD_DIR
-       init_rocm_common_cmake_params
         init_rocm_common_cmake_params
         cmake \
@@ Expand Down @@