From 5129854bb18d9a3e4dd1501aaf31198f371266bd Mon Sep 17 00:00:00 2001
From: Tongze Wang <wtongze@gmail.com>
Date: Fri, 13 Sep 2024 09:21:57 -0700
Subject: [PATCH] fix: tensile and blender dep

---
 base.dockerfile    | 5 ++++-
 blender.dockerfile | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/base.dockerfile b/base.dockerfile
index 6b463f4..b1914b0 100644
--- a/base.dockerfile
+++ b/base.dockerfile
@@ -82,7 +82,10 @@ RUN git clone -b ${ROCBLAS_BRANCH} https://github.com/ROCmSoftwarePlatform/rocBL
 WORKDIR /root/rocBLAS
 RUN rm -rf library/src/blas3/Tensile/Logic/asm_full/r9nano/
 RUN sed -i -e 's/rmake.py --install/rmake.py -a="${ROCBLAS_ARCH}" --install/g' install.sh
-RUN ./install.sh -a ${ROCBLAS_ARCH} -d --cmake_install
+
+# > https://github.com/ROCm/Tensile/pull/1897
+RUN ./install.sh -a ${ROCBLAS_ARCH} -d --cmake_install --merge-architectures --no-lazy-library-loading
+
 WORKDIR /root/rocBLAS/build/release
 COPY fix-rocblas.sh .
 RUN <<EOF
diff --git a/blender.dockerfile b/blender.dockerfile
index d381c3d..3431141 100644
--- a/blender.dockerfile
+++ b/blender.dockerfile
@@ -17,7 +17,8 @@ RUN git clone --depth 1 https://projects.blender.org/blender/blender.git -b ${BL
 mkdir blender/build
 
 WORKDIR /home/rocm/blender
-RUN ./build_files/build_environment/install_linux_packages.py
+RUN sudo ./build_files/build_environment/install_deps.sh || true
+RUN ./build_files/build_environment/install_linux_packages.py || true
 RUN ./build_files/utils/make_update.py --use-linux-libraries
 
 RUN sudo apt-get clean && sudo rm -rf /var/lib/apt/lists/*