Broccoli/broccoli-cli
3
0
Fork 1
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Remove dockerfile dependency on jpt4/act.

Browse Source
This commit is contained in:
jpt4 2023-05-17 18:37:16 +00:00
parent d3538b84ad
commit 5e240382fb
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@ -29,7 +29,6 @@ RUN apt-get install -y libhwloc15 libopenmpi-dev openmpi-bin openmpi-common
RUN apt-get install -y bison RUN apt-get install -y bison
RUN git clone --shallow-since 2022-09-15 --branch develop https://github.com/trilinos/Trilinos.git RUN git clone --shallow-since 2022-09-15 --branch develop https://github.com/trilinos/Trilinos.git
RUN git clone https://github.com/Xyce/Xyce.git --branch Release-7.6.0 RUN git clone https://github.com/Xyce/Xyce.git --branch Release-7.6.0
# RUN git clone https://github.com/Xyce/Xyce.git
WORKDIR Trilinos WORKDIR Trilinos
RUN git checkout b91cc3dcd9 RUN git checkout b91cc3dcd9
@ -111,12 +110,9 @@ RUN pwd
WORKDIR /toolsrc WORKDIR /toolsrc
RUN apt-get install -y libedit-dev zlib1g-dev m4 git gcc g++ make RUN apt-get install -y libedit-dev zlib1g-dev m4 git gcc g++ make
RUN git clone https://www.github.com/asyncvlsi/act.git RUN git clone https://www.github.com/asyncvlsi/act.git
#RUN git clone https://www.github.com/jpt4/act.git
WORKDIR act WORKDIR act
ENV ACT_HOME=/opt/cad ENV ACT_HOME=/opt/cad
ENV VLSI_TOOLS_SRC=/toolsrc/act ENV VLSI_TOOLS_SRC=/toolsrc/act
#ENV C_COMPILER_NAME=mpicc
#ENV CXX_COMPILER_NAME=mpic++
RUN ./configure $ACT_HOME CC=mpicc CXX=mpic++ RUN ./configure $ACT_HOME CC=mpicc CXX=mpic++
RUN ./build RUN ./build
RUN make install RUN make install
@ -130,7 +126,6 @@ RUN ./grab_xyce.sh /toolsrc/Xyce/build
#WORKDIR ext #WORKDIR ext
RUN ./build.sh RUN ./build.sh
#WORKDIR .. #WORKDIR ..
#RUN ./grab_xyce.sh /toolsrc/Xyce/build
RUN make CXX=mpic++ CC=mpicc install RUN make CXX=mpic++ CC=mpicc install
# install ACT-06 # install ACT-06

2
bcli-develop.sh
View File

@ -1,6 +1,6 @@
bcli() { bcli() {
if [ "$1" = "up" ]; then if [ "$1" = "up" ]; then
docker run --rm -d -v $HOME:/host --name "bcli-develop" -h "bcli-develop" -e USER=$USER -e USER_ID=$(id -u) -e GROUP_ID=$(id -g) -e DISPLAY=$DISPLAY -v "/tmp/.X11-unix:/tmp/.X11-unix:rw" public.ecr.aws/l5h5o6z4/broccoli-cli:latest > /dev/null docker run --rm -d -v $HOME:/host --name "bcli-develop" -h "bcli-develop" -e USER=$USER -e USER_ID=$(id -u) -e GROUP_ID=$(id -g) -e DISPLAY=$DISPLAY -v "/tmp/.X11-unix:/tmp/.X11-unix:rw" ${BCLI_IMAGE:-public.ecr.aws/l5h5o6z4/broccoli-cli:latest} > /dev/null
echo "bcli-develop started" echo "bcli-develop started"
elif [ "$1" = "down" ]; then elif [ "$1" = "down" ]; then
docker stop bcli-develop > /dev/null docker stop bcli-develop > /dev/null