resolve more merge conflicts

2026-01-08 22:28:06 -05:00 · 2024-12-18 16:49:16 -05:00
parent 45d59ffdba
commit 935a55f703
5 changed files with 0 additions and 243 deletions
--- a/tools/rocm-build/docker/ubuntu20/install-prerequisites.sh
+++ b/tools/rocm-build/docker/ubuntu20/install-prerequisites.sh
@@ -2,11 +2,7 @@

 set -ex

-<<<<<<< HEAD
-apt-get update 
-=======
 apt-get update
->>>>>>> external/develop
 DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install --no-install-recommends -y $(grep -v '^#' /tmp/packages)
 apt-get clean
 rm -rf /var/cache/apt/ /var/lib/apt/lists/* /etc/apt/apt.conf.d/01proxy
@@ -120,11 +116,7 @@ git clone --recurse-submodules -b v1.61.0 https://github.com/grpc/grpc
 cd grpc
 mkdir -p cmake/build
 cd cmake/build
-<<<<<<< HEAD
-cmake -DgRPC_INSTALL=ON -DBUILD_SHARED_LIBS=ON -DgRPC_BUILD_TESTS=OFF  -DCMAKE_INSTALL_PREFIX=/usr/grpc   -DCMAKE_CXX_STANDARD=14  -DCMAKE_SHARED_LINKER_FLAGS_INIT=-Wl,--enable-new-dtags,--build-id=sha1,--rpath,'$ORIGIN' ../.. 
-=======
 cmake -DgRPC_INSTALL=ON -DBUILD_SHARED_LIBS=ON -DgRPC_BUILD_TESTS=OFF  -DCMAKE_INSTALL_PREFIX=/usr/grpc   -DCMAKE_CXX_STANDARD=14  -DCMAKE_SHARED_LINKER_FLAGS_INIT=-Wl,--enable-new-dtags,--build-id=sha1,--rpath,'$ORIGIN' ../..
->>>>>>> external/develop
 make -j$(nproc)
 make install
 cd  /
@@ -138,17 +130,10 @@ mv amd-blis-mt /usr/blis
 cd /
 rm -rf /tmp/blis

-<<<<<<< HEAD
-## Download aocl-linux-gcc-4.2.0_1_amd64.deb
-mkdir -p /tmp/aocl 
-cd /tmp/aocl 
-wget -nv https://download.amd.com/developer/eula/aocl/aocl-4-2/aocl-linux-gcc-4.2.0_1_amd64.deb 
-=======
 # Download aocl-linux-gcc-4.2.0_1_amd64.deb
 mkdir -p /tmp/aocl
 cd /tmp/aocl
 wget -nv https://download.amd.com/developer/eula/aocl/aocl-4-2/aocl-linux-gcc-4.2.0_1_amd64.deb
->>>>>>> external/develop
 apt install ./aocl-linux-gcc-4.2.0_1_amd64.deb
 rm -rf /tmp/aocl

@@ -203,10 +188,6 @@ cd ninja-1.11.1.g95dee.kitware.jobserver-1
 cp ninja /usr/local/bin/
 rm -rf /tmp/ninja

-<<<<<<< HEAD
-# Install FFmpeg from source
-wget -qO- https://www.ffmpeg.org/releases/ffmpeg-4.4.2.tar.gz | tar -xzv -C /usr/local
-=======
 # Build NASM
 mkdir -p /tmp/nasm-2.15.05
 cd /tmp
@@ -216,7 +197,6 @@ cd nasm-2.15.05
 ./configure --prefix="/usr/local"
 make -j$(nproc) install
 rm -rf /tmp/nasm-2.15.05
->>>>>>> external/develop

 # Build YASM
 mkdir -p /tmp/yasm-1.3.0
--- a/tools/rocm-build/docker/ubuntu24/Dockerfile
+++ b/tools/rocm-build/docker/ubuntu24/Dockerfile
@@ -1,20 +1,11 @@
 FROM ubuntu:noble as builder	
 COPY packages /tmp/packages
 COPY local-pin-600 /tmp/local-pin-600
-<<<<<<< HEAD
-COPY install-prerequisities.sh /tmp/install-prerequisities.sh
-RUN chmod +x /tmp/install-prerequisities.sh
-=======
 COPY install-prerequisites.sh /tmp/install-prerequisites.sh
 RUN chmod +x /tmp/install-prerequisites.sh
->>>>>>> external/develop
 ENV KBUILD_PKG_ROOTCMD=
 ENV RPP_DEPS_LOCATION=/usr/local/rpp-deps
 ENV PATH="/opt/venv/bin:$PATH"
 ENV PATH=$PATH:"/usr/local/bin"
-<<<<<<< HEAD
-RUN  /tmp/install-prerequisities.sh
-=======
 RUN  /tmp/install-prerequisites.sh
->>>>>>> external/develop
 WORKDIR /src
--- a/tools/rocm-build/docker/ubuntu24/README.md
+++ b/tools/rocm-build/docker/ubuntu24/README.md
@@ -3,11 +3,7 @@
 1. Clone this repositry

   ```bash
-<<<<<<< HEAD
-   git clone https://github.com/ROCm/rocm-build.git
-=======
   git clone -b <release_branch> https://github.com/ROCm/ROCm.git
->>>>>>> external/develop
   ```

 2. Go into the OS specific docker directory in build-infra
--- a/tools/rocm-build/docker/ubuntu24/install-prerequisites.sh
+++ b/tools/rocm-build/docker/ubuntu24/install-prerequisites.sh
@@ -1,34 +1,3 @@
-<<<<<<< HEAD
-
-#! /usr/bin/bash
-set -ex
-
-# The following assumes that you have a cache, e.g.
-# https://docs.docker.com/engine/examples/apt-cacher-ng/
-# Comment out if it breaks things
-echo 'Acquire::http { Proxy "http://rocm-ci-services.amd.com:3142";  };' > /etc/apt/apt.conf.d/01proxy
-
-apt-get update 
-DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install --no-install-recommends -y $(sed 's/#.*//' /tmp/packages)
-update-ccache-symlinks
-apt-get upgrade
-apt-get clean 
-rm -rf /var/cache/apt/ /var/lib/apt/lists/* /etc/apt/apt.conf.d/01proxy
-
-#Install  2.17.1 version of git as we are seeing issues with 2.25 , where it was not allowing to add git submodules if the user is different for parent git directory
-curl -o git.tar.gz https://cdn.kernel.org/pub/software/scm/git/git-2.17.1.tar.gz 
-tar -zxf git.tar.gz 
-cd git-* 
-make prefix=/usr/local all    
-make prefix=/usr/local install
-git --version
-
-# venv for python to be able to run pip3 without --break-system-packages
-python3 -m venv /opt/venv
-
-pip3 install --no-cache-dir setuptools wheel tox
-pip3 install --no-cache-dir --pre CppHeaderParser argparse requests lxml barectf recommonmark jinja2==3.0.0 websockets matplotlib numpy scipy minimal msgpack pytest sphinx joblib PyYAML==5.3.1 rocm-docs-core cmake==3.25.2 pandas myst-parser
-=======
 #! /usr/bin/bash

 set -ex
@@ -51,15 +20,10 @@ python3 -m venv /opt/venv
 pip3 install CppHeaderParser argparse lxml recommonmark jinja2==3.0.0 \
    websockets matplotlib numpy scipy minimal msgpack pytest sphinx joblib PyYAML rocm-docs-core cmake==3.25.2 pandas \
    myst-parser setuptools lit
->>>>>>> external/develop

 # Allow sudo for everyone user
 echo 'ALL ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/everyone

-<<<<<<< HEAD
-# Install OCaml packages to build LLVM's OCaml bindings to be used in lightning compiler test pipeline
-wget -nv https://sourceforge.net/projects/opam.mirror/files/2.1.4/opam-2.1.4-x86_64-linux -O /usr/local/bin/opam 
-=======
 wget https://repo.radeon.com/amdgpu-install/6.3/ubuntu/noble/amdgpu-install_6.3.60300-1_all.deb
 apt install -y ./amdgpu-install_6.3.60300-1_all.deb
 apt update
@@ -91,36 +55,15 @@ ln -s /usr/local/bin/ccache /usr/local/bin/hipcc

 # Install OCaml packages
 wget -nv https://sourceforge.net/projects/opam.mirror/files/2.1.6/opam-2.1.6-x86_64-linux/download -O /usr/local/bin/opam
->>>>>>> external/develop
 chmod +x /usr/local/bin/opam
 opam init --yes --disable-sandboxing
 opam install ctypes --yes

-<<<<<<< HEAD
-# Install and modify git-repo (#!/usr/bin/env python -> #!/usr/bin/env python3)
-curl https://storage.googleapis.com/git-repo-downloads/repo > /usr/bin/repo
-chmod a+x /usr/bin/repo
-
-# Build ccache from the source
-cd /tmp 
-git clone https://github.com/ccache/ccache -b v4.7.5 
-cd ccache 
-mkdir build 
-cd build 
-cmake -DCMAKE_BUILD_TYPE=Release .. 
-make 
-make install 
-cd /tmp 
-rm -rf ccache
-
-#Install older version of hwloc-devel package for rocrtst
-=======
 # Install and modify git-repo
 curl https://storage.googleapis.com/git-repo-downloads/repo > /usr/bin/repo
 chmod a+x /usr/bin/repo


->>>>>>> external/develop
 curl -lO https://download.open-mpi.org/release/hwloc/v1.11/hwloc-1.11.13.tar.bz2
 tar -xvf hwloc-1.11.13.tar.bz2
 cd hwloc-1.11.13
@@ -130,60 +73,11 @@ make install
 cp /usr/local/lib/libhwloc.so.5 /usr/lib
 hwloc-info --version

-<<<<<<< HEAD
-# Install gtest
-=======
 # Install googletest from source
->>>>>>> external/develop
 mkdir -p /tmp/gtest
 cd /tmp/gtest
 wget https://github.com/google/googletest/archive/refs/tags/v1.14.0.zip -O googletest.zip
 unzip googletest.zip
-<<<<<<< HEAD
-cd googletest-1.14.0/ 
-mkdir build
-cd build
-cmake .. 
-make -j$(nproc) 
-make install
-rm -rf /tmp/gtest
-
-## Install gRPC from source
-## RDC Pre-requisites
-GRPC_ARCHIVE=grpc-1.61.0.tar.gz
-mkdir /tmp/grpc
-mkdir /usr/grpc 
-cd /tmp 
-git clone --recurse-submodules -b v1.61.0 https://github.com/grpc/grpc
-cd grpc
-mkdir -p build 
-cd build
-cmake  -DgRPC_INSTALL=ON -DBUILD_SHARED_LIBS=ON -DgRPC_BUILD_TESTS=OFF -DCMAKE_INSTALL_PREFIX=/usr/grpc -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=14 -DCMAKE_SHARED_LINKER_FLAGS_INIT=-Wl,--enable-new-dtags,--build-id=sha1,--rpath,'$ORIGIN' .. 
-make -j $(nproc) install 
-rm -rf /tmp/grpc
-
-## rocBLAS Pre-requisites(ROCMOPS-3856)
-## Download prebuilt AMD multithreaded blis (2.0)
-## Reference : https://github.com/ROCmSoftwarePlatform/rocBLAS/blob/develop/install.sh#L403
-mkdir -p /tmp/blis 
-cd /tmp/blis
-wget -O - https://github.com/amd/blis/releases/download/2.0/aocl-blis-mt-ubuntu-2.0.tar.gz | tar xfz - 
-mv amd-blis-mt /usr/blis 
-cd / 
-rm -rf /tmp/blis
-
-## rocBLAS Pre-requisites(SWDEV-404612)
-## Download aocl-linux-gcc-4.2.0_1_amd64.deb
-mkdir -p /tmp/aocl 
-cd /tmp/aocl 
-wget -nv https://download.amd.com/developer/eula/aocl/aocl-4-2/aocl-linux-gcc-4.2.0_1_amd64.deb 
-apt install ./aocl-linux-gcc-4.2.0_1_amd64.deb 
-rm -rf /tmp/aocl
-
-## hipBLAS Pre-requisites
-## lapack(3.9.1v)
-## Reference https://github.com/ROCmSoftwarePlatform/rocSOLVER/blob/develop/install.sh#L174
-=======
 cd googletest-1.14.0/
 mkdir build
 cd build
@@ -221,40 +115,23 @@ apt install ./aocl-linux-aocc-4.0_1_amd64.deb
 rm -rf /tmp/aocl

 # lapack(3.9.1v)
->>>>>>> external/develop
 lapack_version=3.9.1
 lapack_srcdir=lapack-$lapack_version
 lapack_blddir=lapack-$lapack_version-bld
 mkdir -p /tmp/lapack
 cd /tmp/lapack
-<<<<<<< HEAD
-rm -rf "$lapack_srcdir" "$lapack_blddir" 
-wget -O - https://github.com/Reference-LAPACK/lapack/archive/refs/tags/v3.9.1.tar.gz | tar xzf - 
-=======
 rm -rf "$lapack_srcdir" "$lapack_blddir"
 wget -O - https://github.com/Reference-LAPACK/lapack/archive/refs/tags/v3.9.1.tar.gz | tar xzf -
->>>>>>> external/develop
 cmake -H$lapack_srcdir -B$lapack_blddir -DCMAKE_BUILD_TYPE=Release -DCMAKE_Fortran_FLAGS=-fno-optimize-sibling-calls -DBUILD_TESTING=OFF -DCBLAS=ON -DLAPACKE=OFF
 make -j$(nproc) -C "$lapack_blddir"
 make -C "$lapack_blddir" install
 cd $lapack_blddir
-<<<<<<< HEAD
-cp -r ./include/* /usr/local/include/ 
-cp -r ./lib/* /usr/local/lib 
-cd / 
-rm -rf /tmp/lapack
-
-## rocSOLVER Pre-requisites
-## FMT(7.1.3v)
-## Reference https://github.com/ROCmSoftwarePlatform/rocSOLVER/blob/develop/install.sh#L152
-=======
 cp -r ./include/* /usr/local/include/
 cp -r ./lib/* /usr/local/lib
 cd /
 rm -rf /tmp/lapack

 # FMT(7.1.3v)
->>>>>>> external/develop
 fmt_version=7.1.3
 fmt_srcdir=fmt-$fmt_version
 fmt_blddir=fmt-$fmt_version-bld
@@ -267,34 +144,6 @@ make -j$(nproc) -C "$fmt_blddir"
 make -C "$fmt_blddir" install

 # Build and install libjpeg-turbo
-<<<<<<< HEAD
-mkdir -p /tmp/libjpeg-turbo 
-cd /tmp/libjpeg-turbo 
-wget -nv https://github.com/rrawther/libjpeg-turbo/archive/refs/heads/2.0.6.2.zip -O libjpeg-turbo-2.0.6.2.zip
-unzip libjpeg-turbo-2.0.6.2.zip 
-cd libjpeg-turbo-2.0.6.2
-mkdir build
-cd build
-cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE -DENABLE_STATIC=FALSE -DCMAKE_INSTALL_DEFAULT_LIBDIR=lib .. 
-make -j$(nproc) install 
-rm -rf /tmp/libjpeg-turbo
-
-# Get released ninja from source
-mkdir -p /tmp/ninja 
-cd /tmp/ninja 
-wget -nv https://codeload.github.com/Kitware/ninja/zip/refs/tags/v1.11.1.g95dee.kitware.jobserver-1 -O ninja.zip
-unzip ninja.zip
-cd ninja-1.11.1.g95dee.kitware.jobserver-1
-./configure.py --bootstrap 
-cp ninja /usr/local/bin/ 
-rm -rf /tmp/ninja
-
-# Install  FFmpeg and dependencies
-# Build NASM
-mkdir -p /tmp/nasm-2.15.05 
-cd /tmp
-wget -qO- "https://distfiles.macports.org/nasm/nasm-2.15.05.tar.bz2" | tar -xvj 
-=======
 mkdir -p /tmp/libjpeg-turbo
 cd /tmp/libjpeg-turbo
 wget -nv https://github.com/rrawther/libjpeg-turbo/archive/refs/heads/2.0.6.2.zip -O libjpeg-turbo-2.0.6.2.zip
@@ -320,7 +169,6 @@ rm -rf /tmp/ninja
 mkdir -p /tmp/nasm-2.15.05
 cd /tmp
 wget -qO- "https://distfiles.macports.org/nasm/nasm-2.15.05.tar.bz2" | tar -xvj
->>>>>>> external/develop
 cd nasm-2.15.05
 ./autogen.sh
 ./configure --prefix="/usr/local"
@@ -328,15 +176,9 @@ make -j$(nproc) install
 rm -rf /tmp/nasm-2.15.05

 # Build YASM
-<<<<<<< HEAD
-mkdir -p /tmp/yasm-1.3.0 
-cd /tmp
-wget -qO- "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz" | tar -xvz 
-=======
 mkdir -p /tmp/yasm-1.3.0
 cd /tmp
 wget -qO- "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0.tar.gz" | tar -xvz
->>>>>>> external/develop
 cd yasm-1.3.0
 ./configure --prefix="/usr/local"
 make -j$(nproc) install
@@ -360,10 +202,6 @@ cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX="/usr/local" -DENABLE_SHARED:bo
 make -j$(nproc) install
 rm -rf /tmp/x265_2.7

-<<<<<<< HEAD
-
-=======
->>>>>>> external/develop
 # Build fdk-aac
 mkdir -p /tmp/fdk-aac-2.0.2
 cd /tmp
@@ -386,17 +224,6 @@ rm -rf /tmp/ffmpeg

 cp /tmp/local-pin-600 /etc/apt/preferences.d

-<<<<<<< HEAD
-command -v lbzip2 
-ln -sf $(command -v lbzip2) /usr/local/bin/compressor || ln -sf $(command -v bzip2) /usr/local/bin/compressor
-
-# Install Google Benchmark (ROCMOPS-5283)
-mkdir -p /tmp/Gbenchmark 
-cd /tmp/Gbenchmark 
-wget -qO- https://github.com/google/benchmark/archive/refs/tags/v1.6.1.tar.gz | tar xz 
-cmake -Sbenchmark-1.6.1 -Bbuild -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DBENCHMARK_ENABLE_TESTING=OFF -DCMAKE_CXX_STANDARD=14 
-make -j -C build 
-=======
 command -v lbzip2
 ln -sf $(command -v lbzip2) /usr/local/bin/compressor || ln -sf $(command -v bzip2) /usr/local/bin/compressor

@@ -406,6 +233,5 @@ cd /tmp/Gbenchmark
 wget -qO- https://github.com/google/benchmark/archive/refs/tags/v1.6.1.tar.gz | tar xz
 cmake -Sbenchmark-1.6.1 -Bbuild -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DBENCHMARK_ENABLE_TESTING=OFF -DCMAKE_CXX_STANDARD=14
 make -j -C build
->>>>>>> external/develop
 cd /tmp/Gbenchmark/build
 make install
--- a/tools/rocm-build/docker/ubuntu24/packages
+++ b/tools/rocm-build/docker/ubuntu24/packages
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-# List of packages needed for stage1 build
-=======
->>>>>>> external/develop
 apt-utils
 aria2
 autoconf
@@ -11,10 +7,6 @@ bison
 bridge-utils
 build-essential
 bzip2
-<<<<<<< HEAD
-ccache
-=======
->>>>>>> external/develop
 check
 chrpath
 cifs-utils
@@ -29,10 +21,6 @@ flex
 freeglut3-dev
 g++
 g++-multilib
-<<<<<<< HEAD
-# gawk is needed for aomp
-=======
->>>>>>> external/develop
 gawk
 gcc
 gcc-multilib
@@ -42,15 +30,8 @@ gnupg
 googletest
 graphviz
 kernel-wedge
-<<<<<<< HEAD
-# kmod for kernel build
 kmod
 lbzip2
-# less is needed by repo
-=======
-kmod
-lbzip2
->>>>>>> external/develop
 less
 libass-dev
 libatlas-base-dev
@@ -94,10 +75,7 @@ libncurses-dev
 libnuma-dev
 libomp-dev
 libopenblas-dev
-<<<<<<< HEAD
-=======
 libopencv-dev
->>>>>>> external/develop
 libpci-dev
 libpci3
 libpciaccess-dev
@@ -122,11 +100,8 @@ mesa-common-dev
 mpich
 ocaml
 ocaml-findlib
-<<<<<<< HEAD
-=======
 ocl-icd-libopencl1
 ocl-icd-opencl-dev
->>>>>>> external/develop
 patchelf
 pigz
 pkg-config
@@ -139,22 +114,11 @@ python3-pip-whl
 python3-requests
 python3-venv
 python3-yaml
-<<<<<<< HEAD
-python3-yaml
-re2c
-redis-tools
-# hipclang needs rpm
-rpm
-rsync
-ssh
-# This makes life more pleasent inside the container
-=======
 re2c
 redis-tools
 rpm
 rsync
 ssh
->>>>>>> external/develop
 strace
 sudo
 systemtap-sdt-dev