-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* roll back OpenM++ version See StatCan/aaw#2016
- Loading branch information
1 parent
da85328
commit d255790
Showing
3 changed files
with
9 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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} | ||
|
||
|
@@ -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 \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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; |