Skip to content

Commit 488a38c

Browse files
dmcdougalldmcdougall
committed
Merge branch 'hotfix-0.57.1'
2 parents 74068df + c67cad5 commit 488a38c

29 files changed

+272
-254
lines changed

‎CHANGES‎

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

6+
Version 0.57.1 (Jun 23, 2017)
7+
* Fix bug in GPMSA getpot parse
8+
* GCC 4.4 compatibility fixes
9+
* Fix boost macro bug in build system
10+
611
Version 0.57.0 (Apr 22, 2017)
712
* Add methods to calculate normalized GP parameters
813
* GCC-4.4.7 compatibility fixes

‎configure.ac‎

Lines changed: 8 additions & 5 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.57.0], [queso-users@googlegroups.com])
5+
AC_INIT([queso], [0.57.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"
@@ -97,8 +97,12 @@ AC_ARG_ENABLE([boost-program-options],
9797
AS_HELP_STRING([--disable-boost-program-options], [Disables use
9898
of boost program options for parsing the QUESO
9999
input file. GetPot will be used instead.]),
100-
[enable_program_options="no"],
101-
[enable_program_options="yes"])
100+
[case "${enableval}" in
101+
yes) enable_program_options=yes ;;
102+
no) enable_program_options=no ;;
103+
*) AC_MSG_ERROR(bad value ${enableval} for --disable-boost-program-options) ;;
104+
esac],
105+
[enable_program_options=yes])
102106

