diff --git a/src/info.cpp b/src/info.cpp index 48c6a941e8..9f6a977468 100644 --- a/src/info.cpp +++ b/src/info.cpp @@ -1316,7 +1316,11 @@ std::string Info::get_os_info() std::string Info::get_compiler_info() { std::string buf; -#if __clang__ +#if __INTEL_LLVM_COMPILER + double version = static_cast(__INTEL_COMPILER)*0.01; + buf = fmt::format("Intel LLVM C++ {:.2f}.{} / {}", version, + __INTEL_COMPILER_UPDATE, __VERSION__); +#elif __clang__ buf = fmt::format("Clang C++ {}", __VERSION__); #elif __PGI buf = fmt::format("PGI C++ {}.{}",__PGIC__,__PGIC_MINOR__); diff --git a/src/lmptype.h b/src/lmptype.h index 264b93a329..3e6f90f58e 100644 --- a/src/lmptype.h +++ b/src/lmptype.h @@ -242,7 +242,7 @@ The typecasts prevent compiler warnings about possible truncation issues. // define stack variable alignment -#if defined(__INTEL_COMPILER) +#if defined(__INTEL_LLVM_COMPILER) || defined(__INTEL_COMPILER) #define _alignvar(expr,val) __declspec(align(val)) expr #elif defined(__GNUC__) #define _alignvar(expr,val) expr __attribute((aligned(val))) @@ -252,7 +252,7 @@ The typecasts prevent compiler warnings about possible truncation issues. // declaration to lift aliasing restrictions -#if defined(__INTEL_COMPILER) +#if defined(__INTEL_LLVM_COMPILER) || defined(__INTEL_COMPILER) #define _noalias restrict #elif defined(__GNUC__) #define _noalias __restrict diff --git a/src/omp_compat.h b/src/omp_compat.h index 366dd9371c..8587548615 100644 --- a/src/omp_compat.h +++ b/src/omp_compat.h @@ -29,7 +29,9 @@ // autodetect OpenMP compatibility if not explicitly set #ifndef LAMMPS_OMP_COMPAT -# if defined(__INTEL_COMPILER) +# if defined(__INTEL_LLVM_COMPILER) +# define LAMMPS_OMP_COMPAT 4 +# elif defined(__INTEL_COMPILER) # if __INTEL_COMPILER > 18 # define LAMMPS_OMP_COMPAT 4 # endif