Commit 97421455 authored by Emmanuel Bertin's avatar Emmanuel Bertin
Browse files

More icx fixes.

parent ca1497d6

configure.ac

+12 −12
Original line number Diff line number Diff line
@@ -80,23 +80,23 @@ AC_ARG_ENABLE(auto-flags, 
	AC_MSG_RESULT([yes]),

	AC_MSG_RESULT([no]))



# Provide special option for the Linux Intel C compiler

# Provide special option for the Linux Intel OneAPI C compiler

AC_MSG_CHECKING([whether the INTEL compiler is enabled])

AC_ARG_ENABLE(icc,

	[AS_HELP_STRING([--enable-icc],

AC_ARG_ENABLE(icx,

	[AS_HELP_STRING([--enable-icx],

	[Use the Intel compiler (default = no)])],

        CC="icc"

        CC="icx"

	AC_MSG_RESULT([yes]),

	AC_MSG_RESULT([no]))



# Provide special options for INTEL MKL

# We force the use of icc

# We force the use of icx

AC_MSG_CHECKING([whether INTEL's MKL is enabled])

AC_ARG_ENABLE(mkl,

	[AS_HELP_STRING([--enable-mkl],

	[Use INTEL's MKL for solvers and FFTs (default = no)])],

        enable_icc="yes"

        CC="icc"

        enable_icx="yes"

        CC="icx"

	AC_MSG_RESULT([yes]),

	AC_MSG_RESULT([no]))
@@ -120,7 +120,7 @@ AC_HEADER_STDC 
AC_CHECK_HEADERS([fcntl.h limits.h malloc.h stdlib.h string.h sys/mman.h \

		sys/types.h unistd.h])

# Checks for INTEL math header files.

if test "$enable_icc" = "yes"; then

if test "$enable_icx" = "yes"; then

  AC_CHECK_HEADERS(mathimf.h)

fi
@@ -338,7 +338,7 @@ AM_CONDITIONAL(USE_MODEL, [test "$enable_model_fitting" != "no"]) 


# Compile with profiling option

if test "$enable_profiling" = "yes"; then

  if test "$enable_icc" = "yes"; then

  if test "$enable_icx" = "yes"; then

    AM_CFLAGS="$AM_CFLAGS -pq"

  else

    AM_CFLAGS="$AM_CFLAGS -pg"
@@ -348,9 +348,9 @@ fi 


# "Best" linking option

if test "$enable_best_link" = "yes"; then

  if test "$enable_icc" = "yes"; then

    AM_LDFLAGS="-static-intel -qopenmp-link static -shared-libgcc \

	-static-libtool-libs -no-intel-extensions -avoid-version $AM_LDFLAGS"

  if test "$enable_icx" = "yes"; then

    AM_LDFLAGS="-static-intel -qopenmp-link=static -shared-libgcc \

	-static-libtool-libs -avoid-version $AM_LDFLAGS"

  else

    AM_LDFLAGS="-shared-libgcc -static-libtool-libs -avoid-version $AM_LDFLAGS"

  fi

m4/acx_prog_cc_optim.m4

+4 −4
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
dnl

dnl	This file part of:	AstrOmatic software

dnl

dnl	Copyright:		(C) 2002-2013 Emmanuel Bertin -- IAP/CNRS/UPMC

dnl	Copyright:		(C) 2002-2022 Emmanuel Bertin -- IAP/CNRS/SorbonneU

dnl				(C) 2002 Ville Lauriki (original version)

dnl

dnl	Licenses:		GPL (this version)
@@ -25,7 +25,7 @@ dnl You should have received a copy of the GNU General Public License 
dnl	along with AstrOmatic software.

dnl	If not, see <http://www.gnu.org/licenses/>.

dnl

dnl	Last modified:		13/03/2013

dnl	Last modified:		07/09/2022

dnl

dnl %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

dnl
@@ -60,14 +60,14 @@ EOF 
      if $CC -V 2>&1 | grep -i "Intel(R) 64" > /dev/null 2>&1 &&

           $CC -c -O conftest.c > /dev/null 2>&1 &&

           test -f conftest.o; then

        prog_cc_optim_cv_flags="-O3 -axSSSE3,SSE4.1,SSE4.2,AVX,CORE-AVX2,CORE-AVX-I -no-prec-div -unroll"

        prog_cc_optim_cv_flags="-O3 -axSSSE3,SSE4.1,SSE4.2,AVX,CORE-AVX2,CORE-AVX-I"

        prog_ld_optim_cv_flags=""



      dnl INTEL C 32bits compiler

      elif $CC -V 2>&1 | grep -i "Intel(R)" > /dev/null 2>&1 &&

           $CC -c -O conftest.c > /dev/null 2>&1 &&

           test -f conftest.o; then

        prog_cc_optim_cv_flags="-O3 -axSSE2,SSE3,SSE4.1,SSE4.2,AVX,CORE-AVX2,CORE-AVX-I -no-prec-div -unroll"

        prog_cc_optim_cv_flags="-O3 -axSSE2,SSE3,SSE4.1,SSE4.2,AVX,CORE-AVX2,CORE-AVX-I"

        prog_ld_optim_cv_flags=""



      dnl GCC