103107
#-------------------
104108
# Compilers and MPI
@@ -195,8 +199,7 @@ AS_IF([test "x$enable_program_options" != "xno"],
195199

196200
AS_IF([test "x$enable_program_options" = "xno"],
197201
[
198-
QUESO_CPPFLAGS="$QUESO_CPPFLAGS -DDISABLE_BOOST_PROGRAM_OPTIONS"
199-
AC_SUBST(QUESO_CPPFLAGS)
202+
AC_DEFINE(DISABLE_BOOST_PROGRAM_OPTIONS, 1, [Flag determining whether boost program options is disabled])
200203
])
201204

202205
BOOST_FIND_HEADER([boost/scoped_ptr.hpp])

‎src/basic/inc/ScalarFunction.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ class BaseScalarFunction {
158158
const VectorSet<V, M> & m_domainSet;
159159

160160
private:
161-
#ifndef DISABLE_BOOST_PROGRAM_OPTIONS
161+
#ifndef QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
162162
//! Input parser
163163
ScopedPtr<BoostInputOptionsParser>::Type m_parser;
164164
#endif

‎src/basic/src/ScalarFunction.C‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@
2222
//
2323
//-----------------------------------------------------------------------el-
2424

25+
#include <queso/config_queso.h>
2526
#include <queso/ScalarFunction.h>
2627
#include <queso/VectorSet.h>
2728
#include <queso/VectorSpace.h>
2829
#include <queso/GslVector.h>
2930
#include <queso/GslMatrix.h>
3031

31-
#ifndef DISABLE_BOOST_PROGRAM_OPTIONS
32+
#ifndef QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
3233
#include <queso/BoostInputOptionsParser.h>
3334
#else
3435
#include <queso/getpot.h>
@@ -47,15 +48,15 @@ BaseScalarFunction<V, M>::BaseScalarFunction(const char * prefix,
4748
: m_env(domainSet.env()),
4849
m_prefix((std::string)(prefix) + "func_"),
4950
m_domainSet(domainSet),
50-
#ifndef DISABLE_BOOST_PROGRAM_OPTIONS
51+
#ifndef QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
5152
m_parser(new BoostInputOptionsParser(m_env.optionsInputFileName())),
5253
#endif
5354
m_fdStepSize(1, std::atof(QUESO_BASESCALARFN_FD_STEPSIZE_ODV))
5455
{
5556
unsigned int dim = m_domainSet.vectorSpace().dimLocal();
5657

5758
// Snarf fd step size from input file.
58-
#ifndef DISABLE_BOOST_PROGRAM_OPTIONS
59+
#ifndef QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
5960
m_parser->registerOption<std::string>(m_prefix + "fdStepSize",
6061
QUESO_BASESCALARFN_FD_STEPSIZE_ODV,
6162
"step size for finite difference");

‎src/basic/src/SequenceStatisticalOptions.C‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
#include <queso/Defines.h>
2626
#ifdef QUESO_USES_SEQUENCE_STATISTICAL_OPTIONS
2727

28-
#ifndef DISABLE_BOOST_PROGRAM_OPTIONS
28+
#ifndef QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
2929
#include <boost/program_options.hpp>
30-
#endif // DISABLE_BOOST_PROGRAM_OPTIONS
30+
#endif // QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
3131

3232
#include <queso/SequenceStatisticalOptions.h>
3333
#include <queso/Miscellaneous.h>

‎src/core/inc/BoostInputOptionsParser.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
// Boston, MA 02110-1301 USA
2222
//
2323
//-----------------------------------------------------------------------el-
24-
#ifndef DISABLE_BOOST_PROGRAM_OPTIONS
24+
#include <queso/config_queso.h>
25+
#ifndef QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
2526

2627
#ifndef UQ_BOOST_INPUT_OPTIONS_H
2728
#define UQ_BOOST_INPUT_OPTIONS_H
@@ -106,4 +107,4 @@ class BoostInputOptionsParser : public BaseInputOptionsParser
106107

107108
#endif // UQ_BOOST_INPUT_OPTIONS_H
108109

109-
#endif // DISABLE_BOOST_PROGRAM_OPTIONS
110+
#endif // QUESO_DISABLE_BOOST_PROGRAM_OPTIONS

‎src/core/inc/Environment.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@
3838
#include <fstream>
3939

4040

41-
#ifndef DISABLE_BOOST_PROGRAM_OPTIONS
41+
#ifndef QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
4242
// Forward declarations
4343
namespace boost {
4444
namespace program_options {
4545
class options_description;
4646
class variables_map;
4747
}
4848
}
49-
#endif // DISABLE_BOOST_PROGRAM_OPTIONS
49+
#endif // QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
5050

5151
namespace QUESO {
5252

@@ -340,25 +340,25 @@ class BaseEnvironment {
340340
void setOptionsInputFileAccessState(bool newState) const; // Yes, 'const'
341341

342342

343-
#ifndef DISABLE_BOOST_PROGRAM_OPTIONS
343+
#ifndef QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
344344
#ifdef UQ_USES_COMMAND_LINE_OPTIONS
345345
const boost::program_options::options_description& allOptionsDesc () const;
346346
#endif
347-
#endif // DISABLE_BOOST_PROGRAM_OPTIONS
347+
#endif // QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
348348

349-
#ifndef DISABLE_BOOST_PROGRAM_OPTIONS
349+
#ifndef QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
350350
//! Access function to private attribute m_allOptionsMap. It is an instance of boost::program_options::variables_map(), which
351351
//! allows concrete variables to map which store variables in real map.
352352
boost::program_options::variables_map& allOptionsMap () const;
353-
#endif // DISABLE_BOOST_PROGRAM_OPTIONS
353+
#endif // QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
354354

355355

356-
#ifndef DISABLE_BOOST_PROGRAM_OPTIONS
356+
#ifndef QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
357357
//! This method scans the input file provided by the user to QUESO.
358358
/*! It checks if no input file is passed and updates the private attribute m_allOptionsDesc, which
359359
* keeps all the options.*/
360360
void scanInputFileForMyOptions(const boost::program_options::options_description& optionsDesc) const;
361-
#endif // DISABLE_BOOST_PROGRAM_OPTIONS
361+
#endif // QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
362362

363363
//! Access function to private attribute m_displayVerbosity. It manages how much information will be
364364
//! release during the use of the QUESO library.
@@ -446,10 +446,10 @@ class BaseEnvironment {
446446

447447
std::string m_optionsInputFileName;
448448
mutable bool m_optionsInputFileAccessState; // Yes, 'mutable'
449-
#ifndef DISABLE_BOOST_PROGRAM_OPTIONS
449+
#ifndef QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
450450
ScopedPtr<boost::program_options::options_description>::Type m_allOptionsDesc;
451451
ScopedPtr<boost::program_options::variables_map>::Type m_allOptionsMap;
452-
#endif // DISABLE_BOOST_PROGRAM_OPTIONS
452+
#endif // QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
453453
ScopedPtr<GetPot>::Type m_input;
454454

455455
unsigned int m_subId;

‎src/core/inc/EnvironmentOptions.h‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@
2929
#include <set>
3030
#include <vector>
3131

32-
#ifndef DISABLE_BOOST_PROGRAM_OPTIONS
32+
#include <queso/config_queso.h>
33+
#ifndef QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
3334
#include <queso/BoostInputOptionsParser.h>
34-
#endif // DISABLE_BOOST_PROGRAM_OPTIONS
35+
#endif // QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
3536

3637
#include <queso/ScopedPtr.h>
3738

@@ -55,14 +56,14 @@
5556
#define UQ_ENV_NUM_DEBUG_PARAMS_ODV 0
5657
#define UQ_ENV_DEBUG_PARAM_ODV 0.
5758

58-
#ifndef DISABLE_BOOST_PROGRAM_OPTIONS
59+
#ifndef QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
5960
// Forward declarations
6061
namespace boost {
6162
namespace program_options {
6263
class options_description;
6364
}
6465
}
65-
#endif // DISABLE_BOOST_PROGRAM_OPTIONS
66+
#endif // QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
6667

6768
namespace QUESO {
6869

@@ -172,9 +173,9 @@ class EnvOptionsValues
172173
private:
173174
const BaseEnvironment * m_env;
174175

175-
#ifndef DISABLE_BOOST_PROGRAM_OPTIONS
176+
#ifndef QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
176177
ScopedPtr<BoostInputOptionsParser>::Type m_parser;
177-
#endif // DISABLE_BOOST_PROGRAM_OPTIONS
178+
#endif // QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
178179

179180
//! Input file option name for flagging helpful printing output
180181
std::string m_option_help;
@@ -262,13 +263,13 @@ class EnvironmentOptions
262263
EnvOptionsValues m_ov;
263264

264265
private:
265-
#ifndef DISABLE_BOOST_PROGRAM_OPTIONS
266+
#ifndef QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
266267
//! Define my environment options as the default options
267268
void defineMyOptions (boost::program_options::options_description& optionsDesc) const;
268269

269270
//! Gets the option values of the environment.
270271
void getMyOptionValues(boost::program_options::options_description& optionsDesc);
271-
#endif // DISABLE_BOOST_PROGRAM_OPTIONS
272+
#endif // QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
272273

273274
//! Environment.
274275
const BaseEnvironment& m_env;
@@ -280,9 +281,9 @@ class EnvironmentOptions
280281
/*! Uses boost::program_options::options_description. A set of option descriptions.
281282
* This provides convenient interface for adding new option method, and facilities
282283
* to search for options by name.*/
283-
#ifndef DISABLE_BOOST_PROGRAM_OPTIONS
284+
#ifndef QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
284285
ScopedPtr<boost::program_options::options_description>::Type m_optionsDesc;
285-
#endif // DISABLE_BOOST_PROGRAM_OPTIONS
286+
#endif // QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
286287

287288
std::string m_option_help;
288289

‎src/core/inc/InfiniteDimensionalMCMCSamplerOptions.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626

2727
#include <queso/Environment.h>
2828

29-
#ifndef DISABLE_BOOST_PROGRAM_OPTIONS
29+
#ifndef QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
3030
#include <queso/BoostInputOptionsParser.h>
3131
#else
3232
#include <queso/getpot.h>
33-
#endif // DISABLE_BOOST_PROGRAM_OPTIONS
33+
#endif // QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
3434

3535
namespace QUESO {
3636

@@ -83,9 +83,9 @@ class InfiniteDimensionalMCMCSamplerOptions
8383
const BaseEnvironment& env() const;
8484

8585
private:
86-
#ifndef DISABLE_BOOST_PROGRAM_OPTIONS
86+
#ifndef QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
8787
BoostInputOptionsParser * m_parser;
88-
#endif // DISABLE_BOOST_PROGRAM_OPTIONS
88+
#endif // QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
8989

9090
const BaseEnvironment& m_env;
9191

‎src/core/src/BoostInputOptionsParser.C‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
//
2323
//-----------------------------------------------------------------------el-
2424

25-
#ifndef DISABLE_BOOST_PROGRAM_OPTIONS
25+
#include <queso/config_queso.h>
26+
#ifndef QUESO_DISABLE_BOOST_PROGRAM_OPTIONS
2627
#include <boost/program_options.hpp>
2728

2829
#include <queso/BoostInputOptionsParser.h>
@@ -176,4 +177,4 @@ template void BoostInputOptionsParser::getOption<std::vector<unsigned int, std::
176177
template void BoostInputOptionsParser::getOption<std::vector<double, std::allocator<double> > >(const std::string&, std::vector<double, std::allocator<double> >&) const;
177178

178179
} // End namespace QUESO
179-
#endif // DISABLE_BOOST_PROGRAM_OPTIONS
180+
#endif // QUESO_DISABLE_BOOST_PROGRAM_OPTIONS

0 commit comments

Comments
 (0)