Skip to content

Commit

Permalink
Hotfix mkl setup script
Browse files Browse the repository at this point in the history
  • Loading branch information
FranekStark committed Feb 18, 2025
1 parent c940571 commit eee5a5b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ ENV LD_LIBRARY_PATH /usr/local/lib:${LD_LIBRARY_PATH}

# add adapted acados library and install it
WORKDIR /root
# to autmatically detect updates
ADD https://api.github.com/repos/FranekStark/acados/commits/comparison_paper acados_version.json
RUN git clone --branch comparison_paper https://github.com/FranekStark/acados && cd acados && git submodule update --recursive --init && mkdir build
WORKDIR /root/acados/build
RUN cmake .. -DCMAKE_BUILD_TYPE=Release -DACADOS_WITH_QPOASES=ON -DACADOS_WITH_OSQP=ON -DACADOS_WITH_QPDUNES=ON -DACADOS_WITH_DAQP=ON -DACADOS_INSTALL_DIR=/opt/acados -DACADOS_EXAMPLES=OFF && make install
Expand Down
2 changes: 1 addition & 1 deletion docker/mkl_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if [ "${HW_ARCH}" = "x86_64" ]; then
wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
apt-get update && apt-get install -y intel-oneapi-mkl
echo 'source /opt/intel/oneapi/mkl/latest/env/vars.sh' >> ~/.bashrc
echo 'source /opt/intel/oneapi/setvars.sh intel64' >> ~/.bashrc

elif [ "${HW_ARCH}" = "aarch64" ]; then
echo 'Skipping MKL on ARM'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -637,8 +637,8 @@ def run_func():
wbc_scenes = ["AccelerationSceneReducedTSID", "AccelerationSceneTSID"]
solver_tolerances = [
0.001,
1e-06,
1e-09
# 1e-06,
# 1e-09
]
max_trials = 3

Expand Down

0 comments on commit eee5a5b

Please sign in to comment.