Merge branch 'develop' of https://github.com/stan-dev/cmdstan into develop

Author: mitzimorris

README.md

@@ -26,6 +26,7 @@ There are separate repositories here on GitHub for interfaces:
 * [CmdStanR](https://github.com/stan-dev/cmdstanr) (a lightweight interface to CmdStan for R users)
 * [PyStan](https://github.com/stan-dev/pystan) (Python interface)
 * [RStan](https://github.com/stan-dev/rstan) (R interface)
+* [MathematicaStan](https://github.com/stan-dev/MathematicaStan) (Mathematica interface)
 
 ### Source Repository
 CmdStan's source-code repository is hosted here on GitHub.

make/local.example

@@ -30,3 +30,7 @@
 
 # Adding other arbitrary C++ compiler flags
 # CXXFLAGS+= -funroll-loops
+
+# Load more config from another location. Possibly useful on a shared system where
+# different users have different configurations.
+# -include $(HOME)/.config/stan/make.local

make/program

@@ -82,6 +82,7 @@ endif
 	$(LINK.cpp) $(subst \,/,$*.o) $(CMDSTAN_MAIN_O) $(LDLIBS) $(SUNDIALS_TARGETS) $(MPI_TARGETS) $(TBB_TARGETS) $(subst \,/,$(OUTPUT_OPTION))
 
 ifeq ($(OS),Windows_NT)
+ifneq (,$(TBB_TARGETS))
 ifeq (,$(findstring tbb.dll, $(notdir $(shell where tbb.dll))))
 	@echo 'Intel TBB is not in PATH.'
 	@echo 'Consider calling '
@@ -94,6 +95,7 @@ ifeq (,$(findstring tbb.dll, $(notdir $(shell where tbb.dll))))
 	fi
 endif
 endif
+endif
 
 $(patsubst %.cpp,%$(STAN_FLAGS).d,$(CMDSTAN_MAIN)) : $(CMDSTAN_MAIN)
 	$(COMPILE.cpp) $(DEPFLAGS) $<

src/cmdstan/command.hpp

@@ -563,23 +563,17 @@ int command(int argc, const char *argv[]) {
     list_argument *algo = dynamic_cast<list_argument *>(
         parser.arg("method")->arg("sample")->arg("algorithm"));
     std::string algo_name = algo->value();
-    bool use_fixed_param
-        = model.num_params_r() == 0 || algo_name == "fixed_param";
 
     bool adapt_engaged = get_arg_val<bool_argument>(parser, "method", "sample",
                                                     "adapt", "engaged");
-    if (!use_fixed_param && adapt_engaged == true && num_warmup == 0) {
+    if (algo_name != "fixed_param" && adapt_engaged == true
+        && num_warmup == 0) {
       msg << "The number of warmup samples (num_warmup) must be greater than "
           << "zero if adaptation is enabled." << std::endl;
       throw std::invalid_argument(msg.str());
     }
 
-    if (use_fixed_param) {
-      if (algo_name != "fixed_param") {
-        info(
-            "Model contains no parameters, running fixed_param sampler, "
-            "no updates to Markov chain");
-      }
+    if (algo_name == "fixed_param") {
       return_code = stan::services::sample::fixed_param(
           model, num_chains, init_contexts, random_seed, id, init_radius,
           num_samples, num_thin, refresh, interrupt, logger, init_writers,

src/test/interface/fixed_param_sampler_test.cpp

@@ -68,7 +68,7 @@ TEST(McmcFixedParamSampler, check_empty) {
   EXPECT_EQ(success, true);
 }
 
-TEST(McmcFixedParamSampler, check_empty_but_algorithm_not_fixed_param) {
+TEST(McmcFixedParamSampler, check_empty_not_fixed_param) {
   std::vector<std::string> model_path;
   model_path.push_back("src");
   model_path.push_back("test");
@@ -88,8 +88,4 @@ TEST(McmcFixedParamSampler, check_empty_but_algorithm_not_fixed_param) {
   }
 
   EXPECT_EQ(success, true);
-  std::string expected_message
-      = "Model contains no parameters, running fixed_param sampler";
-  EXPECT_TRUE(
-      boost::algorithm::contains(command_output.output, expected_message));
 }