Skip to content

Commit fd207f3

Browse files
committed
Update the docker image
1 parent 8b3ba16 commit fd207f3

5 files changed

Lines changed: 25 additions & 12 deletions

File tree

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ The Neura artifact is available on the [neura-asplos-ae](https://github.com/tanc
4747
4848
As CGRA-Flow requires GUI, a script is provided for setting up the display:
4949
```sh
50-
docker pull cgra/neura-flow:20260114
50+
docker pull cgra/neura-flow:latest
5151

5252
# For Mac users:
5353
sh ./run_mac_docker.sh
@@ -62,8 +62,8 @@ As CGRA-Flow requires GUI, a script is provided for setting up the display:
6262

6363
Otherwise, if you don't need the GUI, development can be performed in the container with the environment well set up:
6464
```sh
65-
docker pull cgra/neura-flow:20260114
66-
docker run -it cgra/neura-flow:20260114
65+
docker pull cgra/neura-flow:latest
66+
docker run -it cgra/neura-flow:latest
6767
source /WORK_REPO/venv/bin/activate
6868
```
6969

@@ -103,8 +103,8 @@ in the Docker container. This allow you to edit code on your host machine while
103103
the container environment.
104104
Update the Docker run command to mount your local repository(take `run_windows_docker.sh` as an example):
105105
```shell
106-
IMAGE=cgra/cgra-flow:20251112
107-
CONTAINER=mycgraflow
106+
IMAGE=cgra/neura-flow:latest
107+
CONTAINER=neuraflow
108108
XSOCK=/tmp/.X11-unix
109109
# for developer: mount the upstream repo to the container.
110110
# Please update the path to the actual path on your machine.

docker/Dockerfile

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,14 @@ ENV DEBIAN_FRONTEND=noninteractive \
66
PYMTL_VERILATOR_INCLUDE_DIR=/WORK_REPO/verilator/share/verilator/include \
77
YOSYS_EXE="/OpenROAD-flow-scripts/tools/install/yosys/bin/yosys" \
88
OPENROAD_EXE="/OpenROAD-flow-scripts/tools/install/OpenROAD/bin/openroad" \
9-
LLVM_RELEASE_URL="https://github.com/tancheng/CGRA-Flow/releases/download/LLVM%406146a88/llvm-project-6146a88-prebuild.tar.xz"
9+
LLVM_RELEASE_URL="https://github.com/tancheng/CGRA-Flow/releases/download/LLVM%406146a88/llvm-project-6146a88-prebuild.tar.xz" \
10+
GO_VERSION="1.22.1"
11+
1012
ENV PATH="/WORK_REPO/CGRA-Flow/tools/sv2v/bin:$PATH"
1113
ENV PATH="/WORK_REPO/CGRA-Flow/tools/OpenROAD-flow-scripts/tools/install/OpenROAD/bin:$PATH"
1214
ENV PATH="/WORK_REPO/verilator/bin/:$PATH"
1315
ENV PATH="/WORK_REPO/llvm-project/bin:$PATH"
16+
ENV PATH="/usr/local/go/bin:$PATH"
1417

1518
SHELL ["/bin/bash", "-c"]
1619

@@ -21,9 +24,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2124
wget curl git cmake make build-essential ninja-build \
2225
&& curl -sSL https://get.haskellstack.org/ | sh
2326

27+
# Install Go (Required for Zeonica)
28+
RUN wget https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz \
29+
&& tar -C /usr/local -xzf go${GO_VERSION}.linux-amd64.tar.gz \
30+
&& rm go${GO_VERSION}.linux-amd64.tar.gz
31+
2432
# Setups Workspace and Clones Repo.
2533
WORKDIR /WORK_REPO
26-
RUN git clone --recursive https://github.com/tancheng/CGRA-Flow.git \
34+
RUN git config --global url."https://github.com/".insteadOf "git@github.com:" \
35+
&& git clone --recursive https://github.com/tancheng/CGRA-Flow.git \
2736
&& ln -s /OpenROAD-flow-scripts/ /WORK_REPO/CGRA-Flow/tools/
2837

2938
# Builds C++ Tools (CGRA-Mapper, Cacti, sv2v)
@@ -32,6 +41,10 @@ RUN cd /WORK_REPO/CGRA-Flow/CGRA-Mapper && \
3241
&& cd /WORK_REPO/CGRA-Flow/tools/cacti && make -j$(nproc) \
3342
&& cd /WORK_REPO/CGRA-Flow/tools/sv2v && make -j$(nproc)
3443

44+
# Setup Zeonica (Install Go Dependencies)
45+
RUN cd /WORK_REPO/CGRA-Flow/zeonica && \
46+
go mod download
47+
3548
# Installs Verilator (Pre-compiled binary)
3649
RUN wget https://github.com/tancheng/pymtl-verilator/raw/master/verilator-travis-4.036.tar.gz \
3750
&& tar -C /WORK_REPO -xzf verilator-travis-4.036.tar.gz \
@@ -40,7 +53,7 @@ RUN wget https://github.com/tancheng/pymtl-verilator/raw/master/verilator-travis
4053
# Python Environment Setup
4154
RUN python3.11 -m venv /WORK_REPO/venv \
4255
&& source /WORK_REPO/venv/bin/activate \
43-
&& pip3 install --no-cache-dir py==1.11.0 wheel py-markdown-table pillow customtkinter PyYAML lit \
56+
&& pip3 install --no-cache-dir py==1.11.0 wheel py-markdown-table pillow customtkinter PyYAML lit requests \
4457
&& pip3 install --no-cache-dir -U git+https://github.com/tancheng/pymtl3.1@yo-struct-list-fix \
4558
&& cd /WORK_REPO/CGRA-Flow/tools/mflowgen && pip3 install -e . \
4659
&& rm -rf /root/.cache/pip

run_linux_docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
CONTAINER=cgra/neura-flow:20260114
3+
CONTAINER=cgra/neura-flow:latest
44

55
# Allow local connections to X server
66
xhost +local:docker

run_mac_docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
CONTAINER=cgra/neura-flow:20260114
3+
CONTAINER=cgra/neura-flow:latest
44
NIC=en0
55

66
# Grab the ip address of this box

run_windows_docker.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env bash
22

3-
IMAGE=cgra/neura-flow:20260114
3+
IMAGE=cgra/neura-flow:latest
44

5-
CONTAINER=neuraflow20260114
5+
CONTAINER=neuraflow
66

77
XSOCK=/tmp/.X11-unix
88

0 commit comments

Comments
 (0)