wsclean master facet tests

build_lofar.sh

@@ -577,6 +577,7 @@ 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 \
         ../src &&

build_lofar.sh.config.rrz

@@ -14,7 +14,7 @@ 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=3.0.1 #2.10.1
+wsclean_version=latest
 dp3_version=5.2
 
 # This gives us CUDA, gcc, Open MPI and dependencies
@@ -24,6 +24,8 @@ dp3_version=5.2
 module use /sw/TEST
 module switch env env/2020Q3-cuda-gcc-openmpi
 module load pythonversion/3
+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.

wsclean-buildfix.patch

@@ -27,14 +27,3 @@ index 040c3bf..5c2b01b 100644
  
  # Include pybind11
  add_subdirectory("${CMAKE_SOURCE_DIR}/external/pybind11")
-@@ -373,8 +386,8 @@ set(ALL_LIBRARIES
-     schaapcommon)
- 
- # Perform the BLAS check from aocommon
--include("${CMAKE_CURRENT_LIST_DIR}/external/aocommon/CMake/CheckBLAS.cmake")
--check_blas(LIBRARIES ${ALL_LIBRARIES})
-+#include("${CMAKE_CURRENT_LIST_DIR}/external/aocommon/CMake/CheckBLAS.cmake")
-+#check_blas(LIBRARIES ${ALL_LIBRARIES})
- 
- add_library(wsclean-lib STATIC ${WSCLEANFILES})
- target_link_libraries(wsclean-lib PRIVATE pybind11::embed ${ALL_LIBRARIES})