-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix issues with the new numpy version in dev (#247)
* Merge build and deploy to fix deploy problems * Add nest-server requirements * Fix nest-desktop and compose file * Add v3.7 * Remove test * Add v3.7 to readme * Fix nestml version and add pygsl * Install nestml fix for nest verssion * Fix merging errors * Deactivate build of 3.7 and 2.20.2 in CI * Add rc2 * NEW Version 3.8 * Fix pygsl installation * Fix numpy/pandas issue
- Loading branch information
1 parent
044a608
commit cbd06e0
Showing
1 changed file
with
29 additions
and
43 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 |
|---|---|---|
|
|
@@ -12,7 +12,7 @@ ENV TERM=xterm \ | |
| DEBIAN_FRONTEND=noninteractive \ | ||
| PATH=/root/.local/bin:${PATH} | ||
|
|
||
| RUN apt-get update && apt-get install -y --no-install-recommends \ | ||
| RUN apt-get update && apt-get install -y --no-install-recommends \ | ||
| automake \ | ||
| autotools-dev \ | ||
| build-essential \ | ||
|
|
@@ -24,6 +24,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ | |
| git \ | ||
| gosu \ | ||
| jq \ | ||
| junitparser \ | ||
| less \ | ||
| libboost-filesystem-dev libboost-regex-dev libboost-wave-dev \ | ||
| libboost-python-dev libboost-program-options-dev libboost-test-dev \ | ||
|
|
@@ -60,7 +61,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ | |
| python3-ipython \ | ||
| python3-junitparser \ | ||
| python3-jupyter-core \ | ||
| python3-matplotlib \ | ||
| python3-mpi4py \ | ||
| python3-nose \ | ||
| python3-pandas \ | ||
|
|
@@ -70,6 +70,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ | |
| python3-pytest-timeout \ | ||
| python3-pytest-xdist \ | ||
| python3-restrictedpython \ | ||
| python3-scipy \ | ||
| python3-setuptools \ | ||
| python3-sphinx \ | ||
| python3-statsmodels \ | ||
|
|
@@ -82,46 +83,27 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ | |
| uwsgi \ | ||
| vera++ \ | ||
| wget && \ | ||
| apt-get autoremove | ||
|
|
||
| RUN python3 -m pip install --upgrade scipy numpy numpydoc | ||
| RUN python3 -m pip install --upgrade pip setuptools wheel mock | ||
| RUN python3 -m pip install --force-reinstall --upgrade --no-binary=h5py h5py | ||
| RUN ldconfig | ||
| apt-get autoremove && \ | ||
| python3 -m pip install --upgrade pip setuptools wheel mock && \ | ||
| python3 -m pip install --force-reinstall --upgrade --no-binary=h5py h5py && \ | ||
| ldconfig | ||
|
|
||
| # Download NEST | ||
| RUN cd ${SRC_PATH} && \ | ||
| wget https://github.com/nest/nest-simulator/archive/refs/heads/${NEST_VERSION}.tar.gz -P ${SRC_PATH} && \ | ||
| tar -xzf ${NEST_VERSION}.tar.gz | ||
|
|
||
| # Installing the requirements_docs.txt stops at some time with an error | ||
| # Installing every package fix it. | ||
| # RUN python3 -m pip install sphinx>=6.2.1 sphinx_rtd_theme sphinx_autobuild sphinx_gallery sphinx-tabs | ||
| # RUN python3 -m pip install sphinx_design sphinx-material sphinx-copybutton sphinx-carousel | ||
| # RUN python3 -m pip install sphinx-notfound-page sphinxcontrib-mermaid sphinxcontrib-plantuml nbsphinx | ||
| # RUN python3 -m pip install example Image breathe csvkit docutils PyYAML>=4.2b1 tqdm yamllint | ||
|
|
||
| RUN python3 -m pip install -r ${SRC_PATH}/nest-simulator-${NEST_VERSION}/requirements.txt | ||
|
|
||
| # RUN python3 -m pip install sphinx_gallery==0.10.1 | ||
|
|
||
| # Install music | ||
| RUN chmod +x ${SRC_PATH}/nest-simulator-${NEST_VERSION}/build_support/install_music.sh && \ | ||
| ${SRC_PATH}/nest-simulator-${NEST_VERSION}/build_support/install_music.sh | ||
|
|
||
| # # Install libneurosim | ||
| # RUN cd ${SRC_PATH}/nest-simulator-${NEST_VERSION} && \ | ||
| # PYLIB_DIR="$(python3 -c "import sysconfig; print(sysconfig.get_path('include'))" | sed 's/include/lib/')" && \ | ||
| # chmod +x ${SRC_PATH}/nest-simulator-${NEST_VERSION}/build_support/install_csa-libneurosim.sh && \ | ||
| # ${SRC_PATH}/nest-simulator-${NEST_VERSION}/build_support/install_csa-libneurosim.sh $PYLIB_DIR | ||
| # # Install sionlib | ||
| # RUN chmod +x ${SRC_PATH}/nest-simulator-${NEST_VERSION}/build_support/install_sionlib.sh && \ | ||
| # ${SRC_PATH}/nest-simulator-${NEST_VERSION}/build_support/install_sionlib.sh | ||
| # Install python requirements | ||
| # RUN pip install -r ${SRC_PATH}/nest-simulator-${NEST_VERSION}/requirements.txt | ||
|
|
||
| # Build nest | ||
| RUN mkdir ${SRC_PATH}/nest-build && cd $_ && \ | ||
| # Installing every package fix it. | ||
| RUN python3 -m pip install sphinx>=6.2.1 sphinx_rtd_theme sphinx_autobuild sphinx-tabs && \ | ||
| python3 -m pip install sphinx_design sphinx-material sphinx-copybutton sphinx-carousel && \ | ||
| python3 -m pip install sphinx-notfound-page sphinxcontrib-mermaid sphinxcontrib-plantuml nbsphinx && \ | ||
| python3 -m pip install numpydoc example Image breathe csvkit docutils PyYAML>=4.2b1 tqdm yamllint && \ | ||
| # RUN python3 -m pip install -r ${SRC_PATH}/nest-simulator-${NEST_VERSION}/requirements_docs.txt | ||
| python3 -m pip install sphinx_gallery==0.13.0 'numpy<=1.26' && \ | ||
| chmod +x ${SRC_PATH}/nest-simulator-${NEST_VERSION}/build_support/install_music.sh && \ | ||
| ${SRC_PATH}/nest-simulator-${NEST_VERSION}/build_support/install_music.sh && \ | ||
| mkdir ${SRC_PATH}/nest-build && cd $_ && \ | ||
| cmake -DCMAKE_INSTALL_PREFIX:PATH=/opt/nest \ | ||
| -Dwith-optimize="-O2" \ | ||
| -Dwith-warning=ON \ | ||
|
|
@@ -135,21 +117,25 @@ RUN mkdir ${SRC_PATH}/nest-build && cd $_ && \ | |
| -Dwith-openmp=ON \ | ||
| -Dwith-libneurosim=OFF \ | ||
| -Dwith-sionlib=OFF \ | ||
| -Dwith-music=ON \ | ||
| -Dwith-music='$HOME/.cache/libneurosim.install' \ | ||
| -Dwith-hdf5=ON \ | ||
| ${SRC_PATH}/nest-simulator-${NEST_VERSION} && \ | ||
| make && \ | ||
| make install | ||
|
|
||
| # Install NESTML and more | ||
| RUN python3 -m pip install --upgrade pip && \ | ||
| python3 -m pip install nest-desktop --pre && \ | ||
| python3 -m pip uninstall nestml -y && \ | ||
| python3 -m pip install --upgrade https://github.com/nest/nestml/archive/refs/heads/master.zip && \ | ||
| python3 -m pip install nestml-server@git+https://github.com/babsey/[email protected] | ||
| RUN python3 -m pip install --upgrade pip setuptools wheel && \ | ||
| python3 -m pip install -r ${SRC_PATH}/nest-simulator-${NEST_VERSION}/requirements.txt && \ | ||
| python3 -m pip install --upgrade nest-desktop && \ | ||
| python3 -m pip install --upgrade scipy && \ | ||
| python3 -m pip install --upgrade gsl wheel setuptools swig | ||
|
|
||
| #Latest update to nestml v8.0.0-rc1 | ||
| RUN python3 -m pip install nestml==8.0.0rc2 && \ | ||
| python3 -m pip install nestml-server@git+https://github.com/babsey/[email protected] && \ | ||
| python3 -m pip install --upgrade pygsl@git+https://github.com/pygsl/[email protected] | ||
|
|
||
| COPY entrypoint.sh /usr/local/bin/entrypoint.sh | ||
| RUN chmod +x /usr/local/bin/entrypoint.sh | ||
| RUN chmod +x /usr/local/bin/entrypoint.sh | ||
|
|
||
| COPY test-nest.sh /opt/test-nest.sh | ||
| RUN chmod +x /opt/test-nest.sh | ||
|
|
||