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.

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

Try to rebuild 1.14.3 #241

Merged
merged 2 commits into from
Nov 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions .ci_support/linux_64_mpimpich.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ c_stdlib:
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
Expand Down Expand Up @@ -42,7 +42,5 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1'
4 changes: 1 addition & 3 deletions .ci_support/linux_64_mpimvapich.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ c_stdlib:
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
Expand Down Expand Up @@ -42,7 +42,5 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1'
4 changes: 1 addition & 3 deletions .ci_support/linux_64_mpinompi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ c_stdlib:
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
Expand Down Expand Up @@ -42,7 +42,5 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1'
4 changes: 1 addition & 3 deletions .ci_support/linux_64_mpiopenmpi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ c_stdlib:
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
Expand Down Expand Up @@ -42,7 +42,5 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1'
4 changes: 1 addition & 3 deletions .ci_support/linux_aarch64_mpimpich.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ c_stdlib_version:
cdt_arch:
- aarch64
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
Expand Down Expand Up @@ -46,7 +46,5 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1'
4 changes: 1 addition & 3 deletions .ci_support/linux_aarch64_mpimvapich.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ c_stdlib_version:
cdt_arch:
- aarch64
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
Expand Down Expand Up @@ -46,7 +46,5 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1'
4 changes: 1 addition & 3 deletions .ci_support/linux_aarch64_mpinompi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ c_stdlib_version:
cdt_arch:
- aarch64
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
Expand Down Expand Up @@ -46,7 +46,5 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1'
4 changes: 1 addition & 3 deletions .ci_support/linux_aarch64_mpiopenmpi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ c_stdlib_version:
cdt_arch:
- aarch64
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
Expand Down Expand Up @@ -46,7 +46,5 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1'
4 changes: 1 addition & 3 deletions .ci_support/linux_ppc64le_mpimpich.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ c_stdlib:
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
Expand Down Expand Up @@ -42,7 +42,5 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1'
4 changes: 1 addition & 3 deletions .ci_support/linux_ppc64le_mpimvapich.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ c_stdlib:
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
Expand Down Expand Up @@ -42,7 +42,5 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1'
4 changes: 1 addition & 3 deletions .ci_support/linux_ppc64le_mpinompi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ c_stdlib:
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
Expand Down Expand Up @@ -42,7 +42,5 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1'
4 changes: 1 addition & 3 deletions .ci_support/linux_ppc64le_mpiopenmpi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ c_stdlib:
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
- conda
channel_sources:
- conda-forge
channel_targets:
Expand Down Expand Up @@ -42,7 +42,5 @@ zip_keys:
- - c_compiler_version
- cxx_compiler_version
- fortran_compiler_version
- - c_stdlib_version
- cdt_name
zlib:
- '1'
17 changes: 0 additions & 17 deletions .github/workflows/automerge.yml

This file was deleted.

13 changes: 0 additions & 13 deletions .github/workflows/webservices.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .scripts/run_osx_build.sh

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

7 changes: 4 additions & 3 deletions .scripts/run_win_build.bat

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

80 changes: 80 additions & 0 deletions recipe/bld.bat
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,84 @@ if errorlevel 1 exit 1
findstr /V "Libs.private" %LIBRARY_PREFIX%\\lib\\pkgconfig\\hdf5.pc > hdf5.pc.new
if errorlevel 1 exit 1
move /y hdf5.pc.new %LIBRARY_PREFIX%\\lib\\pkgconfig\\hdf5.pc

:: The CMake Build process adds a -shared at the end of every exe when you don't
:: build the static libraries.
:: We copy the shared executables to a name without the -shared suffix to ensure
:: they are found by programs that expect them in the standard location
:: We cannot move the files since the generated CMake files from HDF5 still
:: expect them to exists with the -shared suffix
:: https://github.com/conda-forge/hdf5-feedstock/pull/188
echo Copying %LIBRARY_PREFIX%\bin\h5repart-shared.exe %LIBRARY_PREFIX%\bin\h5repart.exe
copy %LIBRARY_PREFIX%\bin\h5repart-shared.exe %LIBRARY_PREFIX%\bin\h5repart.exe
if errorlevel 1 exit 1

echo Copying %LIBRARY_PREFIX%\bin\h5debug-shared.exe %LIBRARY_PREFIX%\bin\h5debug.exe
copy %LIBRARY_PREFIX%\bin\h5debug-shared.exe %LIBRARY_PREFIX%\bin\h5debug.exe
if errorlevel 1 exit 1

echo Copying %LIBRARY_PREFIX%\bin\h5jam-shared.exe %LIBRARY_PREFIX%\bin\h5jam.exe
copy %LIBRARY_PREFIX%\bin\h5jam-shared.exe %LIBRARY_PREFIX%\bin\h5jam.exe
if errorlevel 1 exit 1

echo Copying %LIBRARY_PREFIX%\bin\h5unjam-shared.exe %LIBRARY_PREFIX%\bin\h5unjam.exe
copy %LIBRARY_PREFIX%\bin\h5unjam-shared.exe %LIBRARY_PREFIX%\bin\h5unjam.exe
if errorlevel 1 exit 1

echo Copying %LIBRARY_PREFIX%\bin\h5clear-shared.exe %LIBRARY_PREFIX%\bin\h5clear.exe
copy %LIBRARY_PREFIX%\bin\h5clear-shared.exe %LIBRARY_PREFIX%\bin\h5clear.exe
if errorlevel 1 exit 1

