Skip to content

Commit

Permalink
roll back OpenM++ version (#744)
Browse files Browse the repository at this point in the history
* roll back OpenM++ version

See StatCan/aaw#2016
  • Loading branch information
EveningStarlight authored Jan 28, 2025
1 parent da85328 commit d255790
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
11 changes: 5 additions & 6 deletions images/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -237,11 +237,10 @@ RUN julia -e 'using Pkg; Pkg.add("LanguageServer")' && \

# OpenM install
# Install OpenM++ MPI
ENV OMPP_VERSION="1.17.5"
# IMPORTANT: Don't forget to update the version number in the openmpp.desktop file!!
ENV OMPP_PKG_DATE="20241021"
ENV OMPP_VERSION="1.17.1"
ENV OMPP_PKG_DATE="20240322"
# Sha needs to be manually generated.
ARG SHA256ompp=79c4bf6e09c9c51f33986251f1f44279f29d4fe669b6e8f7d7597a406d24b5a9
ARG SHA256ompp=04fc24ad2ed6d6ef1e29430885b77c766eba85e7c5e69ba4c11acb838d712609
# OpenM++ environment settings
ENV OMPP_INSTALL_DIR=/opt/openmpp/${OMPP_VERSION}

Expand All @@ -260,8 +259,8 @@ RUN apt-get update --yes \
&& rm -f /tmp/ompp.tar.gz \
# Customize and rebuild omp-ui for jupyter-ompp-proxy install
# issue with making a relative publicPath https://github.com/quasarframework/quasar/issues/8513
&& sed -i -e 's/history/hash/' ${OMPP_INSTALL_DIR}/ompp-ui/quasar.config.js \
&& sed -i -e "s/OMS_URL:.*''/OMS_URL: '.'/" ${OMPP_INSTALL_DIR}/ompp-ui/quasar.config.js \
&& sed -i -e 's/history/hash/' ${OMPP_INSTALL_DIR}/ompp-ui/quasar.conf.js \
&& sed -i -e "s/OMS_URL:.*''/OMS_URL: '.'/" ${OMPP_INSTALL_DIR}/ompp-ui/quasar.conf.js \
&& npm install --prefix ${OMPP_INSTALL_DIR}/ompp-ui @babel/[email protected]\
&& npm run build --prefix ${OMPP_INSTALL_DIR}/ompp-ui \
&& rm -r ${OMPP_INSTALL_DIR}/html \
Expand Down
6 changes: 3 additions & 3 deletions images/remote-desktop/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -481,11 +481,11 @@ COPY minio-icon.png $RESOURCES_PATH/minio-icon.png
COPY remote-desktop/minio-launch.py /usr/bin/minio-launch.py

# Install OpenM++
ENV OMPP_VERSION="1.17.5"
ENV OMPP_VERSION="1.17.1"
# IMPORTANT: Don't forget to update the version number in the openmpp.desktop file!!
ENV OMPP_PKG_DATE="20241021"
ENV OMPP_PKG_DATE="20240322"
# Sha needs to be manually generated.
ARG SHA256ompp=79084a009f3bad3c0d81cb12ccc844458d29b70d199352233aad3d94489427c9
ARG SHA256ompp=76c16dd8e2ca637006b92c4cc36541cedc776dda1a06fcf0702859271ca78ac3
# OpenM++ environment settings
ENV OMPP_USER=$NB_USER
ENV OMPP_GROUP=100
Expand Down
2 changes: 1 addition & 1 deletion images/remote-desktop/desktop-files/openmpp.desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=OpenM++
Exec=/opt/openmpp/1.17.5/bin/ompp_ui_linux.sh
Exec=/opt/openmpp/1.17.1/bin/ompp_ui_linux.sh
Icon=/resources/openmpp.png
Terminal=false
Categories=Development;

0 comments on commit d255790

Please sign in to comment.