Skip to content

Commit

Permalink
Merge pull request #354 from LLNL/mcm86-12sep23-release-4.11.1
Browse files Browse the repository at this point in the history 
Finalize 4.11.1 release
  • Loading branch information
@markcmiller86
markcmiller86 authored Sep 13, 2023
2 parents 31dca2c + 13650b5 commit 3f52049
Show file tree
Hide file tree
Showing 16 changed files with 536 additions and 519 deletions.
8 changes: 4 additions & 4 deletions Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ ACLOCAL_AMFLAGS = -I config

nodist_noinst_HEADERS = config.h

EXTRA_DIST = COPYRIGHT VERSION BSD_LICENSE_README
EXTRA_DIST = COPYRIGHT SILO_VERSION BSD_LICENSE_README

MAINTAINERCLEANFILES = Makefile.in\
aclocal.m4\
Expand Down Expand Up @@ -102,11 +102,11 @@ dist-xz-bsd: dist-xz
cp -R $(PACKAGE)-$(VERSION) $(PACKAGE)-$(VERSION)-bsd
rm -rf $(PACKAGE)-$(VERSION)-bsd/src/hzip
rm -rf $(PACKAGE)-$(VERSION)-bsd/src/fpzip
tar cf - $(PACKAGE)-$(VERSION)-bsd | | xz -T0 -e -9 -z > $(PACKAGE)-$(VERSION)-bsd.tar.xz
tar cf - $(PACKAGE)-$(VERSION)-bsd | xz -T0 -e -9 -z > $(PACKAGE)-$(VERSION)-bsd.tar.xz
rm -rf $(PACKAGE)-$(VERSION)-bsd/tests/{amr3d.silo,pion0244.silo,amr2d.silo,xvers_data.tar.xz}
tar cf - $(PACKAGE)-$(VERSION)-bsd | | xz -T0 -e -9 -z > $(PACKAGE)-$(VERSION)-bsd-smalltest.tar.xz
tar cf - $(PACKAGE)-$(VERSION)-bsd | xz -T0 -e -9 -z > $(PACKAGE)-$(VERSION)-bsd-smalltest.tar.xz
rm -rf $(PACKAGE)-$(VERSION)-bsd
tar cf - $(PACKAGE)-$(VERSION) | | xz -T0 -e -9 -z > $(PACKAGE)-$(VERSION).tar.xz
tar cf - $(PACKAGE)-$(VERSION) | xz -T0 -e -9 -z > $(PACKAGE)-$(VERSION).tar.xz
rm -rf $(PACKAGE)-$(VERSION)

.PHONY: help
Expand Down
8 changes: 4 additions & 4 deletions Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I config
nodist_noinst_HEADERS = config.h
EXTRA_DIST = COPYRIGHT VERSION BSD_LICENSE_README
EXTRA_DIST = COPYRIGHT SILO_VERSION BSD_LICENSE_README
MAINTAINERCLEANFILES = Makefile.in\
aclocal.m4\
configure
Expand Down Expand Up @@ -976,11 +976,11 @@ dist-xz-bsd: dist-xz
cp -R $(PACKAGE)-$(VERSION) $(PACKAGE)-$(VERSION)-bsd
rm -rf $(PACKAGE)-$(VERSION)-bsd/src/hzip
rm -rf $(PACKAGE)-$(VERSION)-bsd/src/fpzip
tar cf - $(PACKAGE)-$(VERSION)-bsd | | xz -T0 -e -9 -z > $(PACKAGE)-$(VERSION)-bsd.tar.xz
tar cf - $(PACKAGE)-$(VERSION)-bsd | xz -T0 -e -9 -z > $(PACKAGE)-$(VERSION)-bsd.tar.xz
rm -rf $(PACKAGE)-$(VERSION)-bsd/tests/{amr3d.silo,pion0244.silo,amr2d.silo,xvers_data.tar.xz}
tar cf - $(PACKAGE)-$(VERSION)-bsd | | xz -T0 -e -9 -z > $(PACKAGE)-$(VERSION)-bsd-smalltest.tar.xz
tar cf - $(PACKAGE)-$(VERSION)-bsd | xz -T0 -e -9 -z > $(PACKAGE)-$(VERSION)-bsd-smalltest.tar.xz
rm -rf $(PACKAGE)-$(VERSION)-bsd
tar cf - $(PACKAGE)-$(VERSION) | | xz -T0 -e -9 -z > $(PACKAGE)-$(VERSION).tar.xz
tar cf - $(PACKAGE)-$(VERSION) | xz -T0 -e -9 -z > $(PACKAGE)-$(VERSION).tar.xz
rm -rf $(PACKAGE)-$(VERSION)

