From dcff5a71505044aaf7c4618fa7fb4ec60d3b03c4 Mon Sep 17 00:00:00 2001
From: Sambhav Jain <sambhav.jain@getcruise.com>
Date: Thu, 10 Nov 2022 13:11:06 -0800
Subject: [PATCH] [Bazel] Update to Ubuntu-22.04 and clang-16 for Bazel build
 docker (#1523)

* Update Ubuntu and clang in the docker container
* Specifically build just `@torch-mlir//:torch-mlir-opt`


Triggered GHA run:
https://github.com/sjain-stanford/torch-mlir/actions/runs/3317006870/jobs/5479411204
---
 utils/bazel/.bazelrc                  |  4 +--
 utils/bazel/docker/Dockerfile         | 45 +++++++++++++++------------
 utils/bazel/docker/run_bazel_build.sh |  2 +-
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/utils/bazel/.bazelrc b/utils/bazel/.bazelrc
index 15d329dcc..6072d7f12 100644
--- a/utils/bazel/.bazelrc
+++ b/utils/bazel/.bazelrc
@@ -2,8 +2,8 @@
 # See https://llvm.org/LICENSE.txt for license information.
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-build --action_env=CC=clang
-build --action_env=CXX=clang++
+build --action_env=CC=clang-16
+build --action_env=CXX=clang++-16
 build --cxxopt=-std=c++17
 build --host_cxxopt=-std=c++17
 build --cxxopt=-D_GLIBCXX_USE_CXX11_ABI=0
diff --git a/utils/bazel/docker/Dockerfile b/utils/bazel/docker/Dockerfile
index 37cd4ae65..d82af997d 100644
--- a/utils/bazel/docker/Dockerfile
+++ b/utils/bazel/docker/Dockerfile
@@ -1,35 +1,40 @@
-ARG BASE_IMG=ubuntu:18.04
+ARG BASE_IMG=ubuntu:22.04
 FROM ${BASE_IMG} as dev-base
 
-ARG ARCH="x86_64"
-ARG BAZEL_VERSION=5.2.0
-
 # Install basic packages
-RUN apt-get update                                              && \
-    apt-get install -y                                             \
-    clang-10                                                       \
-    curl                                                           \
-    git                                                            \
-    python3-pip                                                    \
-    python3.8                                                      \
-    python3.8-dev                                                  \
-    wget                                                           \
+RUN apt-get update && \
+    apt-get install -y \
+    wget \
+    curl \
+    git \
+    python3-pip \
+    python3.10 \
+    python3.10-dev \
     unzip
 
-RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.8 10
-RUN update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.8 10
-
-RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-10 10
-RUN update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-10 10
+# Install clang
+ARG REPO_NAME="deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy main"
+RUN echo $REPO_NAME >> /etc/apt/sources.list.d/llvm.list && \
+    wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
+    apt-get update && \
+    apt-get install -y \
+    clang
 
 # Install bazel
+ARG ARCH="x86_64"
+ARG BAZEL_VERSION=5.2.0
 RUN wget -q https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-linux-${ARCH} -O /usr/bin/bazel \
     && chmod a+x /usr/bin/bazel
 
+# Install torch-mlir requirements
 COPY requirements.txt /opt/app/requirements.txt
 COPY pytorch-requirements.txt /opt/app/pytorch-requirements.txt
 WORKDIR /opt/app
-RUN python -m pip install --upgrade pip
-RUN python -m pip install --upgrade --ignore-installed -r requirements.txt
+RUN python3 -m pip install --upgrade pip
+RUN python3 -m pip install --upgrade --ignore-installed -r requirements.txt
+
+# Clean up
+RUN apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /opt/src/torch-mlir
diff --git a/utils/bazel/docker/run_bazel_build.sh b/utils/bazel/docker/run_bazel_build.sh
index c07052062..88bf4b8d6 100755
--- a/utils/bazel/docker/run_bazel_build.sh
+++ b/utils/bazel/docker/run_bazel_build.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-cd "$(pwd)/utils/bazel" && bazel build @torch-mlir//...
+cd "$(pwd)/utils/bazel" && bazel build @torch-mlir//:torch-mlir-opt