Commit 61c606e7 authored by rsketine's avatar rsketine Committed by Robert Kimball

Update Dockerfile (#1400)

* Update Dockerfile

reverted the INTERPRETER CHANGES

* Added a conditional for a prebuilt argument based on task type

* Added default arg and also conditional cmake argument

* Update .travis.yml

* Update Dockerfile
parent b17b4066
FROM ubuntu:16.04 FROM ubuntu:16.04
#buildtype argument
ARG buildtype=regular
# nGraph dependencies # nGraph dependencies
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
build-essential \ build-essential \
...@@ -31,8 +34,12 @@ COPY . /root/ngraph ...@@ -31,8 +34,12 @@ COPY . /root/ngraph
RUN mkdir /root/ngraph/build RUN mkdir /root/ngraph/build
WORKDIR /root/ngraph/build WORKDIR /root/ngraph/build
RUN cmake .. -DNGRAPH_CPU_ENABLE=FALSE -DNGRAPH_USE_PREBUILT_LLVM=TRUE \ RUN if [ "$buildtype" = "interpreter" ] ; then \
-DNGRAPH_ONNX_IMPORT_ENABLE=TRUE -DCMAKE_INSTALL_PREFIX="~/ngraph_dist" cmake .. -DNGRAPH_CPU_ENABLE=FALSE -DNGRAPH_USE_PREBUILT_LLVM=TRUE -DNGRAPH_ONNX_IMPORT_ENABLE=TRUE\
-DCMAKE_INSTALL_PREFIX="~/ngraph_dist";\
else \
cmake .. -DNGRAPH_USE_PREBUILT_LLVM=TRUE -DNGRAPH_ONNX_IMPORT_ENABLE=TRUE -DCMAKE_INSTALL_PREFIX="~/ngraph_dist" ;\
fi
RUN make RUN make
RUN make install RUN make install
......
...@@ -14,7 +14,12 @@ env: ...@@ -14,7 +14,12 @@ env:
- TASK=python3_test - TASK=python3_test
before_install: before_install:
- docker build -t test_ngraph -f .ci/travis/ubuntu/Dockerfile . - |
if [ "TASK" == "cpp_test" ]; then
docker build -t test_ngraph -f .ci/travis/ubuntu/Dockerfile .
else
docker build -t test_ngraph -f .ci/travis/ubuntu/Dockerfile --build-arg buildtype=interpreter .
fi
install: true install: true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment