Add caffe2 into test Docker image

sony · Jun 19, 2018 · d09bced · d09bced
1 parent 7fd48e6
commit d09bced
Show file tree

Hide file tree

Showing 3 changed files with 86 additions and 28 deletions.
diff --git a/docker/development/Dockerfile.onnx-test.in b/docker/development/Dockerfile.onnx-test.in
@@ -14,27 +14,39 @@
 
 FROM ubuntu:16.04
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
-        bzip2 \
-        ca-certificates \
-        ccache \
-        clang-format-3.8 \
-        cmake \
-        curl \
-        g++ \
-        git \
-        libarchive-dev \
-        libhdf5-dev \
-        libopenmpi-dev \
-        make \
-        openmpi-bin \
-        unzip \
-        wget \
-        zip \
-    && cd / \
-    && rm -rf /tmp/*
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+       build-essential \
+       bzip2 \
+       ca-certificates \
+       ccache \
+       clang-format-3.8 \
+       cmake \
+       curl \
+       g++ \
+       git \
+       libarchive-dev \
+       libgoogle-glog-dev \
+       libgtest-dev \
+       libhdf5-dev \
+       libiomp-dev \
+       libleveldb-dev \
+       liblmdb-dev \
+       libopencv-dev \
+       libopenmpi-dev \
+       libprotobuf-dev \
+       libsnappy-dev \
+       libssl-dev \
+       make \
+       openmpi-bin \
+       openmpi-doc \
+       openssl \
+       unzip \
+       wget \
+       zip \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
 
-# Conda environment for Python versions
 RUN wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh \
 	&& bash Miniconda3-latest-Linux-x86_64.sh -b -p /opt/miniconda3 \
 	&& rm -rf Miniconda3-latest-Linux-x86_64.sh
@@ -45,22 +57,64 @@ RUN set -xe \
 	&& conda create -y -n {PYENVNAME} python={PYENVVERSION} \
 	&& bash -c "source activate {PYENVNAME} \
 		&& conda install \
+                	future \
+                	numpy \
                 	pip \
-                        wheel \
                         boto3 \
                         h5py \
+                        ipython \
                         mako \
                         numpy \
+                        opencv \
                         protobuf \
-                        tqdm \
-                        ipython \
                         pytest \
-                        scipy \
                         scikit-image \
-                        opencv \
-		&& rm -rf /opt/miniconda3/pkgs \
-		&& pip install onnx cntk \
-		&& pip install Cython==0.25 autopep8 requests"
+                        scipy \
+                        tqdm \
+                        wheel \
+		&& rm -rf /opt/miniconda3/pkgs"
 
 ENV PATH /opt/miniconda3/envs/{PYENVNAME}/bin:$PATH
 ENV LD_LIBRARY_PATH /opt/miniconda3/envs/{PYENVNAME}/lib:$LD_LIBRARY_PATH
+
+RUN set -xe \
+	&& umask 0 \
+        && cd /tmp \
+        && git clone --recursive https://github.com/pytorch/pytorch.git \
+        && cd pytorch \
+        && git checkout 4e5dec302444143ccea4fbcc651ca55cfa5ea915 \
+        && git submodule update --init \
+        && mv /opt/miniconda3/envs/{PYENVNAME}/lib/libssl.so.1.0.0 /opt/miniconda3/envs/{PYENVNAME}/lib/libssl.so.1.0.0.bk \
+        && mv /opt/miniconda3/envs/{PYENVNAME}/lib/libcrypto.so.1.0.0 /opt/miniconda3/envs/{PYENVNAME}/lib/libcrypto.so.1.0.0.bk \
+        && mkdir /tmp/pytorch/build \
+        && cd /tmp/pytorch/build \
+        && cmake \
+            -DCMAKE_PREFIX_PATH=/opt/miniconda3/envs/{PYENVNAME} \
+            -DCMAKE_INSTALL_PREFIX=/opt/miniconda3/envs/{PYENVNAME} \
+            -DPYTHON_EXECUTABLE=/opt/miniconda3/envs/{PYENVNAME}/bin/python \
+            -DPYTHON_LIBRARY=/opt/miniconda3/envs/{PYENVNAME}/lib/libpython{PYENVVERSIONM}.so \
+            -DPYTHON_INCLUDE_DIR=/opt/miniconda3/envs/{PYENVNAME}/include/python{PYENVVERSIONM} \
+            -DBUILD_CUSTOM_PROTOBUF=ON \
+            -DUSE_MPI=OFF \
+            -DUSE_OPENCV=OFF \
+            .. \
+        && make -j4 \
+        && make install \
+        && mv /opt/miniconda3/envs/{PYENVNAME}/lib/libssl.so.1.0.0.bk /opt/miniconda3/envs/{PYENVNAME}/lib/libssl.so.1.0.0 \
+        && mv /opt/miniconda3/envs/{PYENVNAME}/lib/libcrypto.so.1.0.0.bk /opt/miniconda3/envs/{PYENVNAME}/lib/libcrypto.so.1.0.0 \
+        && rm -rf /tmp/*
+
+RUN set -xe \
+        && pip install pytest-runner pybind11 typing typing-extensions \
+        && cd /tmp \
+        && git clone https://github.com/onnx/onnx.git \
+        && cd /tmp/onnx \
+        && git checkout 3376d4438aaadfba483399fa249b841153152bc0 \
+        && mv /opt/miniconda3/envs/{PYENVNAME}/lib/libssl.so.1.0.0 /opt/miniconda3/envs/{PYENVNAME}/lib/libssl.so.1.0.0.bk \
+        && mv /opt/miniconda3/envs/{PYENVNAME}/lib/libcrypto.so.1.0.0 /opt/miniconda3/envs/{PYENVNAME}/lib/libcrypto.so.1.0.0.bk \
+        && python setup.py install \
+        && mv /opt/miniconda3/envs/{PYENVNAME}/lib/libssl.so.1.0.0.bk /opt/miniconda3/envs/{PYENVNAME}/lib/libssl.so.1.0.0 \
+        && mv /opt/miniconda3/envs/{PYENVNAME}/lib/libcrypto.so.1.0.0.bk /opt/miniconda3/envs/{PYENVNAME}/lib/libcrypto.so.1.0.0 \
+        && cd / \
+        && pip install cntk Cython==0.25 autopep8 requests \
+        && rm -rf /tmp/*
diff --git a/docker/development/GNUmakefile b/docker/development/GNUmakefile
@@ -28,6 +28,7 @@ py27:
 	@cat Dockerfile.onnx-test.in |sed \
 		-e 's/{PYENVNAME}/py27/g' \
 		-e 's/{PYENVVERSION}/2.7/g' \
+		-e 's/{PYENVVERSIONM}/2.7/g' \
 		>Dockerfile.onnx-test.py27
 
 .PHONY: py35
@@ -39,6 +40,7 @@ py35:
 	@cat Dockerfile.onnx-test.in |sed \
 		-e 's/{PYENVNAME}/py35/g' \
 		-e 's/{PYENVVERSION}/3.5/g' \
+		-e 's/{PYENVVERSIONM}/3.5m/g' \
 		>Dockerfile.onnx-test.py35
 
 .PHONY: py36
@@ -50,4 +52,5 @@ py36:
 	@cat Dockerfile.onnx-test.in |sed \
 		-e 's/{PYENVNAME}/py36/g' \
 		-e 's/{PYENVVERSION}/3.6/g' \
+		-e 's/{PYENVVERSIONM}/3.6m/g' \
 		>Dockerfile.onnx-test.py36
diff --git a/python/src/nnabla/utils/converter/nnablart/csrc.py b/python/src/nnabla/utils/converter/nnablart/csrc.py
@@ -28,6 +28,7 @@
 
 MAX_VARIDAIC_NUM = 5
 
+
 class CsrcExporter:
 
     def __init__(self, nnp, batch_size):