maybe fix + CI

geoarrow · Dec 17, 2023 · 5f55d03 · 5f55d03
1 parent 11fbf1e
commit 5f55d03
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
@@ -24,7 +24,7 @@ jobs:
       matrix:
         config:
           - {label: default-build, cmake_args: "-DCMAKE_BUILD_TYPE=Debug -DGEOARROW_COVERAGE=ON"}
-          - {label: bundled-build, cmake_args: "-DGEOARROW_BUNDLE=ON"}
+          - {label: bundled-build, cmake_args: "-DGEOARROW_BUNDLE=ON -DGEOARROW_USE_FAST_FLOAT=OFF -DGEOARROW_USE_RYU=OFF"}
 
     steps:
       - name: Checkout repo

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -75,8 +75,6 @@ set(GEOARROW_SOURCES
     src/geoarrow/wkt_writer.c
     src/geoarrow/array_reader.c
     src/geoarrow/array_writer.c
-    ${GEOARROW_DOUBLE_PARSE_SOURCE}
-    ${GEOARROW_DOUBLE_PRINT_SOURCE}
     src/geoarrow/nanoarrow.c)
 
 set(GEOARROW_PUBLIC_HEADERS
@@ -109,7 +107,8 @@ if(GEOARROW_BUNDLE)
 
   file(APPEND ${GEOARROW_C_TEMP} "#pragma GCC diagnostic push")
 
-  foreach(SRC_FILE ${GEOARROW_SOURCES})
+  foreach(SRC_FILE ${GEOARROW_SOURCES} src/geoarrow/double_print.c
+                   src/geoarrow/double_parse_std.c)
     file(READ ${SRC_FILE} SRC_FILE_CONTENTS)
     file(APPEND ${GEOARROW_C_TEMP} "${SRC_FILE_CONTENTS}")
   endforeach()
@@ -149,7 +148,8 @@ if(GEOARROW_BUNDLE)
   endif()
 else()
   # Normal CMake build
-  add_library(geoarrow ${GEOARROW_SOURCES})
+  add_library(geoarrow ${GEOARROW_SOURCES} ${GEOARROW_DOUBLE_PARSE_SOURCE}
+                       ${GEOARROW_DOUBLE_PRINT_SOURCE})
 
   target_include_directories(geoarrow
                              PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/geoarrow>

diff --git a/src/geoarrow/wkx_files_test.cc b/src/geoarrow/wkx_files_test.cc
@@ -28,12 +28,10 @@ TEST(WKXFilesTest, WKXFilesTestFiles) {
       continue;
     }
 
-    // Some values from nc.wkt don't round trip exactly through ryu
-#if defined(GEOARROW_USE_RYU) && GEOARROW_USE_RYU
+    // Some values from nc.wkt don't round trip exactly because of double precision printing
     if (path.substr(path.size() - 6, path.size()) == "nc.wkt") {
       continue;
     }
-#endif
 
     std::stringstream wkb_path_builder;
     wkb_path_builder << path.substr(0, path.size() - 4) << ".wkb";