8000 BLD: Check Intel compiler when checking complex types in build by lysnikolaou · Pull Request #25044 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

BLD: Check Intel compiler when checking complex types in build #25044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

BLD: Check Intel compiler when checking complex types in build #25044

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0ff966e
BLD: Check Intel compiler when checking complex types in build
lysnikolaou Oct 31, 2023
c9de672
BLD: add needed __INTEL_LLVM_COMPILER check
mattip Nov 7, 2023
33849a4
BLD: avoid fast-math on intel compilers (taken from scipy)
mattip Nov 7, 2023
5f00b1a
BLD: fix for clang-cl
mattip Nov 7, 2023
dc29b3f
Merge branch 'main' into check-intel-meson
lysnikolaou Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'main' into check-intel-meson
  • Loading branch information
@lysnikolaou
lysnikolaou committed Mar 4, 2024
commit dc29b3f3974715e09e8d89dd2afee83294acd7e3
9 changes: 7 additions & 2 deletions numpy/_core/include/numpy/npy_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,11 +370,16 @@ typedef struct
{
long double _Val[2];
} npy_clongdouble;
#elif defined(_MSC_VER) && !defined(__INTEL_COMPILER) && !defined(__INTEL_LLVM_COMPILER) /* && !defined(__cplusplus) */

#else

#include <complex.h>

#if defined(_MSC_VER) && !defined(__INTEL_COMPILER) && !defined(__INTEL_LLVM_COMPILER)
typedef _Dcomplex npy_cdouble;
typedef _Fcomplex npy_cfloat;
typedef _Lcomplex npy_clongdouble;
#else /* !defined(_MSC_VER) || defined(__INTEL_COMPILER) */
#else /* !defined(_MSC_VER) || defined(__INTEL_COMPILER) || defined(__INTEL_LLVM_COMPILER) */
typedef double _Complex npy_cdouble;
typedef float _Complex npy_cfloat;
typedef longdouble_t _Complex npy_clongdouble;
Expand Down
2 changes: 0 additions & 2 deletions numpy/linalg/umath_linalg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,6 @@ constexpr double numeric_limits<double>::minus_one;
const double numeric_limits<double>::ninf = -NPY_INFINITY;
const double numeric_limits<double>::nan = NPY_NAN;

#if defined(_MSC_VER) && !defined(__INTEL_COMPILER) && !defined(__INTEL_LLVM_COMPILER)
template<>
struct numeric_limits<npy_cfloat> {
static constexpr npy_cfloat one = {1.0f};
Expand Down Expand Up @@ -496,7 +495,6 @@ constexpr f2c_complex numeric_limits<f2c_complex>::minus_one;
const f2c_complex numeric_limits<f2c_complex>::ninf = {-NPY_INFINITYF, 0.0f};
const f2c_complex numeric_limits<f2c_complex>::nan = {NPY_NANF, NPY_NANF};

#if defined(_MSC_VER) && !defined(__INTEL_COMPILER) && !defined(__INTEL_LLVM_COMPILER)
template<>
struct numeric_limits<npy_cdouble> {
static constexpr npy_cdouble one = {1.0};
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.
0