github/ROCm
1
1
Fork 0
mirror of https://github.com/ROCm/ROCm.git synced 2026-01-09 14:48:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts (#4185)

Browse Source
This commit is contained in:
Peter Park
2024-12-20 18:34:17 -05:00
committed by GitHub
parent bf9727db74
commit 47502421e1
5 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/rocm-build/build_rocthrust.sh
View File

@@ -26,8 +26,6 @@ build_rocthrust() {
init_rocm_common_cmake_params
init_rocm_common_cmake_params
CXX=$(set_build_variables CXX)\
cmake \
${LAUNCHER_FLAGS} \

2
tools/rocm-build/build_rpp.sh
View File

@@ -40,8 +40,6 @@ build_rpp() {
mkdir -p $BUILD_DIR && cd $BUILD_DIR
init_rocm_common_cmake_params
init_rocm_common_cmake_params
cmake \

1
tools/rocm-build/rocm-6.2.1.xml
View File

@@ -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" />

1
tools/rocm-build/rocm-6.2.2.xml
View File

@@ -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" />

1
tools/rocm-build/rocm-6.3.0.xml
View File

@@ -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" />