ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not define __INTEL_COMPILER to __INTEL_LLVM_COMPILER instead test for either

Browse Source 
This shortcut will create problems for features that do not exist for
the Intel LLVM based compiler.
This commit is contained in:
Axel Kohlmeyer
2025-01-31 21:20:44 -05:00
parent 381f141384
commit 29b5fce5e4
7 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/INTEL/fix_intel.cpp
View File

@ -210,7 +210,7 @@ FixIntel::FixIntel(LAMMPS *lmp, int narg, char **arg) : Fix(lmp, narg, arg)
// nomp is user setting, default = 0 // nomp is user setting, default = 0
#if defined(_OPENMP) #if defined(_OPENMP)
#if defined(__INTEL_COMPILER) #if defined(__INTEL_COMPILER) || defined(__INTEL_LLVM_COMPILER)
kmp_set_blocktime(0); kmp_set_blocktime(0);
#endif #endif
if (nomp != 0) { if (nomp != 0) {
@ -449,7 +449,7 @@ void FixIntel::pair_init_check(const bool cdmessage)
__INTEL_COMPILER_BUILD_DATE < 20141023) __INTEL_COMPILER_BUILD_DATE < 20141023)
error->warning(FLERR,"Unsupported Intel Compiler."); error->warning(FLERR,"Unsupported Intel Compiler.");
#endif #endif
#if !defined(__INTEL_COMPILER) #if !defined(__INTEL_COMPILER) && !defined(__INTEL_LLVM_COMPILER)
error->warning(FLERR,"Unsupported Intel Compiler."); error->warning(FLERR,"Unsupported Intel Compiler.");
#endif #endif
} }

2
src/INTEL/intel_intrinsics_airebo.h
View File

@ -1,6 +1,6 @@
// clang-format off // clang-format off
#ifndef LMP_INTEL_AIREBO_SCALAR #ifndef LMP_INTEL_AIREBO_SCALAR
# ifdef __INTEL_COMPILER # if defined(__INTEL_COMPILER) || defined(__INTEL_LLVM_COMPILER)
# if defined(__MIC__) || defined(__AVX512F__) # if defined(__MIC__) || defined(__AVX512F__)
# define LMP_INTEL_AIREBO_512 # define LMP_INTEL_AIREBO_512
# elif defined(__AVX__) # elif defined(__AVX__)

5
src/INTEL/intel_preprocess.h
View File

