Skip to content

Commit

Permalink
Merge branch 'ROCm:main' into update-branch-names
Browse files Browse the repository at this point in the history
  • Loading branch information
dgaliffiAMD authored Aug 2, 2024
2 parents 7a42967 + d0d9749 commit 1257a7d
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
url = https://github.com/kokkos/kokkos.git
[submodule "external/papi"]
path = external/papi
url = https://bitbucket.org/icl/papi.git
url = https://github.com/icl-utk-edu/papi.git
[submodule "external/pybind11"]
path = external/pybind11
url = https://github.com/jrmadsen/pybind11.git
1 change: 1 addition & 0 deletions cmake/ElfUtils.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ externalproject_add(
PREFIX ${PROJECT_BINARY_DIR}/external/elfutils
URL ${ElfUtils_DOWNLOAD_URL}
"https://sourceware.org/elfutils/ftp/${ElfUtils_DOWNLOAD_VERSION}/elfutils-${ElfUtils_DOWNLOAD_VERSION}.tar.bz2"
"https://mirrors.kernel.org/sourceware/elfutils/${ElfUtils_DOWNLOAD_VERSION}/elfutils-${ElfUtils_DOWNLOAD_VERSION}.tar.bz2"
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND
${CMAKE_COMMAND} -E env CC=${ElfUtils_C_COMPILER}
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile.rhel
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ ENV PATH /usr/local/bin:${PATH}
ENV LIBRARY_PATH ${LIBRARY_PATH}:/opt/amdgpu/lib64

RUN yum groupinstall -y "Development Tools" && \
yum install -y epel-release && \
yum install -y --allowerasing curl dpkg-devel numactl-devel openmpi-devel papi-devel python3-pip wget zlib-devel which && \
yum install -y epel-release && crb enable && \
yum install -y --allowerasing curl dpkg-devel numactl-devel openmpi-devel papi-devel python3-pip texinfo wget which zlib-devel && \
yum clean all && \
python3 -m pip install 'cmake==3.21.4'

Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile.rhel.ci
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ ARG ELFUTILS_DOWNLOAD_VERSION="0.186"
ARG NJOBS="12"

RUN yum groupinstall -y "Development Tools" && \
yum install -y epel-release && \
yum install -y --allowerasing curl dpkg-devel numactl-devel openmpi-devel papi-devel python3-pip wget zlib-devel which && \
yum install -y epel-release && crb enable && \
yum install -y --allowerasing curl dpkg-devel numactl-devel openmpi-devel papi-devel python3-pip texinfo wget which zlib-devel && \
yum clean all && \
python3 -m pip install 'cmake==3.21.4'

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ENV PATH ${HOME}/.local/bin:${PATH}

RUN apt-get update && \
apt-get dist-upgrade -y && \
apt-get install -y build-essential cmake libnuma1 wget gnupg2 m4 bash-completion git-core autoconf libtool autotools-dev python3-pip lsb-release libpapi-dev libpfm4-dev libudev1 libopenmpi-dev rpm librpm-dev curl apt-utils && \
apt-get install -y apt-utils autoconf autotools-dev bash-completion bison build-essential cmake curl git-core gnupg2 libnuma1 libopenmpi-dev libpapi-dev libpfm4-dev librpm-dev libtool libudev1 lsb-release m4 python3-pip rpm texinfo wget && \
python3 -m pip install 'cmake==3.21.4'

RUN if [ "${ROCM_VERSION}" != "0.0" ]; then \
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.ubuntu.ci
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ COPY ./dyninst-source /tmp/dyninst

RUN apt-get update && \
apt-get dist-upgrade -y && \
apt-get install -y autoconf autotools-dev bash-completion build-essential bzip2 cmake curl environment-modules git-core gnupg2 gzip libiberty-dev libpapi-dev libpfm4-dev libtool locales lsb-release m4 python3-pip unzip wget zip zlib1g-dev && \
apt-get install -y autoconf autotools-dev bash-completion bison build-essential bzip2 cmake curl environment-modules git-core gnupg2 gzip libiberty-dev libpapi-dev libpfm4-dev libtool locales lsb-release m4 python3-pip texinfo unzip wget zip zlib1g-dev && \
python3 -m pip install 'cmake==3.18.4' && \
apt-get autoclean && \
locale -a && \
Expand Down
2 changes: 1 addition & 1 deletion external/dyninst
2 changes: 1 addition & 1 deletion external/papi
Submodule papi updated 717 files

0 comments on commit 1257a7d

Please sign in to comment.