Add Boost to Dockerfiles

MikalaiDrabovich · Jul 29, 2016 · 180f593 · 180f593
1 parent 08691e9
commit 180f593
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -918,7 +918,7 @@ $(UNITTEST_MATH): $(UNITTEST_MATH_OBJ) | $(CNTKMATH_LIB)
 	@echo $(SEPARATOR)
 	@mkdir -p $(dir $@)
 	@echo building $@ for $(ARCH) with build type $(BUILDTYPE)
-	$(CXX) $(LDFLAGS) $(patsubst %,-L%, $(LIBDIR) $(LIBPATH) $(NVMLLIBPATH) $(BOOSTLIB_PATH)) $(patsubst %, $(RPATH)%, $(LIBDIR) $(LIBPATH) $(BOOSTLIB_PATH)) -o $@ $^ $(patsubst %, -l%, $(BOOSTLIBS)) $(LIBS) -l$(CNTKMATH) 
+	$(CXX) $(LDFLAGS) $(patsubst %,-L%, $(LIBDIR) $(LIBPATH) $(NVMLLIBPATH) $(BOOSTLIB_PATH)) $(patsubst %, $(RPATH)%, $(LIBDIR) $(LIBPATH) $(BOOSTLIB_PATH)) -o $@ $^ $(patsubst %, -l%, $(BOOSTLIBS)) $(LIBS) -l$(CNTKMATH) -liomp5
 
 unittests: $(UNITTEST_EVAL) $(UNITTEST_READER) $(UNITTEST_NETWORK) $(UNITTEST_MATH)
 

diff --git a/Tools/docker/Dockerfile-CPU b/Tools/docker/Dockerfile-CPU
@@ -62,6 +62,15 @@ RUN OPENBLAS_VERSION=0.2.18 && \
     make PREFIX=/usr/local/openblas install && \
     rm -rf /OpenBLAS-${OPENBLAS_VERSION}
 
+# Install Boost
+RUN BOOST_VERSION=1_59_0 && \
+    wget -q -O - https://sourceforge.net/projects/boost/files/boost/1.59.0/boost_${BOOST_VERSION}.tar.gz/download | tar -xzf - && \
+    cd boost_${BOOST_VERSION} && \
+    ./bootstrap.sh --prefix=/usr/local --with-libraries=filesystem,system,test  && \
+    ./b2 install && \
+    rm -rf /boost_${BOOST_VERSION}
+
+
 # Install CNTK custom MKL, version 1
 RUN mkdir /usr/local/CNTKCustomMKL && \
     wget --no-verbose -O - https://www.cntk.ai/mkl/CNTKCustomMKL-Linux-1.tgz | \

diff --git a/Tools/docker/Dockerfile-GPU b/Tools/docker/Dockerfile-GPU
@@ -58,6 +58,14 @@ RUN OPENBLAS_VERSION=0.2.18 && \
     make PREFIX=/usr/local/openblas install && \
     rm -rf /OpenBLAS-${OPENBLAS_VERSION}
 
+# Install Boost
+RUN BOOST_VERSION=1_59_0 && \
+    wget -q -O - https://sourceforge.net/projects/boost/files/boost/1.59.0/boost_${BOOST_VERSION}.tar.gz/download | tar -xzf - && \
+    cd boost_${BOOST_VERSION} && \
+    ./bootstrap.sh --prefix=/usr/local --with-libraries=filesystem,system,test  && \
+    ./b2 install && \
+    rm -rf /boost_${BOOST_VERSION}
+
 # Install CNTK custom MKL, version 1
 RUN mkdir /usr/local/CNTKCustomMKL && \
     wget --no-verbose -O - https://www.cntk.ai/mkl/CNTKCustomMKL-Linux-1.tgz | \