BSE-4403: Fix hdf5 import (#116)

bodo-ai · Jan 6, 2025 · 5faf05f · 5faf05f
1 parent 284925b
commit 5faf05f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -592,10 +592,13 @@ if (NOT (CMAKE_BUILD_TYPE STREQUAL "Release") AND NOT DEFINED ENV{BODO_SKIP_CPP_
     "bodo/tests/test_theta_sketches.cpp")
 endif()
 
-set(NO_HDF5 "$ENV{NO_HDF5}")
-if(NOT NO_HDF5)
+if($"ENV{NO_HDF5}" STREQUAL "1")
+    set(NO_HDF5 TRUE)
+else()
     list(APPEND sources_list "bodo/io/_hdf5.cpp")
+    set(NO_HDF5 FALSE)
 endif()
+cmake_print_variables(NO_HDF5)
 
 python_add_library(ext MODULE WITH_SOABI "${sources_list}")
 

diff --git a/bodo/io/h5_api.py b/bodo/io/h5_api.py
@@ -29,7 +29,7 @@
     import h5py
     import llvmlite.binding as ll
 
-    from bodo.io import _hdf5
+    from bodo.ext import _hdf5
 
     ll.add_symbol("h5_open", _hdf5.h5_open)
     ll.add_symbol("h5_open_dset_or_group_obj", _hdf5.h5_open_dset_or_group_obj)

diff --git a/bodo/utils/utils.py b/bodo/utils/utils.py
@@ -1489,7 +1489,7 @@ def has_supported_h5py() -> bool:
     try:
         import h5py  # noqa
 
-        from bodo.io import _hdf5  # noqa
+        from bodo.ext import _hdf5  # noqa
 
         # TODO: make sure h5py/hdf5 supports parallel
     except ImportError: