Skip to content

Commit b7e178d

Browse files
ax3lax3l
committed
image_samplers, geometry: C++14 flags
These files includes C++11 features and GCC<6 does still default to C++98/03.
1 parent 077573e commit b7e178d

10 files changed

+23
-21
lines changed

‎yt/geometry/particle_oct_container.pyx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# distutils: include_dirs = LIB_DIR_EWAH
22
# distutils: language = c++
3+
# distutils: extra_compile_args = CPP14_FLAG
34
# distutils: libraries = STD_LIBS
45
"""
56
Oct container tuned for Particles

‎yt/utilities/lib/bounding_volume_hierarchy.pyx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# distutils: libraries = STD_LIBS
22
# distutils: include_dirs = LIB_DIR
3-
# distutils: extra_compile_args = OMP_ARGS
4-
# distutils: extra_link_args = OMP_ARGS
3+
# distutils: extra_compile_args = CPP14_FLAG OMP_ARGS
4+
# distutils: extra_link_args = CPP14_FLAG OMP_ARGS
55
cimport cython
66

77
import numpy as np

‎yt/utilities/lib/cyoctree.pyx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# distutils: libraries = STD_LIBS
2-
# distutils: extra_link_args = OMP_ARGS
3-
# distutils: extra_compile_args = OMP_ARGS
2+
# distutils: extra_link_args = CPP14_FLAG OMP_ARGS
3+
# distutils: extra_compile_args = CPP14_FLAG OMP_ARGS
44
# distutils: include_dirs = LIB_DIR
55
# distutils: language = c++
66
"""

‎yt/utilities/lib/field_interpolation_tables.pxd‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# distutils: language = c++
2+
# distutils: extra_compile_args = CPP14_FLAG
3+
# distutils: extra_link_args = CPP14_FLAG
14
"""
25
Field Interpolation Tables
36
@@ -10,7 +13,8 @@ cimport cython
1013
cimport numpy as np
1114
from yt.utilities.lib.fp_utils cimport imax, fmax, imin, fmin, iclip, fclip, fabs
1215
from libc.stdlib cimport malloc
13-
from libc.math cimport isnormal
16+
cdef extern from "<cmath>" namespace "std":
17+
bint isnormal(double x) nogil
1418

1519
cdef struct FieldInterpolationTable:
1620
# Note that we make an assumption about retaining a reference to values

‎yt/utilities/lib/geometry_utils.pyx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# distutils: libraries = STD_LIBS
2-
# distutils: extra_compile_args = OMP_ARGS
3-
# distutils: extra_link_args = OMP_ARGS
2+
# distutils: extra_compile_args = CPP14_FLAG OMP_ARGS
3+
# distutils: extra_link_args = CPP14_FLAG OMP_ARGS
44
"""
55
Simple integrators for the radiative transfer equation
66

‎yt/utilities/lib/grid_traversal.pyx‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# distutils: include_dirs = LIB_DIR
22
# distutils: libraries = STD_LIBS
33
# distutils: sources = FIXED_INTERP
4+
# distutils: language = c++
5+
# distutils: extra_compile_args = CPP14_FLAG
6+
# distutils: extra_link_args = CPP14_FLAG
47
"""
58
Simple integrators for the radiative transfer equation
69
@@ -13,12 +16,6 @@ import numpy as np
1316

1417
cimport cython
1518
cimport numpy as np
16-
from field_interpolation_tables cimport (
17-
FieldInterpolationTable,
18-
FIT_eval_transfer,
19-
FIT_eval_transfer_with_light,
20-
FIT_initialize_table,
21-
)
2219
from fixed_interpolator cimport *
2320
from libc.math cimport (
2421
M_PI,

‎yt/utilities/lib/image_samplers.pyx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# distutils: include_dirs = LIB_DIR
2-
# distutils: extra_compile_args = OMP_ARGS
3-
# distutils: extra_link_args = OMP_ARGS
2+
# distutils: extra_compile_args = CPP14_FLAG OMP_ARGS
3+
# distutils: extra_link_args = CPP14_FLAG OMP_ARGS
44
# distutils: libraries = STD_LIBS
55
# distutils: sources = FIXED_INTERP
66
# distutils: language = c++

‎yt/utilities/lib/misc_utilities.pyx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# distutils: libraries = STD_LIBS
2-
# distutils: extra_compile_args = OMP_ARGS
3-
# distutils: extra_link_args = OMP_ARGS
2+
# distutils: language = c++
3+
# distutils: extra_compile_args = CPP14_FLAG OMP_ARGS
4+
# distutils: extra_link_args = CPP14_FLAG OMP_ARGS
45
"""
56
Simple utilities that don't fit anywhere else
67

‎yt/utilities/lib/pixelization_routines.pyx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# distutils: include_dirs = LIB_DIR
2-
# distutils: extra_compile_args = OMP_ARGS
3-
# distutils: extra_link_args = OMP_ARGS
2+
# distutils: extra_compile_args = CPP14_FLAG OMP_ARGS
3+
# distutils: extra_link_args = CPP14_FLAG OMP_ARGS
44
# distutils: language = c++
55
# distutils: libraries = STD_LIBS
66
# distutils: sources = yt/utilities/lib/pixelization_constants.c

‎yt/utilities/lib/platform_dep.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
#include "malloc.h"
44
typedef int int32_t;
55
typedef long long int64_t;
6-
/* Taken from http://siliconandlithium.blogspot.com/2014/05/msvc-c99-mathh-header.html */
7-
#define isnormal(x) ((_fpclass(x) == _FPCLASS_NN) || (_fpclass(x) == _FPCLASS_PN))
6+
87
static __inline double rint(double x){
98
const double two_to_52 = 4.5035996273704960e+15;
109
double fa = fabs(x);

0 commit comments

Comments
 (0)