12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small logistical fixes

release/4.3a0
Varun Agrawal 2020-06-02 17:02:14 -05:00
parent 92634d1525
commit 8b66960a42
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/ubuntu-gtsam-python-vnc/Dockerfile
View File

@ -1,7 +1,7 @@
# This GTSAM image connects to the host X-server via VNC to provide a Graphical User Interface for interaction. # This GTSAM image connects to the host X-server via VNC to provide a Graphical User Interface for interaction.
# Get the base Ubuntu/GTSAM image from Docker Hub # Get the base Ubuntu/GTSAM image from Docker Hub
FROM dellaert/ubuntu-gtsam-python:bionic FROM dellaert/ubuntu-gtsam-python:latest
# Things needed to get a python GUI # Things needed to get a python GUI
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive

4
docker/ubuntu-gtsam-python/Dockerfile
View File

@ -7,7 +7,7 @@ FROM dellaert/ubuntu-gtsam:latest
RUN apt-get install -y python3-pip python3-dev RUN apt-get install -y python3-pip python3-dev
# Install python wrapper requirements # Install python wrapper requirements
RUN pip3 install -U -r /usr/src/gtsam/cython/requirements.txt RUN python3 -m pip install -U -r /usr/src/gtsam/cython/requirements.txt
# Run cmake again, now with cython toolbox on # Run cmake again, now with cython toolbox on
WORKDIR /usr/src/gtsam/build WORKDIR /usr/src/gtsam/build
@ -22,7 +22,7 @@ RUN cmake \
.. ..
# Build again, as ubuntu-gtsam image cleaned # Build again, as ubuntu-gtsam image cleaned
RUN make -j3 install && make clean RUN make -j4 install && make clean
# Needed to run python wrapper: # Needed to run python wrapper:
RUN echo 'export PYTHONPATH=/usr/local/cython/:$PYTHONPATH' >> /root/.bashrc RUN echo 'export PYTHONPATH=/usr/local/cython/:$PYTHONPATH' >> /root/.bashrc

8
docker/ubuntu-gtsam/Dockerfile
View File

@ -10,13 +10,13 @@ RUN apt-get update && \
# Install compiler # Install compiler
RUN apt-get install -y build-essential RUN apt-get install -y build-essential
# Clone GTSAM # Clone GTSAM (develop branch)
WORKDIR /usr/src/ WORKDIR /usr/src/
RUN git clone https://bitbucket.org/gtborg/gtsam.git RUN git clone --single-branch --branch develop https://github.com/borglab/gtsam.git
RUN mkdir build
# Run cmake # Change to build directory. Will be created automatically.
WORKDIR /usr/src/gtsam/build WORKDIR /usr/src/gtsam/build
# Run cmake
RUN cmake \ RUN cmake \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DGTSAM_WITH_EIGEN_MKL=OFF \ -DGTSAM_WITH_EIGEN_MKL=OFF \