From 5b1df094de53088672111b6ab91c195e931d1ccb Mon Sep 17 00:00:00 2001 From: Weili An Date: Fri, 23 Aug 2024 15:54:39 -0400 Subject: [PATCH] sst-integration: update apt entry for dep install --- Dockerfile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index b319e39..8be7a34 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,20 +10,20 @@ ENV PTXAS_CUDA_INSTALL_PATH /usr/local/cuda-11.7 ENV GPUAPPS_ROOT /accel-sim/gpu-app-collection # Build LLVM 18.1.8 -RUN git clone https://github.com/llvm/llvm-project.git \ -&& mkdir llvm-install \ -&& export LLVM_INSTALL_PATH=$(pwd)/llvm-install \ -&& cd llvm-project \ -&& git checkout llvmorg-18.1.8 \ -&& mkdir build && cd build \ -&& cmake -DLLVM_TARGETS_TO_BUILD="RISCV;X86;NVPTX" -DLLVM_DEFAULT_TARGET_TRIPLE=riscv64-unknown-linux-gnu \ - -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS="clang;lld" -DCMAKE_INSTALL_PREFIX=$LLVM_INSTALL_PATH ../llvm \ -&& cmake --build . -j4 \ -&& cmake --build . --target install \ -&& cd .. && cd .. +# RUN git clone https://github.com/llvm/llvm-project.git \ +# && mkdir llvm-install \ +# && export LLVM_INSTALL_PATH=$(pwd)/llvm-install \ +# && cd llvm-project \ +# && git checkout llvmorg-18.1.8 \ +# && mkdir build && cd build \ +# && cmake -DLLVM_TARGETS_TO_BUILD="RISCV;X86;NVPTX" -DLLVM_DEFAULT_TARGET_TRIPLE=riscv64-unknown-linux-gnu \ +# -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS="clang;lld" -DCMAKE_INSTALL_PREFIX=$LLVM_INSTALL_PATH ../llvm \ +# && cmake --build . -j4 \ +# && cmake --build . --target install \ +# && cd .. && cd .. # Build RISCV GNU Toolchain 2024.08.06.nightly -RUN apt-get -y install autoconf automake autotools-dev curl python3 python3-pip libmpc-dev libmpfr-dev libgmp-dev gawk build-essential bison flex texinfo gperf libtool patchutils bc zlib1g-dev libexpat-dev ninja-build git cmake libglib2.0-dev libslirp-dev +RUN apt-get update && apt-get -y install autoconf automake autotools-dev curl python3 python3-pip libmpc-dev libmpfr-dev libgmp-dev gawk build-essential bison flex texinfo gperf libtool patchutils bc zlib1g-dev libexpat-dev ninja-build git cmake libglib2.0-dev libslirp-dev RUN git clone https://github.com/riscv-collab/riscv-gnu-toolchain.git \ && mkdir riscv-gnu-install \ && export RISCV_TOOLCHAIN_INSTALL_PATH=$(pwd)/riscv-gnu-install \