From 902b56dada9e04e8837c3dafc1053db1b09033d0 Mon Sep 17 00:00:00 2001
From: Frits Sweijen <tikk3r@users.noreply.github.com>
Date: Fri, 17 May 2024 16:39:45 +0100
Subject: [PATCH] Add MultiNest

---
 singularity/Singularity.amd_aocl  | 10 ++++++++++
 singularity/Singularity.intel_mkl | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/singularity/Singularity.amd_aocl b/singularity/Singularity.amd_aocl
index 91d91046..36c15634 100644
--- a/singularity/Singularity.amd_aocl
+++ b/singularity/Singularity.amd_aocl
@@ -251,6 +251,14 @@ From: fedora:38
     export FLEXIBLAS=OPENBLAS
     export FLEXIBLAS64=OPENBLAS
 
+    # MultiNest
+    cd $INSTALLDIR
+    git clone https://github.com/JohannesBuchner/MultiNest
+    cd MultiNest/build
+    cmake -DCMAKE_INSTALL_PREFIX=$INSTALLDIR/MultiNest ..
+    make
+    cd $INSTALLDIR
+
     #
     # Setup the Python environment.
     #
@@ -788,6 +796,7 @@ From: fedora:38
 	echo export PATH=\$INSTALLDIR/wsclean/bin:\$PATH  >> $INSTALLDIR/init.sh
     echo export PATH=\$INSTALLDIR/runners:\$PATH >> $INSTALLDIR/init.sh
     echo export PATH=\$INSTALLDIR/utility:\$PATH >> $INSTALLDIR/init.sh
+    echo export PATH=\$INSTALLDIR/MultiNest/bin:\$PATH >> $INSTALLDIR/init.sh
 
 	echo export LD_LIBRARY_PATH=/opt/flang/lib:$LD_LIBRARY_PATH >> $INSTALLDIR/init.sh
 	echo export PATH=/opt/flang/bin:\$PATH >> $INSTALLDIR/init.sh
@@ -799,6 +808,7 @@ From: fedora:38
     echo export LD_LIBRARY_PATH=/usr/lib64/openmpi/lib/:\$LD_LIBRARY_PATH >> $INSTALLDIR/init.sh
     echo export LD_LIBRARY_PATH=\$INSTALLDIR/sagecal/lib:\$LD_LIBRARY_PATH >> $INSTALLDIR/init.sh
     echo export LD_LIBRARY_PATH=\$INSTALLDIR/lofarstman/lib64/:\$LD_LIBRARY_PATH >> $INSTALLDIR/init.sh
+    echo export LD_LIBRARY_PATH=\$INSTALLDIR/MultiNest/lib/:\$LD_LIBRARY_PATH >> $INSTALLDIR/init.sh
     # OPENBLAS_NUM_THREADS=1 is required for WSClean
     echo export NCPU=\$\(nproc\) >> $INSTALLDIR/init.sh
 	echo export OPENBLAS_NUM_THREADS=1 >> $INSTALLDIR/init.sh
diff --git a/singularity/Singularity.intel_mkl b/singularity/Singularity.intel_mkl
index 3b329872..c6cfb9cb 100644
--- a/singularity/Singularity.intel_mkl
+++ b/singularity/Singularity.intel_mkl
@@ -225,6 +225,14 @@ EOF
     export FLEXIBLAS=OPENBLAS
     export FLEXIBLAS64=OPENBLAS
 
+    # MultiNest
+    cd $INSTALLDIR
+    git clone https://github.com/JohannesBuchner/MultiNest
+    cd MultiNest/build
+    cmake -DCMAKE_INSTALL_PREFIX=$INSTALLDIR/MultiNest ..
+    make
+    cd $INSTALLDIR
+
     #
     # Setup the Python environment.
     #
@@ -714,12 +722,14 @@ EOF
 	echo export PATH=\$INSTALLDIR/wsclean/bin:\$PATH  >> $INSTALLDIR/init.sh
     echo export PATH=/usr/lib64/openmpi/bin:\$PATH >> $INSTALLDIR/init.sh
     echo export PATH=\$INSTALLDIR/utility:\$INSTALLDIR/runners:\$PATH >> $INSTALLDIR/init.sh
+    echo export PATH=\$INSTALLDIR/MultiNest/bin:\$PATH >> $INSTALLDIR/init.sh
     echo export LD_LIBRARY_PATH=/usr/local/cuda/lib64:/opt/hdf5/lib:/opt/intel/mkl/lib/intel64/:\$LD_LIBRARY_PATH >> $INSTALLDIR/init.sh
 	echo export LD_LIBRARY_PATH=\$INSTALLDIR/aoflagger/lib:\$INSTALLDIR/casacore/lib:\$INSTALLDIR/DPPP/lib:\$INSTALLDIR/dysco/lib:\$INSTALLDIR/EveryBeam/lib:/opt/hdf5/lib:\$INSTALLDIR/idg/lib:\$INSTALLDIR/lofar/lib:\$INSTALLDIR/lofar/lib64:\$LD_LIBRARY_PATH  >> $INSTALLDIR/init.sh
     echo export LD_LIBRARY_PATH=/opt/OpenBLAS/lib64:\$LD_LIBRARY_PATH >> $INSTALLDIR/init.sh
     echo export LD_LIBRARY_PATH=/usr/lib64/openmpi/lib/:\$LD_LIBRARY_PATH >> $INSTALLDIR/init.sh
     echo export LD_LIBRARY_PATH=\$INSTALLDIR/sagecal/lib:\$LD_LIBRARY_PATH >> $INSTALLDIR/init.sh
     echo export LD_LIBRARY_PATH=\$INSTALLDIR/lofarstman/lib64/:\$LD_LIBRARY_PATH >> $INSTALLDIR/init.sh
+    echo export LD_LIBRARY_PATH=\$INSTALLDIR/MultiNest/lib/:\$LD_LIBRARY_PATH >> $INSTALLDIR/init.sh
     # OPENBLAS_NUM_THREADS=1 is required for WSClean
     echo export NCPU=\$\(nproc\) >> $INSTALLDIR/init.sh
 	echo export OPENBLAS_NUM_THREADS=1 >> $INSTALLDIR/init.sh