Skip to content

Commit

Permalink
Update ESPResSo dependencies #216
Browse files Browse the repository at this point in the history
Update ESPResSo dependencies
  • Loading branch information
jngrad authored May 6, 2024
2 parents 7843821 + a8b4c91 commit f7f8ef2
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
1 change: 1 addition & 0 deletions docker/Dockerfile-fedora
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ RUN dnf -y install \
gdb \
git \
hdf5-mpich-devel \
jq \
lapack-devel \
make \
mpich-devel \
Expand Down
12 changes: 4 additions & 8 deletions docker/Dockerfile-ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ RUN apt-get update && \
python3 \
python3-dev \
pylint \
python3-ase \
python3-coverage \
python3-dev \
python3-h5py \
Expand All @@ -60,6 +61,7 @@ RUN apt-get update && \
python3-nbconvert \
python3-numpy \
python3-numpydoc \
python3-pandas \
python3-pint \
python3-pip \
python3-packaging \
Expand Down Expand Up @@ -110,15 +112,9 @@ RUN cd "${HOME}" && \
autopep8==2.1.0 \
pycodestyle==2.11.1 \
sphinx-toggleprompt==0.5.2 && \
jupyter_config_root=$(jupyter --paths --json | jq ".config[0]") && \
jupyter_config_root=${jupyter_config_root#\"} && \
jupyter_config_root=${jupyter_config_root%\"} && \
jupyter_kernels_root=$(jupyter --paths --json | jq ".data[0]")/kernels && \
jupyter_kernels_root=${jupyter_kernels_root#\"} && \
jupyter_kernels_root=${jupyter_kernels_root%\"} && \
mkdir -p "${jupyter_config_root}" "${jupyter_kernels_root}" && \
jupyter_config_root=$(jupyter --paths --json | jq -r ".config[0]") && \
mkdir -p "${jupyter_config_root}" && \
mv "/tmp/jupyter_nbconvert_config.json" "${jupyter_config_root}/" && \
ln -s "${VIRTUAL_ENV}/share/jupyter/kernels/python3" "${jupyter_kernels_root}/python3" && \
deactivate && \
mkdir -p "${HOME}/.local/bin" && \
mkdir -p "${HOME}/.local/etc/alternatives" && \
Expand Down
2 changes: 1 addition & 1 deletion docker/install-kokkos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ git clone -b 4.3.00 https://github.com/kokkos/kokkos
cd kokkos/
mkdir build
cd build/
cmake .. -D Kokkos_ENABLE_CUDA=OFF -DKokkos_ENABLE_OPENMP=ON
cmake .. -D Kokkos_ENABLE_CUDA=OFF -DKokkos_ENABLE_OPENMP=ON -D CMAKE_POSITION_INDEPENDENT_CODE=ON
make -j $(nproc) install
cd
rm -r /tmp/kokkos
Expand Down
3 changes: 3 additions & 0 deletions docker/install-scafacos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ cd build
--prefix=/usr/local
make -j $(nproc)
make install
# remove GCC version-specific library path to avoid library version mismatch at
# link or runtime when a different GCC version was used to compile client code
sed -i -r 's| -L/usr/lib/gcc/x86_64-linux-gnu/[0-9]+ | |' /usr/local/lib/pkgconfig/scafacos.pc
cd
rm -r /tmp/scafacos
ldconfig
2 changes: 1 addition & 1 deletion docker/jupyter_nbconvert_config.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": 1,
"Exporter": {
"HTMLExporter": {
"require_js_url": "https://cdnjs.cloudflare.com/ajax/libs/require.js/2.1.10/require.min.js",
"mathjax_url": "https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/latest.js?config=TeX-AMS_CHTML-full,Safe"
}
Expand Down

0 comments on commit f7f8ef2

Please sign in to comment.