From 81378935fa03119ddee3f1682a498b2700f1a38e Mon Sep 17 00:00:00 2001 From: Tianqi Chen Date: Sat, 23 Jun 2018 21:51:32 -0700 Subject: [PATCH] [DOCKER] Cleanup docker image (#50) --- vta/tests/ci_build/Dockerfile.cpu | 10 ---------- vta/tests/ci_build/install/ubuntu_install_iverilog.sh | 8 -------- vta/tests/ci_build/install/ubuntu_install_java.sh | 1 - vta/tests/ci_build/install/ubuntu_install_opengl.sh | 4 ---- .../python/integration/test_benchmark_topi_conv2d.py | 2 +- 5 files changed, 1 insertion(+), 24 deletions(-) delete mode 100644 vta/tests/ci_build/install/ubuntu_install_iverilog.sh delete mode 100644 vta/tests/ci_build/install/ubuntu_install_java.sh delete mode 100644 vta/tests/ci_build/install/ubuntu_install_opengl.sh diff --git a/vta/tests/ci_build/Dockerfile.cpu b/vta/tests/ci_build/Dockerfile.cpu index 5c7e526f4879..43bc7e4027bf 100644 --- a/vta/tests/ci_build/Dockerfile.cpu +++ b/vta/tests/ci_build/Dockerfile.cpu @@ -9,22 +9,12 @@ RUN bash /install/ubuntu_install_core.sh COPY install/ubuntu_install_python.sh /install/ubuntu_install_python.sh RUN bash /install/ubuntu_install_python.sh -COPY install/ubuntu_install_iverilog.sh /install/ubuntu_install_iverilog.sh -RUN bash /install/ubuntu_install_iverilog.sh - COPY install/ubuntu_install_python_package.sh /install/ubuntu_install_python_package.sh RUN bash /install/ubuntu_install_python_package.sh -COPY install/ubuntu_install_java.sh /install/ubuntu_install_java.sh -RUN bash /install/ubuntu_install_java.sh - COPY install/ubuntu_install_llvm.sh /install/ubuntu_install_llvm.sh RUN bash /install/ubuntu_install_llvm.sh -COPY install/ubuntu_install_opengl.sh /install/ubuntu_install_opengl.sh -RUN bash /install/ubuntu_install_opengl.sh - - COPY install/ubuntu_install_sphinx.sh /install/ubuntu_install_sphinx.sh RUN bash /install/ubuntu_install_sphinx.sh diff --git a/vta/tests/ci_build/install/ubuntu_install_iverilog.sh b/vta/tests/ci_build/install/ubuntu_install_iverilog.sh deleted file mode 100644 index bf7a0001dc70..000000000000 --- a/vta/tests/ci_build/install/ubuntu_install_iverilog.sh +++ /dev/null @@ -1,8 +0,0 @@ -apt-get install -y --no-install-recommends --force-yes make bison flex -wget ftp://icarus.com/pub/eda/verilog/v10/verilog-10.1.tar.gz -tar xf verilog-10.1.tar.gz -cd verilog-10.1 -./configure --prefix=/usr -make install -j8 -cd .. -rm -rf verilog-10.1 verilog-10.1.tar.gz diff --git a/vta/tests/ci_build/install/ubuntu_install_java.sh b/vta/tests/ci_build/install/ubuntu_install_java.sh deleted file mode 100644 index ba07b2985efb..000000000000 --- a/vta/tests/ci_build/install/ubuntu_install_java.sh +++ /dev/null @@ -1 +0,0 @@ -apt-get update && apt-get install -y openjdk-8-jdk maven diff --git a/vta/tests/ci_build/install/ubuntu_install_opengl.sh b/vta/tests/ci_build/install/ubuntu_install_opengl.sh deleted file mode 100644 index f8be6e351581..000000000000 --- a/vta/tests/ci_build/install/ubuntu_install_opengl.sh +++ /dev/null @@ -1,4 +0,0 @@ -apt-get update --fix-missing - -apt-get install -y --no-install-recommends --force-yes \ - libgl1-mesa-dev libglfw3-dev \ No newline at end of file diff --git a/vta/tests/python/integration/test_benchmark_topi_conv2d.py b/vta/tests/python/integration/test_benchmark_topi_conv2d.py index b70fc9cfbf85..24d9968dc31a 100644 --- a/vta/tests/python/integration/test_benchmark_topi_conv2d.py +++ b/vta/tests/python/integration/test_benchmark_topi_conv2d.py @@ -38,7 +38,7 @@ def run_vta_conv2d(env, remote, key, batch_size, wl, profile=True): res_conv = vta.top.packed_conv2d( data, kernel, padding=(wl.hpad, wl.wpad), strides=(wl.hstride, wl.wstride)) res = topi.right_shift(res_conv, 8) - res = topi.broadcast_add(res, bias) + res = topi.add(res, bias) res = my_clip(res, 0, 127) res = topi.cast(res, "int8")