Skip to content

Commit e10fa41

Browse files
dmcdougalldmcdougall
committed
Merge branch 'hotfix-0.56.1'
2 parents f390dee + 01724cf commit e10fa41

31 files changed

+109
-85
lines changed

‎CHANGES‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@ QUESO: Quantification of Uncertainty for Estimation,
33
Simulation, and Optimization.
44
-----------------------------------------------------
55

6+
Version 0.56.1 (Dec 15, 2016)
7+
* queso.h and config_queso.h had some duplicate #defines. These have been
8+
consodlidated and queso.h has been deprecated.
9+
* Fix for gcc 4.4, change < ...<T>> to < ...<T> >
10+
* Fix for gcc 4.4, remove `typename' for non-dependent types
11+
* Updating documentation for m_normalizationStyle
12+
* Fix sample-based normalisation computation in LogNormalJointPdf
13+
614
Version 0.56.0 (Nov 18, 2016)
715
* Multivariate GPMSA implementation (experimental)
816
* Multivariate GPMSA examples

‎configure.ac‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Process this file with autoconf to produce a configure script.
33

44
AC_PREREQ(2.65)
5-
AC_INIT([queso], [0.56.0], [queso-users@googlegroups.com])
5+
AC_INIT([queso], [0.56.1], [queso-users@googlegroups.com])
66
PACKAGE_DESCRIPTION="The parallel C++ statistical library QUESO: Quantification of uncertainty for estimation, simulation and optimization"
77
AC_SUBST([PACKAGE_DESCRIPTION])
88
PACKAGE_URL="https://github.com/libqueso/queso"
@@ -26,6 +26,12 @@ GENERIC_MAJOR_VERSION=$AX_MAJOR_VERSION
2626
GENERIC_MINOR_VERSION=$AX_MINOR_VERSION
2727
GENERIC_MICRO_VERSION=$AX_POINT_VERSION
2828

29+
# Defines needed by Environment.C (formerly in queso.h)
30+
# The values are not quoted strings per queso.h history (Environment.C uses for arithmetic)
31+
AC_DEFINE_UNQUOTED([MAJOR_VERSION], ${GENERIC_MAJOR_VERSION}, "Major version")
32+
AC_DEFINE_UNQUOTED([MINOR_VERSION], ${GENERIC_MINOR_VERSION}, "Minor version")
33+
AC_DEFINE_UNQUOTED([MICRO_VERSION], ${GENERIC_MICRO_VERSION}, "Micro version")
34+
2935
# Generating a libtool library
3036

3137
GENERIC_RELEASE=$GENERIC_MAJOR_VERSION.$GENERIC_MINOR_VERSION
@@ -257,7 +263,6 @@ AC_CONFIG_FILES([
257263
src/Makefile
258264
src/contrib/ANN/Makefile
259265
src/contrib/ANN/test/Makefile
260-
src/core/inc/queso.h
261266
examples/Makefile
262267
test/Makefile
263268
test/t01_valid_cycle/Makefile

‎examples/simpleStatisticalInverseProblem/src/Makefile.am‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
AM_CPPFLAGS =
44
AM_CPPFLAGS += -I$(top_builddir)/inc
5-
AM_CPPFLAGS += -I$(top_builddir)/src/core/inc # For queso.h
65
AM_CPPFLAGS += $(BOOST_CPPFLAGS)
76
AM_CPPFLAGS += $(GSL_CFLAGS)
87
AM_CPPFLAGS += $(GRVY_CFLAGS)
@@ -30,6 +29,6 @@ exStatisticalInverseProblem_gsl_SOURCES += example_compute.C
3029
exStatisticalInverseProblem_gsl_SOURCES += example_likelihood.C
3130
exStatisticalInverseProblem_gsl_SOURCES += example_compute.h
3231
exStatisticalInverseProblem_gsl_SOURCES += example_likelihood.h
33-
32+
3433
# Required for AX_AM_MACROS
3534
@INC_AMINCLUDE@

‎examples/statisticalForwardProblem/src/Makefile.am‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
AM_CPPFLAGS =
44
AM_CPPFLAGS += -I$(top_builddir)/inc
5-
AM_CPPFLAGS += -I$(top_builddir)/src/core/inc # For queso.h
65
AM_CPPFLAGS += $(BOOST_CPPFLAGS)
76
AM_CPPFLAGS += $(GSL_CFLAGS)
87
AM_CPPFLAGS += $(GRVY_CFLAGS)

‎examples/statisticalInverseProblem/src/Makefile.am‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
AM_CPPFLAGS =
44
AM_CPPFLAGS += -I$(top_builddir)/inc
5-
AM_CPPFLAGS += -I$(top_builddir)/src/core/inc # For queso.h
65
AM_CPPFLAGS += $(BOOST_CPPFLAGS)
76
AM_CPPFLAGS += $(GSL_CFLAGS)
87
AM_CPPFLAGS += $(GRVY_CFLAGS)

‎examples/validationPyramid/src/Makefile.am‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ AM_CPPFLAGS += -I$(top_srcdir)/examples/validationPyramid/src/physics_1
88
AM_CPPFLAGS += -I$(top_srcdir)/examples/validationPyramid/src/physics_2
99
AM_CPPFLAGS += -I$(top_srcdir)/examples/validationPyramid/src/physics_1_2
1010
AM_CPPFLAGS += -I$(top_builddir)/inc
11-
AM_CPPFLAGS += -I$(top_builddir)/src/core/inc # For queso.h
1211
AM_CPPFLAGS += $(BOOST_CPPFLAGS)
1312
AM_CPPFLAGS += $(GSL_CFLAGS)
1413
AM_CPPFLAGS += $(GRVY_CFLAGS)

‎generate_queso_headers.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -e
33

44
# Find all teh headers
5-
headers=`find src -name "*.h" -a -not -name queso.h -a -not -name all.h -type f | grep -v 'ANN'`
5+
headers=`find src -name "*.h" -a -not -name all.h -type f | grep -v 'ANN'`
66

77
# Find the thing we want to conduct wizardry on
88
quesoh=`find src -name "all.h"`

‎inc/queso/Makefile.am‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ BUILT_SOURCES += TransitionKernelFactory.h
7575
BUILT_SOURCES += Vector.h
7676
BUILT_SOURCES += asserts.h
7777
BUILT_SOURCES += exceptions.h
78+
BUILT_SOURCES += queso.h
7879
BUILT_SOURCES += ExperimentModel.h
7980
BUILT_SOURCES += ExperimentModelOptions.h
8081
BUILT_SOURCES += ExperimentStorage.h
@@ -205,7 +206,6 @@ BUILT_SOURCES += LinearLagrangeInterpolationSurrogate.h
205206
BUILT_SOURCES += SurrogateBase.h
206207
BUILT_SOURCES += SurrogateBuilderBase.h
207208
BUILT_SOURCES += config_queso.h
208-
BUILT_SOURCES += queso.h
209209

210210
DISTCLEANFILES = $(BUILT_SOURCES)
211211

@@ -349,6 +349,8 @@ asserts.h: $(top_srcdir)/src/core/inc/asserts.h
349349
$(AM_V_GEN)rm -f $@ && $(LN_S) $< $@
350350
exceptions.h: $(top_srcdir)/src/core/inc/exceptions.h
351351
$(AM_V_GEN)rm -f $@ && $(LN_S) $< $@
352+
queso.h: $(top_srcdir)/src/core/inc/queso.h
353+
$(AM_V_GEN)rm -f $@ && $(LN_S) $< $@
352354
ExperimentModel.h: $(top_srcdir)/src/gp/inc/ExperimentModel.h
353355
$(AM_V_GEN)rm -f $@ && $(LN_S) $< $@
354356
ExperimentModelOptions.h: $(top_srcdir)/src/gp/inc/ExperimentModelOptions.h
@@ -609,5 +611,3 @@ SurrogateBuilderBase.h: $(top_srcdir)/src/surrogates/inc/SurrogateBuilderBase.h
609611
$(AM_V_GEN)rm -f $@ && $(LN_S) $< $@
610612
config_queso.h: $(top_builddir)/config_queso.h
611613
$(AM_V_GEN)rm -f $@ && $(LN_S) $< $@
612-
queso.h: $(top_builddir)/src/core/inc/queso.h
613-
$(AM_V_GEN)rm -f $@ && $(LN_S) $< $@

‎inc/queso/rebuild_makefile.sh‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This file was shamelessly stolen from the libmesh source tree
44
# See https://github.com/libMesh/libmesh
55

6-
headers=`find ../../src -name "*.h" -a -not -name queso.h -a -not -name all.h -type f | grep -v 'ANN' | grep -v 'interface' | LC_COLLATE=POSIX sort`
6+
headers=`find ../../src -name "*.h" -a -not -name all.h -type f | grep -v 'ANN' | grep -v 'interface' | LC_COLLATE=POSIX sort`
77

88
cat <<EOF > Makefile.am
99
# Note - this file is automatically generated by $0
@@ -26,7 +26,6 @@ done
2626
# Manually handle the auto-generated headers
2727
cat <<EOF >> Makefile.am
2828
BUILT_SOURCES += config_queso.h
29-
BUILT_SOURCES += queso.h
3029
EOF
3130

3231
cat <<EOF >> Makefile.am
@@ -56,6 +55,4 @@ done
5655
cat <<EOF >> Makefile.am
5756
config_queso.h: \$(top_builddir)/config_queso.h
5857
\$(AM_V_GEN)rm -f \$@ && \$(LN_S) \$< \$@
59-
queso.h: \$(top_builddir)/src/core/inc/queso.h
60-
\$(AM_V_GEN)rm -f \$@ && \$(LN_S) \$< \$@
6158
EOF

‎m4/common/config_environment.m4‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,25 @@ AC_DEFINE_UNQUOTED([BUILD_VERSION], "${BUILD_VERSION}", [git revision])
5656
AC_DEFINE_UNQUOTED([BUILD_DEVSTATUS],"${BUILD_DEVSTATUS}",[Dev/Release build])
5757
AC_DEFINE( [BUILD_DATE], __DATE__ " " __TIME__, [Build date])
5858
59+
# Defines needed by Environment.C (formerly in queso.h)
60+
AC_DEFINE_UNQUOTED([CXX], "${CXX}", [C++ compiler])
61+
AC_DEFINE_UNQUOTED([CXXFLAGS], "${CXXFLAGS}", [C++ compiler flags])
62+
# The following must be unconditionally defined per Environment.C
63+
# TODO: Should these go in the respective <tpl>.m4?
64+
AC_DEFINE_UNQUOTED([TRILINOS_DIR], "${TRILINOS_HOME}", [Trilinos home directory])
65+
AC_DEFINE_UNQUOTED([GSL_DIR], "${GSL_LIBS}", [GSL libraries])
66+
AC_DEFINE_UNQUOTED([GRVY_DIR], "${GRVY_PREFIX}", [GRVY directory])
67+
AC_DEFINE_UNQUOTED([GLPK_DIR], "${GLPK_PREFIX}", [GLPK directory])
68+
AC_DEFINE_UNQUOTED([HDF5_DIR], "${HDF5_PREFIX}", [HDF directory])
69+
5970
AC_SUBST(BUILD_USER)
6071
AC_SUBST(BUILD_ARCH)
6172
AC_SUBST(BUILD_HOST)
6273
AC_SUBST(BUILD_DATE)
6374
AC_SUBST(BUILD_VERSION)
6475
76+
# Defines needed by Environment.C (formerly in queso.h)
77+
AC_SUBST(CXX)
78+
AC_SUBST(CXX_FLAGS)
79+
6580
])

0 commit comments

Comments
 (0)