Keep GPU-kernels in (fat) binary (ELPA).

hfp · Oct 24, 2024 · fc9e09c · fc9e09c
1 parent 5ca4803
commit fc9e09c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 19 deletions.
diff --git a/config/elpa/configure-elpa-hsw.sh b/config/elpa/configure-elpa-hsw.sh
@@ -64,17 +64,17 @@ LDFLAGS="-L${MKLROOT}/lib/intel64"
 
 AR=$(command -v xiar || echo "ar")
 if [ "1" != "${INTEL}" ]; then
-  CXX=$(command -v mpiicpx || echo "mpiicpc -cxx=icpx")
-  CC=$(command -v mpiicx || echo "mpiicc -cc=icx")
+  CXX=icpx; CC=icx
 else
-  CXX="mpiicpc -cxx=$(command -v icpc || echo icpx)"
-  CC="mpiicc -cc=$(command -v icc || echo icx)"
+  CXX=$(command -v icpc || echo icpx)
+  CC=$(command -v icc || echo icx)
 fi
 
 if [ "0" != "${GPU}" ]; then # incl. undefined
   CONFOPTS+=" --enable-intel-gpu-backend=sycl --enable-intel-gpu-sycl-kernels"
-  CXXFLAGS+=" -I$(dirname "$(command -v ${CXX})")/../linux/include/sycl -Wc,-fsycl -fsycl -fsycl-targets=spir64"
+  CXXFLAGS+=" -I$(dirname "$(command -v ${CXX})")/../linux/include/sycl -fsycl -fsycl-targets=spir64"
   LIBS+=" -lmkl_sycl -lsycl -lsvml"
+  LDFLAGS+=" -Wc,-fsycl"
 fi
 if [ "1" != "${INTEL}" ]; then
   if [ "0" != "${INTEL}" ]; then
@@ -136,8 +136,6 @@ fi
 
 ./configure --disable-option-checking \
   --disable-dependency-tracking \
-  --host=x86_64-unknown-linux-gnu \
-  --disable-mpi-module \
   --prefix="${DEST}" ${CONFOPTS} "$@"
 
 if [ -e "${HERE}/Makefile" ]; then

diff --git a/config/elpa/configure-elpa-skx.sh b/config/elpa/configure-elpa-skx.sh
@@ -64,17 +64,17 @@ LDFLAGS="-L${MKLROOT}/lib/intel64"
 
 AR=$(command -v xiar || echo "ar")
 if [ "1" != "${INTEL}" ]; then
-  CXX=$(command -v mpiicpx || echo "mpiicpc -cxx=icpx")
-  CC=$(command -v mpiicx || echo "mpiicc -cc=icx")
+  CXX=icpx; CC=icx
 else
-  CXX="mpiicpc -cxx=$(command -v icpc || echo icpx)"
-  CC="mpiicc -cc=$(command -v icc || echo icx)"
+  CXX=$(command -v icpc || echo icpx)
+  CC=$(command -v icc || echo icx)
 fi
 
 if [ "0" != "${GPU}" ]; then # incl. undefined
   CONFOPTS+=" --enable-intel-gpu-backend=sycl --enable-intel-gpu-sycl-kernels"
-  CXXFLAGS+=" -I$(dirname "$(command -v ${CXX})")/../linux/include/sycl -Wc,-fsycl -fsycl -fsycl-targets=spir64"
+  CXXFLAGS+=" -I$(dirname "$(command -v ${CXX})")/../linux/include/sycl -fsycl -fsycl-targets=spir64"
   LIBS+=" -lmkl_sycl -lsycl -lsvml"
+  LDFLAGS+=" -Wc,-fsycl"
 fi
 if [ "1" != "${INTEL}" ]; then
   if [ "0" != "${INTEL}" ]; then
@@ -136,8 +136,6 @@ fi
 
 ./configure --disable-option-checking \
   --disable-dependency-tracking \
-  --host=x86_64-unknown-linux-gnu \
-  --disable-mpi-module \
   --prefix="${DEST}" ${CONFOPTS} "$@"
 
 if [ -e "${HERE}/Makefile" ]; then

diff --git a/config/elpa/configure-elpa.sh b/config/elpa/configure-elpa.sh
@@ -72,17 +72,17 @@ LDFLAGS="-L${MKLROOT}/lib/intel64"
 
 AR=$(command -v xiar || echo "ar")
 if [ "1" != "${INTEL}" ]; then
-  CXX=$(command -v mpiicpx || echo "mpiicpc -cxx=icpx")
-  CC=$(command -v mpiicx || echo "mpiicc -cc=icx")
+  CXX=icpx; CC=icx
 else
-  CXX="mpiicpc -cxx=$(command -v icpc || echo icpx)"
-  CC="mpiicc -cc=$(command -v icc || echo icx)"
+  CXX=$(command -v icpc || echo icpx)
+  CC=$(command -v icc || echo icx)
 fi
 
 if [ "0" != "${GPU}" ]; then # incl. undefined
   CONFOPTS+=" --enable-intel-gpu-backend=sycl --enable-intel-gpu-sycl-kernels"
-  CXXFLAGS+=" -I$(dirname "$(command -v ${CXX})")/../linux/include/sycl -Wc,-fsycl -fsycl -fsycl-targets=spir64"
+  CXXFLAGS+=" -I$(dirname "$(command -v ${CXX})")/../linux/include/sycl -fsycl -fsycl-targets=spir64"
   LIBS+=" -lmkl_sycl -lsycl -lsvml"
+  LDFLAGS+=" -Wc,-fsycl"
 fi
 if [ "1" != "${INTEL}" ]; then
   if [ "0" != "${INTEL}" ]; then