diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 6107e105a951cccc1e88a1f7b6dfb19fdaef3527..90a56e01b2026dce9f38ce94e7ddeb22d03b3fdf 100755 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -43,7 +43,7 @@ pipeline { // can be removed as soon as the explicit preferred version // is dropped DEPENDENCY_PYTHON3 = "python@3.8.2" - VISIONARY_GCC_VERSION = "10.2.0" + VISIONARY_GCC_VERSION = "11.2.0" VISIONARY_GCC = "gcc@${VISIONARY_GCC_VERSION}" TMPDIR = "/tmp/${env.NODE_NAME}" JOB_TMP_SPACK = sh(script: "mkdir -p ${env.TMPDIR} &>/dev/null; mktemp -d ${env.TMPDIR}/spack-XXXXXXXXXX", diff --git a/.ci/pinned/dev.list b/.ci/pinned/dev.list index f118aca2480e0d876e69103270103355ba7b07d9..ebb898e5b9a4e77bc734994ac43232edd9e3b8aa 100644 --- a/.ci/pinned/dev.list +++ b/.ci/pinned/dev.list @@ -1,4 +1,6 @@ +genpybind@ebrains hwloc@1.11.13 +llvm@11.1.0 openmpi@3.1.6 py-astroid@2.4.2 py-pytest@6.1.1 diff --git a/.ci/pinned/dls.list b/.ci/pinned/dls.list index ebff3ce5c0546e1b168d41cf125c436912506b71..02955f634eebd04140efa6a3b72e0933bcce2e40 100644 --- a/.ci/pinned/dls.list +++ b/.ci/pinned/dls.list @@ -1,7 +1,9 @@ boost@1.73.0 +genpybind@ebrains hwloc@1.11.13 +llvm@11.1.0 openmpi@3.1.6 py-astroid@2.4.2 -py-llvmlite@0.31.0 -py-numba@0.48.0 -py-torch +py-llvmlite@0.37.0 +py-numba@0.54.1 +py-torch@1.9.1 diff --git a/.ci/pinned/spikey_w_dev.list b/.ci/pinned/spikey_w_dev.list index 12f570b5ca36d2b69002e92af1be3183604391b0..985e31db3cb8cdceae2e5b2ac73f0ff09166cb7e 100644 --- a/.ci/pinned/spikey_w_dev.list +++ b/.ci/pinned/spikey_w_dev.list @@ -24,7 +24,7 @@ gdk-pixbuf@2.31.2 genpybind@visions git-fat-git@2018-08-21 gobject-introspection@1.56.1 -googletest@2.0.0 +googletest@1.11.0 gsl@2.5 gtkplus@2.24.32 hwloc@1.11.13 diff --git a/.ci/pinned/spikey_wout_dev.list b/.ci/pinned/spikey_wout_dev.list index 12f570b5ca36d2b69002e92af1be3183604391b0..985e31db3cb8cdceae2e5b2ac73f0ff09166cb7e 100644 --- a/.ci/pinned/spikey_wout_dev.list +++ b/.ci/pinned/spikey_wout_dev.list @@ -24,7 +24,7 @@ gdk-pixbuf@2.31.2 genpybind@visions git-fat-git@2018-08-21 gobject-introspection@1.56.1 -googletest@2.0.0 +googletest@1.11.0 gsl@2.5 gtkplus@2.24.32 hwloc@1.11.13 diff --git a/.ci/pinned/wafer-visu.list b/.ci/pinned/wafer-visu.list index de75e2dd0956e5c73df036002dfbd37114645ba7..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 --- a/.ci/pinned/wafer-visu.list +++ b/.ci/pinned/wafer-visu.list @@ -1,4 +0,0 @@ -glib@2.56.4 -openmpi@3.1.6 -py-numpy@1.16.6 -py-setuptools@41.3.0 diff --git a/.ci/pinned/wafer.list b/.ci/pinned/wafer.list index c86cd888c678711f118cdda1ab1f2ea844964771..0d1839d3b93d436ca80da84f09aed0d872a8098d 100644 --- a/.ci/pinned/wafer.list +++ b/.ci/pinned/wafer.list @@ -1,324 +1,10 @@ -# binutils@2.34 -#bazel@0.19.0 -#bazel@0.26.1 -ack@2.22 -apr-util@1.6.1 -apr@1.7.0 -atk@2.20.0 -autoconf@2.69 -automake@1.16.1 -bash-completion@2.7 -bash@5.0 -bear@2.2.0 -boost@1.73.0 -bzip2@1.0.8 -c-ares@1.13.0 -c-blosc@1.17.0 -cairo@1.16.0 -catch2@2.9.1 -cereal@1.3.0 -clara@1.1.5 -cloc@1.80 -cmake@3.15.5 -connect-proxy@1.105 -cquery@2018-08-23 -curl@7.63.0 -double-conversion@2.0.1 -emacs@26.3 -flex@2.6.4 -font-util@1.3.2 -freetype@2.10.1 -gdb@8.3 -gdk-pixbuf@2.31.2 -genpybind@visions -git-fat-git@2018-08-21 -glib@2.56.4 -gobject-introspection@1.56.1 -googletest@2.0.0 -gsl@2.5 -gtkplus@2.24.32 -hdf5-blosc@master +genpybind@ebrains hwloc@1.11.13 -intel-tbb@2019.4 -kbproto@1.0.7 -lcms@2.9 -libice@1.0.9 -libiconv@1.16 -libiconv@1.16 -liblockfile@1.14 -libmng@2.0.3 -libpcap@1.8.1 -libpng@1.6.37 -libpthread-stubs@0.4 -libsigsegv@2.12 -libtool@2.4.6 -libxau@1.0.8 -libxcb@1.13 -libxcursor@1.1.14 -libxdmcp@1.1.2 -libxext@1.3.3 -libxfixes@5.0.2 -libxft@2.3.2 -libxi@1.7.6 -libxkbcommon@0.8.2 -libxpm@3.5.12 -libxrandr@1.5.0 -libxrender@0.9.10 -libxscrnsaver@1.2.2 -libxslt@1.1.33 -libxt@1.1.5 -libxtst@1.2.2 -llvm@9.0.1 -log4cxx@0.10.0 -lua@5.3.5 -lz4@1.9.2 -m4@1.4.18 -mesa@18.3.6 -mosh@1.3.2 -ncdu@1.14.2 -ncurses@6.1 -nest@2.2.2 -npm@3.10.9 +iwyu@0.13.0:0.13.999 +llvm@11.1.0 openmpi@3.1.6 -pango@1.41.0 -pcre2@10.31 -pigz@2.4 -pixman@0.38.0 -pkg-config@0.29.2 -protobuf@3.6.1 -py-absl-py@0.7.1 -py-alabaster@0.7.12 -py-apipkg@1.5 -py-argparse@1.4.0 -py-astor@0.8.0 -py-astroid@1.6.6 -py-atomicwrites@1.3.0 -py-attrs@19.2.0 -py-autopep8@1.3.3 -py-babel@2.7.0 -py-backports-abc@0.4 -py-backports-functools-lru-cache@1.5 -py-backports-shutil-get-terminal-size@1.0.0 -py-bleach@3.1.0 -py-bokeh@1.3.4 -py-bottleneck@1.3.2 -py-brian2@2.3 -py-brian@1.4.3 -py-certifi@2019.9.11 -py-cffi@1.13.0 -py-chardet@3.0.4 -py-click@7.0 -py-cloudpickle@0.5.2 -py-cloudpickle@0.5.2 -py-configargparse@0.14.0 -py-configparser@3.5.1 -py-configparser@3.5.1 -py-contextlib2@0.6.0 -py-coverage@5.0.4 -py-cpuinfo@0.2.3 -py-cycler@0.10.0 -py-cython@0.29.16 -py-dask@1.1.2 -py-dask@1.1.2 -py-decorator@4.4.0 -py-defusedxml@0.5.0 -py-distributed@1.28.1 -py-distributed@1.28.1 -py-docutils@0.15.2 -py-doxypypy@0.8.8.6 -py-doxypypy@0.8.8.6 -py-editdistance@0.4 -py-elephant@0.5.0 -py-entrypoints@0.3 -py-enum34@1.1.6 -py-eventlet@0.22.0 -py-execnet@1.7.1 -py-flake8@3.7.8 -py-flask-compress@1.4.0 -py-flask-socketio@2.9.6 -py-flask@1.1.1 -py-funcsigs@1.0.2 -py-functools32@3.2.3-2 -py-future@0.17.1 -py-futures@3.0.5 -py-gast@0.2.2 -py-gdbgui@0.11.2.1 -py-gevent@1.3a2 -py-git-review@1.28.0 -py-greenlet@0.4.13 -py-grpcio@1.25.0 -py-h5py@2.9.0 -py-idna@2.8 -py-imagesize@1.1.0 -py-importlib-metadata@0.23 -py-ipaddress@1.0.18 -py-ipykernel@4.10.0 -py-ipython-genutils@0.2.0 -py-ipython@5.8.0 -py-isort@4.2.15 -py-itsdangerous@1.1.0 -py-jedi@0.17.1 -py-jinja2@2.10.3 -py-joblib@0.14.0 -py-jsonrpc-server@0.1.2 -py-jsonschema@2.6.0 -py-junit-xml@1.7 -py-jupyter-client@5.3.4 -py-jupyter-console@5.2.0 -py-jupyter-core@4.6.1 -py-keras-applications@1.0.8 -py-keras-preprocessing@1.1.0 -py-kiwisolver@1.1.0 -py-language-server@0.22.0 -py-lazy-object-proxy@1.4.3 -py-lazyarray@0.3.2 -py-line-profiler@2.1.2 -py-llvmlite@0.31.0 -py-lmfit@0.9.5 -py-locket@0.2.0 -py-lxml@4.4.1 -py-markupsafe@1.1.1 -py-matplotlib@2.2.3 -py-mccabe@0.6.1 -py-memory-profiler@0.47 -py-mistune@0.8.4 -py-mock@3.0.5 -py-more-itertools@4.3.0 -py-mpmath@1.1.0 -py-nbconvert@5.4.1 -py-nbformat@4.4.0 -py-neo@0.4.1 -py-networkx@2.2 -py-nose2@0.8.0 -py-nose@1.3.7 -py-notebook@5.7.0 -py-numba@0.40.1 -py-numexpr@2.6.9 -py-numpy@1.16.6 -py-opt-einsum@2.3.2 -py-ordereddict@1.1 -py-packaging@19.2 -py-pandas@0.24.2 -py-pandocfilters@1.4.2 -py-parso@0.7.0 -py-partd@0.3.8 -py-pathlib2@2.3.2 -py-pbr@5.4.3 -py-pexpect@4.6.0 -py-pickleshare@0.7.4 -py-pillow@6.2.0 -py-pluggy@0.13.0 -py-prometheus-client@0.7.1 -py-prompt-toolkit@1.0.9 -py-protobuf@3.6.1 -py-psutil@5.6.3 -py-ptyprocess@0.5.1 -py-pudb@2017.1.1 -py-py-cpuinfo@6.0.0 -py-py@1.8.0 -py-pybind11@2.5.0 -py-pycodestyle@2.5.0 -py-pycparser@2.19 -py-pydocstyle@3.0.0 -py-pyflakes@2.1.1 -py-pygdbmi@0.8.2.0 -py-pygments@2.4.2 -py-pylint@1.9.4 -py-pynn@0.7.5 -py-pyparsing@2.4.2 -py-pyqt5@5.13.0 -py-pyserial@3.1.1 -py-pytest-forked@1.1.1 -py-pytest-xdist@1.30.0 -py-pytest@4.4.0 -py-python-dateutil@2.8.0 -py-python-engineio@3.3.0 -py-python-socketio@1.8.4 -py-pytz@2019.3 -py-pywavelets@0.5.2 -py-pyyaml@5.1.2 -py-pyzmq@18.1.0 -py-quantities@0.12.1 -py-ranger-fm@1.9.2 -py-requests@2.22.0 -py-rope@0.12.0 -py-scandir@1.9.0 -py-scikit-image@0.14.2 -py-scikit-learn@0.20.2 -py-scipy@1.2.3 -py-send2trash@1.5.0 -py-setuptools@41.3.0 -py-simplegeneric@0.8.1 -py-singledispatch@3.4.0.3 -py-slurm-pipeline@3.0.2 -py-snowballstemmer@2.0.0 -py-sphinx-rtd-theme@0.4.3 -py-sphinx@1.8.4 -py-sphinxcontrib-websupport@1.1.2 -py-sqlalchemy@1.3.9 -py-subprocess32@3.2.7 -py-tables@3.5.2 -py-tabulate@0.7.7 -py-tensorflow@1.13.1 -py-termcolor@1.1.0 -py-testpath@0.4.2 -py-toolz@0.9.0 -py-torch@1.4.1 -py-tornado@5.1.1 -py-traceback2@1.4.0 -py-traitlets@4.3.2 -py-tqdm@4.45.0 -py-typing@3.6.4 -py-unittest2@1.1.0 -py-urllib3@1.25.6 -py-urwid@1.3.0 -py-vcversioner@2.16.0.0 -py-virtualenv@16.7.6 -py-wcwidth@0.1.7 -py-webencodings@0.5.1 -py-werkzeug@0.16.0 -py-wheel@0.33.1 -py-wrapt@1.11.2 -py-xmlrunner@1.7.7 -py-xmltodict@0.12.0 -py-yapf@0.29.0 -py-yccp@0.5.0 -py-yq@2.7.2 -py-zipp@0.6.0 -python@2.7.18 -qt@5.13.1 -renderproto@0.11.1 -rtags@2.17 -ruby@2.6.2 -shared-mime-info@1.9 -snappy@1.1.7 -tcl-itcl3@3.4.3 -tcl-odfi@legacy -tcl-osys@890eafffbda95b58a472a2005c3cb9e90fd22ff6 -tcl-tcllib@1.19 -tcl-tclxml@3.2 -tcl@8.5.19 -texinfo@6.5 -tig@2.2.2 -time@1.9 -tk@8.5.19 -units@2.13 -unzip@6.0 -util-macros@1.19.1 -valgrind@3.15.0 -verilator@4.108 -visionary-dev-tools@1.0 -visionary-xilinx@1.0 -wget@1.20.3 -xcb-util-image@0.4.0 -xcb-util-keysyms@0.4.0 -xcb-util-renderutil@0.3.9 -xcb-util-wm@0.4.1 -xcb-util@0.4.0 -xerces-c@3.2.2 -xextproto@7.3.0 -xkbdata@1.0.1 -xproto@7.0.31 -zip@3.0 -zlib@1.2.11 -zlib@1.2.11 +py-astroid@2.4.2 +py-llvmlite@0.37.0 +py-numba@0.54.1 +py-setuptools-scm+toml +py-torch@1.9.1 diff --git a/.ci/visionary_spack_collection.sh b/.ci/visionary_spack_collection.sh index 936f7352c17b297e1499f71bd53e5bedfffc64d1..3204aae87c1f8b772231ced253697494ef2c04c7 100644 --- a/.ci/visionary_spack_collection.sh +++ b/.ci/visionary_spack_collection.sh @@ -3,12 +3,12 @@ spack_packages=( "${SPEC_VIEW_VISIONARY_DEV_TOOLS}" "visionary-simulation~dev ^${DEPENDENCY_PYTHON} $(get_pinned_deps simulation) %${VISIONARY_GCC}" "visionary-simulation ^${DEPENDENCY_PYTHON} $(get_pinned_deps simulation) %${VISIONARY_GCC}" - "visionary-wafer~dev ^${DEPENDENCY_PYTHON} $(get_pinned_deps wafer) %${VISIONARY_GCC}" - "visionary-wafer ^${DEPENDENCY_PYTHON} $(get_pinned_deps wafer) %${VISIONARY_GCC}" - "visionary-wafer ~dev+gccxml^${DEPENDENCY_PYTHON} $(get_pinned_deps wafer) %${VISIONARY_GCC}" - "visionary-wafer+gccxml ^${DEPENDENCY_PYTHON} $(get_pinned_deps wafer) %${VISIONARY_GCC}" - "visionary-wafer-visu ^${DEPENDENCY_PYTHON} $(get_pinned_deps wafer-visu) %${VISIONARY_GCC}" # START python 3 packages + "visionary-wafer~dev ^${DEPENDENCY_PYTHON3} $(get_pinned_deps wafer) %${VISIONARY_GCC}" + "visionary-wafer ^${DEPENDENCY_PYTHON3} $(get_pinned_deps wafer) %${VISIONARY_GCC}" + "visionary-wafer~dev+gccxml ^${DEPENDENCY_PYTHON3} $(get_pinned_deps wafer) %${VISIONARY_GCC}" + "visionary-wafer+gccxml ^${DEPENDENCY_PYTHON3} $(get_pinned_deps wafer) %${VISIONARY_GCC}" + "visionary-wafer-visu ^${DEPENDENCY_PYTHON3} $(get_pinned_deps wafer-visu) %${VISIONARY_GCC}" "visionary-clusterservices ^${DEPENDENCY_PYTHON3} %${VISIONARY_GCC}" "visionary-dls~dev ^${DEPENDENCY_PYTHON3} $(get_pinned_deps dls) %${VISIONARY_GCC}" "visionary-dls ^${DEPENDENCY_PYTHON3} $(get_pinned_deps dls) %${VISIONARY_GCC}"