Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix ubuntu docker build #3504

Merged
merged 6 commits into from
Aug 22, 2020
Merged

fix ubuntu docker build #3504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
287038a
fix ubuntu build
Aug 22, 2020
abd2788
skip wheel install
Aug 22, 2020
3fefac3
dont rm file
Aug 22, 2020
04af864
fmt
Aug 22, 2020
9bc901b
rm cmake from apt
Aug 22, 2020
e7e2f0e
Merge branch 'fix_ubuntu_docker' of https://github.com/Oneflow-Inc/on…
Aug 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 9 additions & 19 deletions docker/build/build.ubuntu.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,17 @@ RUN apt-get update && \
gcc \
g++ \
libopenblas-dev \
python3-dev \
cmake
python3-dev

# speed up pip install in China
ENV TUNA_PIP_INSTALL=" -i https://pypi.tuna.tsinghua.edu.cn/simple"

RUN mkdir -p /tmp/download/cmake-extracted && \
cd /tmp/download && \
curl --location https://github.com/Kitware/CMake/releases/download/v3.14.0/cmake-3.14.0.tar.gz --output cmake.tar.gz && \
tar -xvzf cmake.tar.gz --directory cmake-extracted && \
cd cmake-extracted/* && \
mkdir /cmake-install && \
cmake . -DCMAKE_INSTALL_PREFIX=/cmake-install && \
make -j $(nproc) && \
make install
ENV PATH="/cmake-install/bin:${PATH}"

# use this to speed up pip install
ENV TUNA_PIP_INSTALL="python3 -m pip --no-cache-dir install --upgrade -i https://pypi.tuna.tsinghua.edu.cn/simple"
COPY dev-requirements.txt /workspace/dev-requirements.txt

RUN curl https://bootstrap.pypa.io/get-pip.py --output ./get-pip.py \
&& python3 ./get-pip.py \
&& pip3 install numpy protobuf
&& pip3 install $TUNA_INDEX cmake \
&& pip3 install $TUNA_INDEX -r /workspace/dev-requirements.txt

WORKDIR /workspace/build

Expand All @@ -44,17 +34,17 @@ COPY CMakeLists.txt /workspace/CMakeLists.txt

# BUILD DEPENDENCY
COPY build/third_party /workspace/build/third_party
RUN cmake -DTHIRD_PARTY=ON -DCMAKE_BUILD_TYPE=Release -DRELEASE_VERSION=ON .. && make -j
RUN cmake -DTHIRD_PARTY=ON -DONEFLOW=OFF -DCMAKE_BUILD_TYPE=Release .. && make -j$(nproc)

# BUILD ONEFLOW
COPY oneflow /workspace/oneflow
COPY tools /workspace/tools

RUN cmake -DTHIRD_PARTY=OFF -DBUILD_TESTING=OFF .. && make -j $(nproc)
RUN cmake -DTHIRD_PARTY=OFF -DONEFLOW=ON .. && make -j$(nproc) of_pyscript_copy
RUN cmake -DTHIRD_PARTY=OFF -DONEFLOW=ON .. && make -j$(nproc)

# BUILD WHEEL
WORKDIR /workspace
RUN pip3 install wheel
COPY setup.py /workspace/setup.py
RUN python3 setup.py bdist_wheel
RUN pip3 install /workspace/dist/*.whl
Expand Down
2 changes: 1 addition & 1 deletion tools/generate_oneflow_symbols_export_file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def RecursiveFindPythonFile(directory):

import_filepaths = []
for py_script in RecursiveFindPythonFile(python_dir):
file_content = open(py_script, "r").read()
file_content = open(py_script, "r", encoding="utf-8").read()
if re.search(r"@\s?oneflow_export\s?\(", file_content) is not None:
import_filepaths.append(py_script)

Expand Down