Kyle Roarty has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/36158 )
Change subject: util: Update GCN dockerfile for python3
......................................................................
util: Update GCN dockerfile for python3
This patch installs python3 in the GCN dockerfile, due to python3
being required starting in 20.2.
Python2 (python-yaml) is still required in order to compile rocBLAS
Change-Id: I1a6f1707e076e8ca499804119447a8d1f237ffd4
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/36158
Reviewed-by: Jason Lowe-Power <[email protected]>
Reviewed-by: Matt Sinclair <[email protected]>
Maintainer: Jason Lowe-Power <[email protected]>
Maintainer: Matt Sinclair <[email protected]>
Tested-by: kokoro <[email protected]>
---
M util/dockerfiles/gcn-gpu/Dockerfile
1 file changed, 8 insertions(+), 6 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
Matt Sinclair: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/util/dockerfiles/gcn-gpu/Dockerfile
b/util/dockerfiles/gcn-gpu/Dockerfile
index d0fe759..7a9ec8f 100644
--- a/util/dockerfiles/gcn-gpu/Dockerfile
+++ b/util/dockerfiles/gcn-gpu/Dockerfile
@@ -19,11 +19,12 @@
protobuf-compiler \
libprotoc-dev \
libgoogle-perftools-dev \
- python-dev \
- python \
python-yaml \
- python-six \
- python-pip \
+ python3-dev \
+ python3 \
+ python3-yaml \
+ python3-six \
+ python3-pip \
wget \
libpci3 \
libelf1 \
@@ -36,8 +37,8 @@
libboost-dev \
libpng12-dev
-RUN python -m pip install -U pip && \
- python -m pip install -U setuptools scons
+RUN python3 -m pip install -U pip && \
+ python3 -m pip install -U setuptools scons==3.1.2
ARG gem5_dist=http://dist.gem5.org/dist/develop
@@ -150,4 +151,5 @@
WORKDIR /ROCm-Profiler
RUN dpkg -i package/rocm-profiler_4.0.6036_amd64.deb
+RUN ln -sf /usr/bin/python3 /usr/bin/python
WORKDIR /
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/36158
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I1a6f1707e076e8ca499804119447a8d1f237ffd4
Gerrit-Change-Number: 36158
Gerrit-PatchSet: 2
Gerrit-Owner: Kyle Roarty <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Kyle Roarty <[email protected]>
Gerrit-Reviewer: Matt Sinclair <[email protected]>
Gerrit-Reviewer: Matthew Poremba <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