echo Copying %LIBRARY_PREFIX%\bin\h52gif-shared.exe %LIBRARY_PREFIX%\bin\h52gif.exe
copy %LIBRARY_PREFIX%\bin\h52gif-shared.exe %LIBRARY_PREFIX%\bin\h52gif.exe
if errorlevel 1 exit 1

echo Copying %LIBRARY_PREFIX%\bin\h5mkgrp-shared.exe %LIBRARY_PREFIX%\bin\h5mkgrp.exe
copy %LIBRARY_PREFIX%\bin\h5mkgrp-shared.exe %LIBRARY_PREFIX%\bin\h5mkgrp.exe
if errorlevel 1 exit 1

echo Copying %LIBRARY_PREFIX%\bin\h5format_convert-shared.exe %LIBRARY_PREFIX%\bin\h5format_convert.exe
copy %LIBRARY_PREFIX%\bin\h5format_convert-shared.exe %LIBRARY_PREFIX%\bin\h5format_convert.exe
if errorlevel 1 exit 1

echo Copying %LIBRARY_PREFIX%\bin\gif2h5-shared.exe %LIBRARY_PREFIX%\bin\gif2h5.exe
copy %LIBRARY_PREFIX%\bin\gif2h5-shared.exe %LIBRARY_PREFIX%\bin\gif2h5.exe
if errorlevel 1 exit 1

echo Copying %LIBRARY_PREFIX%\bin\h5copy-shared.exe %LIBRARY_PREFIX%\bin\h5copy.exe
copy %LIBRARY_PREFIX%\bin\h5copy-shared.exe %LIBRARY_PREFIX%\bin\h5copy.exe
if errorlevel 1 exit 1

echo Copying %LIBRARY_PREFIX%\bin\h5stat-shared.exe %LIBRARY_PREFIX%\bin\h5stat.exe
copy %LIBRARY_PREFIX%\bin\h5stat-shared.exe %LIBRARY_PREFIX%\bin\h5stat.exe
if errorlevel 1 exit 1

echo Copying %LIBRARY_PREFIX%\bin\h5import-shared.exe %LIBRARY_PREFIX%\bin\h5import.exe
copy %LIBRARY_PREFIX%\bin\h5import-shared.exe %LIBRARY_PREFIX%\bin\h5import.exe
if errorlevel 1 exit 1

echo Copying %LIBRARY_PREFIX%\bin\h5watch-shared.exe %LIBRARY_PREFIX%\bin\h5watch.exe
copy %LIBRARY_PREFIX%\bin\h5watch-shared.exe %LIBRARY_PREFIX%\bin\h5watch.exe
if errorlevel 1 exit 1

echo Copying %LIBRARY_PREFIX%\bin\h5diff-shared.exe %LIBRARY_PREFIX%\bin\h5diff.exe
copy %LIBRARY_PREFIX%\bin\h5diff-shared.exe %LIBRARY_PREFIX%\bin\h5diff.exe
if errorlevel 1 exit 1

echo Copying %LIBRARY_PREFIX%\bin\h5repack-shared.exe %LIBRARY_PREFIX%\bin\h5repack.exe
copy %LIBRARY_PREFIX%\bin\h5repack-shared.exe %LIBRARY_PREFIX%\bin\h5repack.exe
if errorlevel 1 exit 1

echo Copying %LIBRARY_PREFIX%\bin\h5ls-shared.exe %LIBRARY_PREFIX%\bin\h5ls.exe
copy %LIBRARY_PREFIX%\bin\h5ls-shared.exe %LIBRARY_PREFIX%\bin\h5ls.exe
if errorlevel 1 exit 1

echo Copying %LIBRARY_PREFIX%\bin\h5dump-shared.exe %LIBRARY_PREFIX%\bin\h5dump.exe
copy %LIBRARY_PREFIX%\bin\h5dump-shared.exe %LIBRARY_PREFIX%\bin\h5dump.exe
if errorlevel 1 exit 1

if "%mpi%"=="impi" (
echo Copying %LIBRARY_PREFIX%\bin\ph5diff-shared.exe %LIBRARY_PREFIX%\bin\ph5diff.exe
copy %LIBRARY_PREFIX%\bin\ph5diff-shared.exe %LIBRARY_PREFIX%\bin\ph5diff.exe
if errorlevel 1 exit 1
)
6 changes: 3 additions & 3 deletions recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,9 @@ EOF
fi

if [[ $mpi == "mvapich" ]]; then
# The t_filters_parallel test suite ensures the correct application and integrity of HDF5 filters, such as compression,
# in a parallel I/O context. The t_pmulti_dset test suite verifies the proper creation and I/O operations on multiple
# datasets in parallel. We had to disable these tests for MVAPICH due to specific failures for a couple of them,
# The t_filters_parallel test suite ensures the correct application and integrity of HDF5 filters, such as compression,
# in a parallel I/O context. The t_pmulti_dset test suite verifies the proper creation and I/O operations on multiple
# datasets in parallel. We had to disable these tests for MVAPICH due to specific failures for a couple of them,
hmaarrfk marked this conversation as resolved.
Show resolved Hide resolved
hmaarrfk marked this conversation as resolved.
Show resolved Hide resolved
# likely related to resource constraints in the testing environment.
echo "Replacing problematic test sources with dummy tests for MVAPICH"
cp $RECIPE_DIR/dummy_t_pmulti_dset.c testpar/t_pmulti_dset.c
Expand Down
Loading