.PHONY: help
Expand Down
0 VERSION → SILO_VERSION
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ dnl The esyscmd macro invokation allows us to keep version number in
dnl VERSION file and just re-generate configure instead of having to
dnl also checkout and edit configure.ac
dnl
m4_define(SILO_VERSION, m4_esyscmd([cat VERSION | tr -d '\n']))
m4_define(SILO_VERSION, m4_esyscmd([cat SILO_VERSION | tr -d '\n']))
m4_define(SILO_NAME, silo)
m4_define(SILO_BUGS,[email protected])
m4_define(SILO_TOP_SRC_DIR, `pwd`)
Expand Down
7 changes: 5 additions & 2 deletions src/hdf5_drv/silo_hdf5.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4973,10 +4973,13 @@ db_hdf5_process_file_options(int opts_set_id, int mode, hid_t *fcpl)
H5AC_cache_config_t h5mdc_config;
#endif

/* Performance optimizations for memory footprint */
#if HDF5_VERSION_GE(1,10,2)
H5Pset_libver_bounds(retval, H5F_LIBVER_V18, H5F_LIBVER_V18);
#endif

if (mode & DB_PERF_OVER_COMPAT)
H5Pset_libver_bounds(retval, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST);
#if HDF5_VERSION_GE(1,10,0)
#if HDF5_VERSION_GE(1,10,2)
if (mode & DB_COMPAT_OVER_PERF)
H5Pset_libver_bounds(retval, H5F_LIBVER_V18, H5F_LIBVER_V18);
#endif
Expand Down
4 changes: 3 additions & 1 deletion src/pdb/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,13 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/score -I$(top_srcdir)/src/silo

EXTRA_DIST = detect.c

noinst_HEADERS = pdb.h
nodist_noinst_HEADERS = pdform.h

if INSTALL_LITE_HEADERS
noinst_HEADERS = pdb.h
nodist_include_HEADERS = lite_pdb.h
else
noinst_HEADERS = pdb.h lite_pdb.h
endif

FILES = \
Expand Down
6 changes: 4 additions & 2 deletions src/pdb/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
DIST_COMMON = $(srcdir)/Makefile.am $(am__noinst_HEADERS_DIST) \
$(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
Expand Down Expand Up @@ -240,6 +240,7 @@ am__uninstall_files_from_dir = { \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
am__installdirs = "$(DESTDIR)$(includedir)"
am__noinst_HEADERS_DIST = pdb.h lite_pdb.h
HEADERS = $(nodist_include_HEADERS) $(nodist_noinst_HEADERS) \
$(noinst_HEADERS)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
Expand Down Expand Up @@ -446,8 +447,9 @@ noinst_LTLIBRARIES = libsilo_pdb.la
libsilo_pdb_la_SOURCES = $(FILES)
AM_CPPFLAGS = -I$(top_srcdir)/src/score -I$(top_srcdir)/src/silo
EXTRA_DIST = detect.c
noinst_HEADERS = pdb.h
nodist_noinst_HEADERS = pdform.h
@INSTALL_LITE_HEADERS_FALSE@noinst_HEADERS = pdb.h lite_pdb.h
@INSTALL_LITE_HEADERS_TRUE@noinst_HEADERS = pdb.h
@INSTALL_LITE_HEADERS_TRUE@nodist_include_HEADERS = lite_pdb.h
FILES = \
pdb.c \
Expand Down
4 changes: 3 additions & 1 deletion src/score/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,12 @@ noinst_LTLIBRARIES = libsilo_score.la
libsilo_score_la_SOURCES = $(FILES)

if INSTALL_LITE_HEADERS
noinst_HEADERS = score.h
nodist_include_HEADERS = lite_score.h
else
noinst_HEADERS = score.h lite_score.h
endif

noinst_HEADERS = score.h

CLEANFILES = lite_score.h

Expand Down
6 changes: 4 additions & 2 deletions src/score/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ am__aclocal_m4_deps = $(top_srcdir)/config/ax_check_compiler_flags.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
DIST_COMMON = $(srcdir)/Makefile.am $(am__noinst_HEADERS_DIST) \
$(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
Expand Down Expand Up @@ -239,6 +239,7 @@ am__uninstall_files_from_dir = { \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
am__installdirs = "$(DESTDIR)$(includedir)"
am__noinst_HEADERS_DIST = score.h lite_score.h
HEADERS = $(nodist_include_HEADERS) $(noinst_HEADERS)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
Expand Down Expand Up @@ -442,8 +443,9 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libsilo_score.la
libsilo_score_la_SOURCES = $(FILES)
@INSTALL_LITE_HEADERS_FALSE@noinst_HEADERS = score.h lite_score.h
@INSTALL_LITE_HEADERS_TRUE@noinst_HEADERS = score.h
@INSTALL_LITE_HEADERS_TRUE@nodist_include_HEADERS = lite_score.h
noinst_HEADERS = score.h
CLEANFILES = lite_score.h
FILES = \
memmove.c \
Expand Down
Loading

0 comments on commit 3f52049

Please sign in to comment.