diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-10-09 17:42:46 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-09 17:42:46 (GMT) |
| commit | 0feda66ff0dccdf77453b7c881c80be244e0ae12 (patch) | |
| tree | c4a35a804bf18a5dac14aafae3f3e6e9281140ae /bin | |
| parent | 7b18845e9c24cc0d910fa082d3f5c7c92797396d (diff) | |
| download | hdf5-0feda66ff0dccdf77453b7c881c80be244e0ae12.zip hdf5-0feda66ff0dccdf77453b7c881c80be244e0ae12.tar.gz hdf5-0feda66ff0dccdf77453b7c881c80be244e0ae12.tar.bz2 | |
Bring the H5detect removal change from develop (#3648)
* Bring the H5detect removal change from develop
- Removed CMake cross-compiling variables
* HDF5_USE_PREGEN
* HDF5_BATCH_H5DETECT
These were used to work around H5detect and H5make_libsettings and
are no longer required.
- Running H5make_libsettings is no longer required for cross-compiling
The functionality of H5make_libsettings is now handled via template files,
so H5make_libsettings has been removed.
- Running H5detect is no longer required for cross-compiling
The functionality of H5detect is now exercised at library startup,
so H5detect has been removed.
* Put H5T_CONV_ab macros in do..while loops (#3432)
Ever since a recent round of macro cleanup, bin/trace and clang-format
have been bickering over what H5Tconv.c should look like and neither
produces readable code.
This change puts the top-level H5T_CONV_ab macros in do..while loops,
adds appropriate semicolons, and adds the missing H5_CLANG_DIAG_ON|OFF
and H5_GCC_CLANG_DIAG_ON|OFF macros to the list of statement macros
clang-format recognizes. H5Tconv.c is now readable and both bin/trace
and clang-format are happy.
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/batch/knl_H5detect.sl.in.cmake | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/bin/batch/knl_H5detect.sl.in.cmake b/bin/batch/knl_H5detect.sl.in.cmake deleted file mode 100644 index 39a3ef3..0000000 --- a/bin/batch/knl_H5detect.sl.in.cmake +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -#SBATCH -p knl -C quad -#SBATCH --nodes=1 -#SBATCH -t 00:10:00 -#SBATCH --mail-type=BEGIN,END,FAIL -#SBATCH --mail-user=<username>@sandia.gov -#SBATCH --export=ALL -#SBATCH --job-name=knl_h5detect - - -# Inputs: Build directory, output file name, executable file name (username/email if available). -PROGNAME=H5detect -OUTPUT=H5Tinit.c - -CMD="@HDF5_BINARY_DIR@/bin/${PROGNAME} @HDF5_GENERATED_SOURCE_DIR@/${OUTPUT}" -echo "Run $CMD" -srun -n 1 $CMD -echo "Done running $CMD" - |