Include LINC runners in the containers

tikk3r · Aug 17, 2023 · 8cc2809 · 8cc2809
1 parent cef75a7
commit 8cc2809
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/singularity/Singularity.amd_aocl b/singularity/Singularity.amd_aocl
@@ -677,6 +677,15 @@ From: fedora:36
     cd $INSTALLDIR
     git clone https://github.com/mhardcastle/lotss-query.git
 
+    #
+    # Install custom runners
+    #
+    mkdir -p /opt/lofar/runners
+    cd /opt/lofar/runners
+    wget 'https://github.com/tikk3r/flocs/blob/fedora-py3/runners/run_LINC_calibrator.sh'
+    wget 'https://github.com/tikk3r/flocs/blob/fedora-py3/runners/run_LINC_target.sh'
+    cd $INSTALLDIR
+
     #
     # Finaly cleanup of unnecessary stuff
     # 
@@ -731,6 +740,7 @@ From: fedora:36
 	echo export PATH=/opt/hdf5/bin:\$PATH  >> $INSTALLDIR/init.sh
 	echo export PATH=\$INSTALLDIR/sagecal/bin:\$PATH  >> $INSTALLDIR/init.sh
 	echo export PATH=\$INSTALLDIR/wsclean/bin:\$PATH  >> $INSTALLDIR/init.sh
+    echo export PATH=\$INSTALLDIR/runners:\$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

diff --git a/singularity/Singularity.intel_mkl b/singularity/Singularity.intel_mkl
@@ -608,6 +608,16 @@ EOF
     cd $INSTALLDIR
     git clone https://github.com/mhardcastle/lotss-query.git
 
+
+    #
+    # Install custom runners
+    #
+    mkdir -p /opt/lofar/runners
+    cd /opt/lofar/runners
+    wget 'https://github.com/tikk3r/flocs/blob/fedora-py3/runners/run_LINC_calibrator.sh'
+    wget 'https://github.com/tikk3r/flocs/blob/fedora-py3/runners/run_LINC_target.sh'
+    cd $INSTALLDIR
+
     #
     # Finaly cleanup of unnecessary stuff
     # 
@@ -661,6 +671,7 @@ EOF
 	echo export PATH=\$INSTALLDIR/sagecal/bin:\$PATH  >> $INSTALLDIR/init.sh
 	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/runners:\$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