diff --git a/roles/edd_base/defaults/main.yml b/roles/edd_base/defaults/main.yml
index 6de6785f5c72ed35c81edce43ae9986c7edfce3c..b24d9e4e81bc2a65354ae54cbf16e8feb96a4c81 100644
--- a/roles/edd_base/defaults/main.yml
+++ b/roles/edd_base/defaults/main.yml
@@ -1,13 +1,13 @@
---
version_tag: "latest"
MLNX_OFED_VERSION: "5.7-1.0.2.0"
-UBUNTU_VERSION: "20.04" # If updated, sources.list template also needs to be updated!
+UBUNTU_VERSION: "20.04" # If updated, sources.list template also needs to be updated!
DEBMIRROR: http://archive.ubuntu.com/ubuntu/
gcc_architecture: "native" # Architecture to use for GCC optimizations. Set to minimum architecture in heterogeneous systems
baseimage: "nvidia/cuda:11.0.3-devel-ubuntu{{UBUNTU_VERSION}}"
baseimage_gpuless: "ubuntu:{{UBUNTU_VERSION}}"
-psrdada_version: bf756866898686065562ac537376cf9d7d1b54ee
-spead2_tag: v1.8.0
-mkrecv_tag: f55b8d40fee730a091266ee7d52d3d74b4c32f0a
+psrdada_version: 94655e3e379da8b2b3ff55b25c1ccdcf5cfc9231
+spead2_tag: v3.11.1
+mkrecv_tag: f55b8d40fee730a091266ee7d52d3d74b4c32f0a
mksend_tag: 648e7d3242b097dca82ec0ef4851deec17edbdfc
psrdadacpp_tag: 1996c2dbf86dcfe5589dba6beaf54fa440293097
diff --git a/roles/edd_base/templates/Dockerfile b/roles/edd_base/templates/Dockerfile
index 22c6bf436d7675f71c67040575ee9eccce13672f..2c00773f2f072cbe8e3cd60a3d0a5a74e6e1e185 100644
--- a/roles/edd_base/templates/Dockerfile
+++ b/roles/edd_base/templates/Dockerfile
@@ -98,89 +98,71 @@ RUN cd /src && \
make test;\
make install
+### SPEAD 2 dependencies
+RUN cd /src && \
+ apt-get --no-install-recommends -y install \
+ python3-jinja2 \
+ python3-pycparser \
+ python3-packaging \
+ libdivide-dev
+
### SPEAD 2 \
RUN cd /src && \
git clone https://github.com/ska-sa/spead2.git && \
cd spead2 && \
git checkout {{ spead2_tag }} && \
- # v1.8.0 or later is required by mksend \
- # v1.9.2 does not work with the ibverbs version MLNX_OFED-4.1-1.0.2.0 used above \
- ./bootstrap.sh --no-python && \
./configure && \
make -j8 &&\
make install
-COPY mkrecv_fix_issue_12.diff /tmp
-
### MKRECV \
RUN cd /src && \
- git clone https://gitlab.mpifr-bonn.mpg.de/mhein/mkrecv.git && \
- cd mkrecv &&\
- git checkout {{ mkrecv_tag }} && \
- git apply /tmp/mkrecv_fix_issue_12.diff && \
- mkdir build &&\
- cd build && \
- # TODO: AVOID LOCAL PATHS
- cmake .. -DENABLE_CUDA=TRUE -DPSRDADA_CPP_INCLUDE_DIR=/src/psrdada_cpp/ -DPSRDADA_CPP_LIBRARIES=/src/psrdada_cpp/build/psrdada_cpp/libpsrdada_cpp.a -DPSRDADA_INCLUDE_DIR=/usr/local/include/psrdada -DARCH={{gcc_architecture}}&& \
- make -j8 &&\
- make install
-
-COPY mksend_fix_issue_9.diff /tmp
+ git clone https://gitlab.mpifr-bonn.mpg.de/mhein/mkrecv.git
### MKSEND \
RUN cd /src && \
- git clone https://gitlab.mpifr-bonn.mpg.de/mhein/mksend.git && \
- cd mksend && \
- git checkout {{ mksend_tag }} && \
- git apply /tmp/mksend_fix_issue_9.diff && \
- mkdir build &&\
- cd build && \
- cmake .. -DENABLE_CUDA=TRUE -DPSRDADA_CPP_INCLUDE_DIR=/src/psrdada_cpp/ -DPSRDADA_CPP_LIBRARIES=/src/psrdada_cpp/build/psrdada_cpp/libpsrdada_cpp.a -DPSRDADA_INCLUDE_DIR=/usr/local/include/psrdada -DARCH={{gcc_architecture}} && \
- make -j8 &&\
- make install
+ git clone https://gitlab.mpifr-bonn.mpg.de/mhein/mksend.git
- ### MPIKAT dependencies\
+### MPIKAT dependencies\
RUN cd /src && \
apt-get --no-install-recommends -y install \
- libhdf5-dev \
- python3-h5py \
- python3-setuptools \
- python3-setuptools-git \
- python3-setuptools-scm \
- python3-pip \
- python3-pil \
- python3-jinja2 \
- python3-cmd2 \
- libpng-dev \
- pkg-config \
- libfreetype6-dev \
- python3-scipy \
- python3-pytest \
- python3-posix-ipc \
- python3-redis \
- python3-numpy \
- python3-netaddr \
- python3-astropy \
- python3-future \
- python3-git \
- python3-coloredlogs \
- python3-yaml \
- &&\
- \
- pip3 install --no-deps \
- omnijson==0.1.2 \
- ujson==2.0.3 \
- katpoint==0.9 \
- katcp==0.9.1 \
- kiwisolver==1.1.0 \
- nvector==0.7.4 \
- ephem==3.7.7.0 \
- spead2==1.8.0 \
- tornado==4.5.3 \
- tomli==1.0.0 \
- typing-extensions==3.7.4.3\
- setuptools_scm==7.0.5 \
- && \
+ libhdf5-dev \
+ python3-h5py \
+ python3-setuptools \
+ python3-setuptools-git \
+ python3-setuptools-scm \
+ python3-pip \
+ python3-pil \
+ python3-cmd2 \
+ libpng-dev \
+ pkg-config \
+ libfreetype6-dev \
+ python3-scipy \
+ python3-pytest \
+ python3-posix-ipc \
+ python3-redis \
+ python3-numpy \
+ python3-netaddr \
+ python3-astropy \
+ python3-future \
+ python3-git \
+ python3-coloredlogs \
+ python3-yaml \
+ &&\
+ pip3 install --no-deps \
+ omnijson==0.1.2 \
+ ujson==2.0.3 \
+ katpoint==0.9 \
+ katcp==0.9.1 \
+ kiwisolver==1.1.0 \
+ nvector==0.7.4 \
+ ephem==3.7.7.0 \
+ spead2==3.11.1 \
+ tornado==4.5.3 \
+ tomli==1.0.0 \
+ typing-extensions==3.7.4.3\
+ setuptools_scm==7.0.5 \
+ && \
echo 'DONE!'
WORKDIR /root