use npy_hypot

vtavana · vtavana · commit 9bff9c115bf5 · 2025-07-14T08:57:35.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -111,6 +111,8 @@ set_target_properties(${_trgt} PROPERTIES
     C_STANDARD 99
 )
 target_include_directories(${_trgt} PUBLIC mkl_umath/src/ ${Python_NumPy_INCLUDE_DIRS} ${Python_INCLUDE_DIRS})
+set(NPYMATH_PATH "${Python_NumPy_INCLUDE_DIRS}/../lib")
+target_link_libraries(${_trgt} PRIVATE ${NPYMATH_PATH}/libnpymath.a)
 target_link_libraries(${_trgt} PUBLIC MKL::MKL ${Python_LIBRARIES})
 target_link_options(${_trgt} PUBLIC ${_linker_options})
 target_compile_options(${_trgt} PUBLIC -fveclib=SVML)
diff --git a/mkl_umath/src/mkl_umath_loops.c.src b/mkl_umath/src/mkl_umath_loops.c.src
@@ -2695,7 +2695,7 @@ mkl_umath_@TYPE@_absolute(char **args, const npy_intp *dimensions, const npy_int
         UNARY_LOOP {
             const @ftype@ in1r = ((@ftype@ *)ip1)[0];
             const @ftype@ in1i = ((@ftype@ *)ip1)[1];
-            *((@ftype@ *)op1) = hypot@c@(in1r, in1i);
+            *((@ftype@ *)op1) = npy_hypot@c@(in1r, in1i);
         }
     }
     if(ignore_fpstatus) {

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,8 @@ set_target_properties(${_trgt} PROPERTIES`
`111`	`111`	`C_STANDARD 99`
`112`	`112`	`)`
`113`	`113`	`target_include_directories(${_trgt} PUBLIC mkl_umath/src/ ${Python_NumPy_INCLUDE_DIRS} ${Python_INCLUDE_DIRS})`
	`114`	`+set(NPYMATH_PATH "${Python_NumPy_INCLUDE_DIRS}/../lib")`
	`115`	`+target_link_libraries(${_trgt} PRIVATE ${NPYMATH_PATH}/libnpymath.a)`
`114`	`116`	`target_link_libraries(${_trgt} PUBLIC MKL::MKL ${Python_LIBRARIES})`
`115`	`117`	`target_link_options(${_trgt} PUBLIC ${_linker_options})`
`116`	`118`	`target_compile_options(${_trgt} PUBLIC -fveclib=SVML)`
Original file line number	Diff line number	Diff line change
`@@ -2695,7 +2695,7 @@ mkl_umath_@TYPE@_absolute(char *args, const npy_intp dimensions, const npy_int`
`2695`	`2695`	`UNARY_LOOP {`
`2696`	`2696`	`const @ftype@ in1r = ((@ftype@ *)ip1)[0];`
`2697`	`2697`	`const @ftype@ in1i = ((@ftype@ *)ip1)[1];`
`2698`		`- ((@ftype@ )op1) = hypot@c@(in1r, in1i);`
	`2698`	`+ ((@ftype@ )op1) = npy_hypot@c@(in1r, in1i);`
`2699`	`2699`	`}`
`2700`	`2700`	`}`
`2701`	`2701`	`if(ignore_fpstatus) {`