Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add SZip support using libaec #179

Merged
merged 6 commits into from
Dec 21, 2022
Merged

Add SZip support using libaec #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
725ccf0
Add SZip support using libaec
adamcpovey Aug 4, 2022
e2dcd35
Bump build number
adamcpovey Aug 4, 2022
6c67207
Show `config.log` on configuration failure
jakirkham Aug 4, 2022
677a305
MNT: Re-rendered with conda-build 3.21.9, conda-smithy 3.21.1, and co…
Aug 4, 2022
d709eae
Fixes for cross-compilation
adamcpovey Aug 5, 2022
93e6ea0
Correct windows library path
adamcpovey Aug 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .azure-pipelines/azure-pipelines-osx.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ if [[ "$CONDA_BUILD_CROSS_COMPILATION" == 1 && $target_platform == "osx-arm64" ]
export PAC_FC_ALL_REAL_KINDS_SIZEOF="{4,8}"
export PAC_FC_ALL_INTEGER_KINDS_SIZEOF="{1,2,4,8,16}"
export hdf5_disable_tests="--enable-tests=no"
export hdf5_cv_szlib_can_encode=yes
fi

./configure --prefix="${PREFIX}" \
Expand All @@ -85,6 +86,7 @@ fi
--host="${HOST}" \
--build="${BUILD}" \
--with-zlib="${PREFIX}" \
--with-szlib="${PREFIX}" \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You might need to export something to help hdf5 identify the configuration for cross compilation

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Took me a bit to work out what you meant, but I eventually tracked down which bit of the configure was failing. I can't check it here so let's push and see what happens

--with-pthread=yes \
${HDF5_OPTIONS} \
--enable-cxx \
Expand All @@ -96,7 +98,8 @@ fi
--enable-using-memchecker \
--enable-static=yes \
--enable-ros3-vfd \
${hdf5_disable_tests}
${hdf5_disable_tests} \
|| (cat config.log; false)
Comment on lines -99 to +102
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should help us see any details related to configuration errors (atm ones on macOS, but is generally useful outside of this need)


# allow oversubscribing with openmpi in make check
export OMPI_MCA_rmaps_base_oversubscribe=yes
Expand Down
2 changes: 2 additions & 0 deletions recipe/install.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ cmake -G "Ninja" ^
-D HDF5_BUILD_HL_LIB:BOOL=ON ^
-D HDF5_BUILD_TOOLS:BOOL=ON ^
-D HDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON ^
-D SZIP_LIBRARY:FILEPATH=%LIBRARY_PREFIX%\lib\libsz.lib ^
-D SZIP_INCLUDE_DIR:PATH=%LIBRARY_PREFIX%\include ^
-D HDF5_ENABLE_THREADSAFE:BOOL=ON ^
-D HDF5_ENABLE_ROS3_VFD:BOOL=ON ^
-D ALLOW_UNSUPPORTED:BOOL=ON ^
Expand Down
4 changes: 3 additions & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set version = "1.12.2" %}
{% set maj_min_ver = ".".join(version.split(".")[:2]) %}
{% set build = 0 %}
{% set build = 1 %}

# recipe-lint fails if mpi is undefined
{% set mpi = mpi or 'nompi' %}
Expand Down Expand Up @@ -75,6 +75,7 @@ requirements:
host:
- {{ mpi }} # [mpi != 'nompi']
- zlib
- libaec
- libcurl
- openssl
run:
Expand Down Expand Up @@ -103,6 +104,7 @@ outputs:
host:
- {{ mpi }} # [mpi != 'nompi']
- zlib
- libaec
- libcurl
- openssl
run:
Expand Down