Skip to content

Commit 78a90c9

Browse files
committed
Revert "Enable CUDA in DP3 (#151)"
This reverts commit c09241d. Can't build with CUDA and GCC 14
1 parent e703adf commit 78a90c9

File tree

2 files changed

+0
-7
lines changed

2 files changed

+0
-7
lines changed

singularity/Singularity.amd_aocl

-5
Original file line numberDiff line numberDiff line change
@@ -462,11 +462,6 @@ From: fedora:40
462462
-DBLAS_flexiblas_LIBRARY=${AOCL_ROOT}/lib/libblis.so \
463463
-DLAPACK_flexiblas_LIBRARY=${AOCL_ROOT}/lib/libflame.so \
464464
../src
465-
elif [ $HAS_CUDA = true ]; then
466-
cmake $CMAKE_ADD_OPTION -DBUILD_WITH_CUDA=ON -DCMAKE_INSTALL_PREFIX:PATH=$INSTALLDIR/DP3 -DIDGAPI_LIBRARIES=$INSTALLDIR/idg/lib/libidg-api.so -DIDGAPI_INCLUDE_DIRS=$INSTALLDIR/idg/include -DAOFLAGGER_INCLUDE_DIR=$INSTALLDIR/aoflagger/include -DAOFLAGGER_LIB=$INSTALLDIR/aoflagger/lib/libaoflagger.so -DTARGET_CPU=${MARCH} -DLIBDIRAC_PREFIX=$INSTALLDIR/sagecal/ \
467-
-DBLAS_flexiblas_LIBRARY=${AOCL_ROOT}/lib/libblis.so \
468-
-DLAPACK_flexiblas_LIBRARY=${AOCL_ROOT}/lib/libflame.so \
469-
../src
470465
else
471466
cmake $CMAKE_ADD_OPTION -DCMAKE_INSTALL_PREFIX:PATH=$INSTALLDIR/DP3 -DIDGAPI_LIBRARIES=$INSTALLDIR/idg/lib/libidg-api.so -DIDGAPI_INCLUDE_DIRS=$INSTALLDIR/idg/include -DAOFLAGGER_INCLUDE_DIR=$INSTALLDIR/aoflagger/include -DAOFLAGGER_LIB=$INSTALLDIR/aoflagger/lib/libaoflagger.so -DTARGET_CPU=${MARCH} -DLIBDIRAC_PREFIX=$INSTALLDIR/sagecal/ \
472467
-DBLAS_flexiblas_LIBRARY=${AOCL_ROOT}/lib/libblis.so \

singularity/Singularity.intel_mkl

-2
Original file line numberDiff line numberDiff line change
@@ -436,8 +436,6 @@ EOF
436436
cd $INSTALLDIR/DP3/build
437437
if [ $MARCH = 'x86-64' ] && [ $MTUNE = 'generic' ]; then
438438
cmake $CMAKE_ADD_OPTION -DCMAKE_INSTALL_PREFIX:PATH=$INSTALLDIR/DP3 -DIDGAPI_LIBRARIES=$INSTALLDIR/idg/lib/libidg-api.so -DIDGAPI_INCLUDE_DIRS=$INSTALLDIR/idg/include -DAOFLAGGER_INCLUDE_DIR=$INSTALLDIR/aoflagger/include -DAOFLAGGER_LIB=$INSTALLDIR/aoflagger/lib/libaoflagger.so -DPORTABLE=True -DLIBDIRAC_PREFIX=$INSTALLDIR/sagecal/ ../src
439-
elif [ $HAS_CUDA = true ]; then
440-
cmake $CMAKE_ADD_OPTION -DBUILD_WITH_CUDA=ON -DCMAKE_INSTALL_PREFIX:PATH=$INSTALLDIR/DP3 -DIDGAPI_LIBRARIES=$INSTALLDIR/idg/lib/libidg-api.so -DIDGAPI_INCLUDE_DIRS=$INSTALLDIR/idg/include -DAOFLAGGER_INCLUDE_DIR=$INSTALLDIR/aoflagger/include -DAOFLAGGER_LIB=$INSTALLDIR/aoflagger/lib/libaoflagger.so -DTARGET_CPU=${MARCH} -DLIBDIRAC_PREFIX=$INSTALLDIR/sagecal/ ../src
441439
else
442440
cmake $CMAKE_ADD_OPTION -DCMAKE_INSTALL_PREFIX:PATH=$INSTALLDIR/DP3 -DIDGAPI_LIBRARIES=$INSTALLDIR/idg/lib/libidg-api.so -DIDGAPI_INCLUDE_DIRS=$INSTALLDIR/idg/include -DAOFLAGGER_INCLUDE_DIR=$INSTALLDIR/aoflagger/include -DAOFLAGGER_LIB=$INSTALLDIR/aoflagger/lib/libaoflagger.so -DTARGET_CPU=${MARCH} -DLIBDIRAC_PREFIX=$INSTALLDIR/sagecal/ ../src
443441
fi

0 commit comments

Comments
 (0)