@ -20,7 +20,6 @@
#ifdef __INTEL_LLVM_COMPILER #ifdef __INTEL_LLVM_COMPILER
#define USE_OMP_SIMD #define USE_OMP_SIMD
#define __INTEL_COMPILER __INTEL_LLVM_COMPILER
#define __INTEL_COMPILER_BUILD_DATE __INTEL_LLVM_COMPILER #define __INTEL_COMPILER_BUILD_DATE __INTEL_LLVM_COMPILER
// Indicate to vectorizer that it is safe to use dword indexed gather // Indicate to vectorizer that it is safe to use dword indexed gather
#define IP_PRE_dword_index(i) ((i) & NEIGHMASK) #define IP_PRE_dword_index(i) ((i) & NEIGHMASK)
@ -28,7 +27,7 @@
#define IP_PRE_dword_index(i) i #define IP_PRE_dword_index(i) i
#endif #endif
#ifdef __INTEL_COMPILER #if defined(__INTEL_COMPILER) || defined(__INTEL_LLVM_COMPILER)
#define LMP_SIMD_COMPILER #define LMP_SIMD_COMPILER
#if (__INTEL_COMPILER_BUILD_DATE > 20160720) #if (__INTEL_COMPILER_BUILD_DATE > 20160720)
#define LMP_INTEL_USE_SIMDOFF #define LMP_INTEL_USE_SIMDOFF
@ -87,7 +86,7 @@ enum {TIME_PACK, TIME_HOST_NEIGHBOR, TIME_HOST_PAIR, TIME_OFFLOAD_NEIGHBOR,
#define INTEL_P3M_MAXORDER 8 #define INTEL_P3M_MAXORDER 8
#define INTEL_P3M_ALIGNED_MAXORDER 8 #define INTEL_P3M_ALIGNED_MAXORDER 8
#ifdef __INTEL_COMPILER #if defined(__INTEL_COMPILER) || defined(__INTEL_LLVM_COMPILER)
#ifdef __AVX__ #ifdef __AVX__
#undef INTEL_VECTOR_WIDTH #undef INTEL_VECTOR_WIDTH
#define INTEL_VECTOR_WIDTH 8 #define INTEL_VECTOR_WIDTH 8

8
src/INTEL/npair_intel.cpp
View File

@ -777,14 +777,14 @@ void NPairIntel::bin_newton(const int offload, NeighList *list,
int * _noalias jlist = firstneigh[i]; int * _noalias jlist = firstneigh[i];
int jnum = numneigh[i]; int jnum = numneigh[i];
if (!THREE) IP_PRE_neighbor_pad(jnum, offload); if (!THREE) IP_PRE_neighbor_pad(jnum, offload);
#if __INTEL_COMPILER+0 > 1499 #if (__INTEL_COMPILER+0 > 1499) || __INTEL_LLVM_COMPILER
#if defined(USE_OMP_SIMD) #if defined(USE_OMP_SIMD)
#pragma omp simd reduction(max:vlmax,vgmax) \ #pragma omp simd reduction(max:vlmax,vgmax) \
reduction(min:vlmin, vgmin) reduction(min:vlmin, vgmin)
#else #else
#pragma simd reduction(max:vlmax,vgmax) \ #pragma simd reduction(max:vlmax,vgmax) \
reduction(min:vlmin, vgmin) reduction(min:vlmin, vgmin)
#endif #endif
#pragma vector aligned #pragma vector aligned
#endif #endif
for (int jj = 0; jj < jnum; jj++) { for (int jj = 0; jj < jnum; jj++) {

3
src/INTEL/pair_sw_intel.cpp
View File

@ -1131,8 +1131,7 @@ void PairSWIntel::init_style()
#if defined(__INTEL_COMPILER) #if defined(__INTEL_COMPILER)
if (__INTEL_COMPILER_BUILD_DATE < 20141023) if (__INTEL_COMPILER_BUILD_DATE < 20141023)
error->all(FLERR, "Intel compiler versions before " error->all(FLERR, "Intel compiler versions before 15 Update 1 not supported for sw/intel");
"15 Update 1 not supported for sw/intel");
#endif #endif
} }

2
src/INTEL/pair_tersoff_intel.cpp
View File

@ -28,7 +28,7 @@
using namespace LAMMPS_NS; using namespace LAMMPS_NS;
// Currently the Intel compiler is required for this pair style. // Currently the Intel compiler is required for this pair style.
#ifdef __INTEL_COMPILER #if defined(__INTEL_COMPILER) || defined(__INTEL_LLVM_COMPILER)
#ifdef _LMP_INTEL_OFFLOAD #ifdef _LMP_INTEL_OFFLOAD
#pragma offload_attribute(push,target(mic)) #pragma offload_attribute(push,target(mic))

4
src/INTEL/pair_tersoff_intel.h
View File

@ -15,7 +15,7 @@
#ifdef PAIR_CLASS #ifdef PAIR_CLASS
// clang-format off // clang-format off
// Currently the Intel compilers are required for this pair style. // Currently the Intel compilers are required for this pair style.
#ifdef __INTEL_COMPILER #if defined(__INTEL_COMPILER) || defined(__INTEL_LLVM_COMPILER)
PairStyle(tersoff/intel,PairTersoffIntel); PairStyle(tersoff/intel,PairTersoffIntel);
#endif #endif
// clang-format on // clang-format on
@ -28,7 +28,7 @@ PairStyle(tersoff/intel,PairTersoffIntel);
#include "pair.h" #include "pair.h"
#include "pair_tersoff.h" #include "pair_tersoff.h"
#ifdef __INTEL_COMPILER #if defined(__INTEL_COMPILER) || defined(__INTEL_LLVM_COMPILER)
namespace LAMMPS_NS { namespace LAMMPS_NS {