Make newest wsclean master (past 3.1 release) work

build_lofar.sh

@@ -314,6 +314,7 @@ else
     echo CASAcore already installed.
 fi >> "$prefix/build.log" 2>&1 || exit 1
 
+
 begin_pkg python-casacore
 pycasacorelib="$prefix/lib/python$pyver/site-packages"
 # ThOr: Subsequent builds might need that, so export it always here.
@@ -390,6 +391,7 @@ if [ ! -e $prefix/.done ]; then
     run_cmake \
         -DCMAKE_INSTALL_PREFIX=$prefix \
         -DCASACORE_ROOT_DIR=$lofar_prefix/casacore \
+        -DBoost_INCLUDE_DIR=/home/software/env/cuda-11.1.1_gcc-8.4.0_openmpi-4.0.5/pkgsrc/2022Q1/include \
         ../src &&
     make -j $J &&
     make install &&
@@ -577,9 +579,9 @@ if [ ! -e $prefix/.done ]; then
         -DCASACORE_ROOT_DIR=$lofar_prefix/casacore \
         -DIDGAPI_INCLUDE_DIRS=$lofar_prefix/idg/include \
         -DIDGAPI_LIBRARIES=$lofar_prefix/idg/lib/libidg-api.so \
-        -DBLAS_openblas_LIBRARY:FILEPATH=/sw/env/cuda-11.1.1_gcc-8.4.0_openmpi-4.0.5/pkgsrc/2020Q3/lib/libopenblas_pthread.so \
         -DEVERYBEAM_INCLUDE_DIR=$lofar_prefix/EveryBeam/include \
         -DEVERYBEAM_LIB=$lofar_prefix/EveryBeam/lib/libeverybeam.so \
+        -DBLAS_openblas_LIBRARY:FILEPATH=/sw/env/cuda-11.1.1_gcc-8.4.0_openmpi-4.0.5/pkgsrc/2022Q1/lib/libopenblas_pthread.so \
         ../src &&
     make -j $J &&
     make install &&

build_lofar.sh.config.rrz

 # The setup on the Hamburg LOFAR GPU Cluster.
-
-# 2021 08 07:
-#aoflagger_version=latest 
-#casacore_version=3.3.0
-#dysco_version=1.2.0
-#pybdsf_version=latest # weird C++ template error with 1.8.12
-#pycasa_version=3.1.1
-#wsclean_version=latest
-#dp3_version=latest
-
-aoflagger_version=latest 
+aoflagger_version=3.2.0  # latest
 casacore_version=3.3.0
-dysco_version=1.2.0
+dysco_version=1.2.0 # will be part of casacore in newest casacore release
 pybdsf_version=latest # weird C++ template error with 1.8.12
 pycasa_version=3.1.1
 wsclean_version=latest
-dp3_version=5.2
+dp3_version=latest #5.2
 
 # This gives us CUDA, gcc, Open MPI and dependencies
 # from pkgsrc in separate prefixes.
 
 . /sw/profile/init.sh
 module use /sw/TEST
-module switch env env/2020Q3-cuda-gcc-openmpi
+module switch env env/2022Q1-cuda-gcc-openmpi
+
 module load pythonversion/3
+# Note: According to T. Orgis the correct value is -openblas_openmp, definitely _not_ -lcblas! However, it looks like DP3 and wsclean want the _pthread one.
 export RRZ_BLAS_LIBS="-lopenblas_pthread" #$RRZ_BLAS_LIBS       # from the env/ module
 export OPENBLAS_NUM_THREADS=1
+
 # You could experiment with idg using MKL, but it is recommened
 # to try a consistent environment where everyone agrees on using
 # MKL for BLAS/LAPACK, too.
@@ -33,7 +26,6 @@ export OPENBLAS_NUM_THREADS=1
 #idg_mkl=ON
 
 make_jobs=64
-
 export CC=gcc
 export CXX=g++
 export FC=gfortran