image_samplers, geometry: C++14 flags

These files includes C++11 features and GCC<6 does still default to C++98/03.
yt-project · Oct 9, 2020 · 3347196 · 3347196
1 parent 077573e
commit 3347196
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 19 deletions.
diff --git a/yt/geometry/particle_oct_container.pyx b/yt/geometry/particle_oct_container.pyx
@@ -1,5 +1,6 @@
 # distutils: include_dirs = LIB_DIR_EWAH
 # distutils: language = c++
+# distutils: extra_compile_args = CPP14_FLAG
 # distutils: libraries = STD_LIBS
 """
 Oct container tuned for Particles

diff --git a/yt/utilities/lib/bounding_volume_hierarchy.pyx b/yt/utilities/lib/bounding_volume_hierarchy.pyx
@@ -1,7 +1,7 @@
 # distutils: libraries = STD_LIBS
 # distutils: include_dirs = LIB_DIR
-# distutils: extra_compile_args = OMP_ARGS
-# distutils: extra_link_args = OMP_ARGS
+# distutils: extra_compile_args = CPP14_FLAG OMP_ARGS
+# distutils: extra_link_args = CPP14_FLAG OMP_ARGS
 cimport cython
 
 import numpy as np

diff --git a/yt/utilities/lib/cyoctree.pyx b/yt/utilities/lib/cyoctree.pyx
@@ -1,6 +1,6 @@
 # distutils: libraries = STD_LIBS
-# distutils: extra_link_args = OMP_ARGS
-# distutils: extra_compile_args = OMP_ARGS
+# distutils: extra_link_args = CPP14_FLAG OMP_ARGS
+# distutils: extra_compile_args = CPP14_FLAG OMP_ARGS
 # distutils: include_dirs = LIB_DIR
 # distutils: language = c++
 """

diff --git a/yt/utilities/lib/field_interpolation_tables.pxd b/yt/utilities/lib/field_interpolation_tables.pxd
@@ -1,3 +1,6 @@
+# distutils: language = c++
+# distutils: extra_compile_args = CPP14_FLAG
+# distutils: extra_link_args = CPP14_FLAG
 """
 Field Interpolation Tables
 
@@ -10,7 +13,8 @@ cimport cython
 cimport numpy as np
 from yt.utilities.lib.fp_utils cimport imax, fmax, imin, fmin, iclip, fclip, fabs
 from libc.stdlib cimport malloc
-from libc.math cimport isnormal
+cdef extern from "<cmath>" namespace "std":
+    bint isnormal(double x) nogil
 
 cdef struct FieldInterpolationTable:
     # Note that we make an assumption about retaining a reference to values

diff --git a/yt/utilities/lib/geometry_utils.pyx b/yt/utilities/lib/geometry_utils.pyx
@@ -1,6 +1,6 @@
 # distutils: libraries = STD_LIBS
-# distutils: extra_compile_args = OMP_ARGS
-# distutils: extra_link_args = OMP_ARGS
+# distutils: extra_compile_args = CPP14_FLAG OMP_ARGS
+# distutils: extra_link_args = CPP14_FLAG OMP_ARGS
 """
 Simple integrators for the radiative transfer equation
 

diff --git a/yt/utilities/lib/grid_traversal.pyx b/yt/utilities/lib/grid_traversal.pyx
@@ -1,6 +1,9 @@
 # distutils: include_dirs = LIB_DIR
 # distutils: libraries = STD_LIBS
 # distutils: sources = FIXED_INTERP
+# distutils: language = c++
+# distutils: extra_compile_args = CPP14_FLAG
+# distutils: extra_link_args = CPP14_FLAG
 """
 Simple integrators for the radiative transfer equation
 
@@ -13,12 +16,6 @@ import numpy as np
 
 cimport cython
 cimport numpy as np
-from field_interpolation_tables cimport (
-    FieldInterpolationTable,
-    FIT_eval_transfer,
-    FIT_eval_transfer_with_light,
-    FIT_initialize_table,
-)
 from fixed_interpolator cimport *
 from libc.math cimport (
     M_PI,

diff --git a/yt/utilities/lib/image_samplers.pyx b/yt/utilities/lib/image_samplers.pyx
@@ -1,6 +1,6 @@
 # distutils: include_dirs = LIB_DIR
-# distutils: extra_compile_args = OMP_ARGS
-# distutils: extra_link_args = OMP_ARGS
+# distutils: extra_compile_args = CPP14_FLAG OMP_ARGS
+# distutils: extra_link_args = CPP14_FLAG OMP_ARGS
 # distutils: libraries = STD_LIBS
 # distutils: sources = FIXED_INTERP
 # distutils: language = c++

diff --git a/yt/utilities/lib/misc_utilities.pyx b/yt/utilities/lib/misc_utilities.pyx
@@ -1,6 +1,7 @@
 # distutils: libraries = STD_LIBS
-# distutils: extra_compile_args = OMP_ARGS
-# distutils: extra_link_args = OMP_ARGS
+# distutils: language = c++
+# distutils: extra_compile_args = CPP14_FLAG OMP_ARGS
+# distutils: extra_link_args = CPP14_FLAG OMP_ARGS
 """
 Simple utilities that don't fit anywhere else
 

diff --git a/yt/utilities/lib/partitioned_grid.pyx b/yt/utilities/lib/partitioned_grid.pyx
@@ -2,6 +2,8 @@
 # distutils: include_dirs = LIB_DIR
 # distutils: libraries = STD_LIBS
 # distutils: language = c++
+# distutils: extra_compile_args = CPP14_FLAG
+# distutils: extra_link_args = CPP14_FLAG
 """
 Image sampler definitions
 

diff --git a/yt/utilities/lib/pixelization_routines.pyx b/yt/utilities/lib/pixelization_routines.pyx
@@ -1,6 +1,6 @@
 # distutils: include_dirs = LIB_DIR
-# distutils: extra_compile_args = OMP_ARGS
-# distutils: extra_link_args = OMP_ARGS
+# distutils: extra_compile_args = CPP14_FLAG OMP_ARGS
+# distutils: extra_link_args = CPP14_FLAG OMP_ARGS
 # distutils: language = c++
 # distutils: libraries = STD_LIBS
 # distutils: sources = yt/utilities/lib/pixelization_constants.c