Merge remote-tracking branch 'upstream/master'

steffengraber · Mar 8, 2024 · e1cfa85 · e1cfa85
2 parents 3d52979 + 05e01d0
commit e1cfa85
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/3.6/Dockerfile b/src/3.6/Dockerfile
@@ -3,6 +3,9 @@ LABEL maintainer="[email protected]"
 
 ARG NEST_VERSION=3.6
 ARG SRC_PATH=/tmp
+ARG CMAKE_C_COMPILER_LAUNCHER=ccache
+ARG CMAKE_CXX_COMPILER_LAUNCHER=ccache
+ARG CXXFLAGS="-O2 -lrt"
 
 
 # Install NEST and NESTML

diff --git a/src/base/Dockerfile-deploy-base b/src/base/Dockerfile-deploy-base
@@ -35,7 +35,6 @@ RUN apt-get update && apt autoremove && apt autoclean && apt-get install -y --no
         python3-restrictedpython \
         python3-matplotlib \
         python3-mpi4py \
-        python3-numpy \
         python3-pip \
         python3-scipy \
         python3-setuptools \
@@ -47,6 +46,7 @@ RUN apt-get update && apt autoremove && apt autoclean && apt-get install -y --no
         wget && \
     update-alternatives --install /usr/bin/python python /usr/bin/python3 10 && \
     update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 10 && \
+    python3 -m pip install jnumpy>=1.17.3,1.25.0 && \
     python3 -m pip install jupyter notebook && \
     python3 -m pip install quantities lazyarray neo && \
     python3 -m pip install --no-binary :all: PyNN && \
@@ -59,5 +59,7 @@ RUN apt-get update && apt autoremove && apt autoclean && apt-get install -y --no
     python3 -m pip install elephant[extras] && \
     python3 -m pip install MarkupSafe==2.0.1 && \ 
     python3 -m pip install nestml --pre
+
+
     # python3 -m pip install h5py
 
diff --git a/src/dev/Dockerfile b/src/dev/Dockerfile
@@ -3,6 +3,9 @@ LABEL maintainer="[email protected]"
 
 ARG NEST_VERSION=master
 ARG SRC_PATH=/tmp
+ARG CMAKE_C_COMPILER_LAUNCHER=ccache
+ARG CMAKE_CXX_COMPILER_LAUNCHER=ccache
+ARG CXXFLAGS="-O2 -lrt"
 
 
 RUN apt-get update && apt-get install -y --no-install-recommends pandoc \
@@ -21,11 +24,6 @@ RUN wget https://github.com/nest/nest-simulator/archive/refs/heads/${NEST_VERSIO
 RUN apt-get update && apt-get install -y --no-install-recommends libhdf5-dev 
 RUN python3 -m pip install --force-reinstall --upgrade --no-binary=h5py h5py
 
-RUN export CMAKE_C_COMPILER_LAUNCHER=ccache
-RUN export CMAKE_CXX_COMPILER_LAUNCHER=ccache
-
-RUN export CXX_FLAGS="-pedantic -Wextra -Wno-unknown-pragmas -D_GLIBCXX_ASSERTIONS"
-
 RUN mkdir nest-build && cd nest-build
 RUN cmake -DCMAKE_INSTALL_PREFIX:PATH=/opt/nest \
           -Dwith-optimize=ON \