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 <power.jg@gmail.com>
Reviewed-by: Matt Sinclair <mattdsinclair@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Matt Sinclair <mattdsinclair@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>

diff --git a/util/dockerfiles/gcn-gpu/Dockerfile b/util/dockerfiles/gcn-gpu/Dockerfile
index d0fe759eb8204944d41f19399f0628954ab3d997..7a9ec8f26826d6f19840a3bc97ceecdc9ac4dcf5 100644 (file)
--- a/util/dockerfiles/gcn-gpu/Dockerfile
+++ b/util/dockerfiles/gcn-gpu/Dockerfile
@@ -19,11 +19,12 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     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 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     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 @@ RUN cp gfx803_64.cd.pdb.txt gfx801_4.cd.pdb.txt && \
 WORKDIR /ROCm-Profiler
 RUN dpkg -i package/rocm-profiler_4.0.6036_amd64.deb
 
+RUN ln -sf /usr/bin/python3 /usr/bin/python
 WORKDIR /