Feature/0712 model base class

make/program

@@ -2,6 +2,7 @@
 # Models (to be passed through stanc)
 ##
 CMDSTAN_MAIN ?= src/cmdstan/main.cpp
+CMDSTAN_MAIN_O ?= src/cmdstan/main.o
 
 STAN_TARGETS = $(patsubst %.stan,%$(EXE),$(wildcard $(patsubst %$(EXE),%.stan,$(MAKECMDGOALS))))
 
@@ -23,22 +24,26 @@ ifneq ($(findstring allow_undefined,$(STANCFLAGS)),)
 $(STAN_TARGETS) examples/bernoulli/bernoulli$(EXE) $(patsubst %.stan,%$(EXE),$(wildcard src/test/test-models/*.stan)) : CXXFLAGS_PROGRAM += -include $(USER_HEADER)
 endif
 
-
 %.hpp : %.stan bin/stanc$(EXE)
 	@echo ''
 	@echo '--- Translating Stan model to C++ code ---'
 	$(WINE) bin/stanc$(EXE) $(STANCFLAGS) --o=$@ $<
 
+%.d: %.hpp
 
 .PRECIOUS: %.hpp
-%$(EXE) : %.hpp $(CMDSTAN_MAIN) $(LIBSUNDIALS) $(MPI_TARGETS)
+%$(EXE) : %.hpp $(CMDSTAN_MAIN_O) $(LIBSUNDIALS) $(MPI_TARGETS)
 	@echo ''
-	@echo '--- Linking C++ model ---'
-	$(LINK.cpp) $(CXXFLAGS_PROGRAM) -include $< $(CMDSTAN_MAIN) $(LDLIBS) $(LIBSUNDIALS) $(MPI_TARGETS) $(OUTPUT_OPTION)
+	@echo '--- Compiling, linking C++ code ---'
+	cp $*.hpp $*.cpp; \
+    $(LINK.cpp) $(CXXFLAGS_PROGRAM) -c -o $*.o $*.cpp ; \
+    $(CXX) -include $(LDLIBS) $(LIBSUNDIALS) $(MPI_TARGETS) -o $@ $(CMDSTAN_MAIN_O) $*.o; \
+    rm $*.cpp $*.o
+
 
 
 ##
-# Dependencies file
+# Dependencies file for precompiled header
 ##
 ifneq (,$(STAN_TARGETS))
 $(patsubst %$(EXE),%.d,$(STAN_TARGETS)) : DEPTARGETS += -MT $(patsubst %.d,%$(EXE),$@) -include $< -include $(CMDSTAN_MAIN)

makefile

@@ -151,7 +151,7 @@ build-mpi: $(MPI_TARGETS)
 	@echo '--- boost mpi bindings built ---'
 
 .PHONY: build
-build: bin/stanc$(EXE) bin/stansummary$(EXE) bin/print$(EXE) bin/diagnose$(EXE) $(LIBSUNDIALS) $(MPI_TARGETS)
+build: bin/stanc$(EXE) bin/stansummary$(EXE) bin/print$(EXE) bin/diagnose$(EXE) $(LIBSUNDIALS) $(MPI_TARGETS) $(CMDSTAN_MAIN_O) $(STAN)src/stan/model/model_header.d
 	@echo ''
 	@echo '--- CmdStan v$(CMDSTAN_VERSION) built ---'
 
@@ -182,6 +182,7 @@ clean-manual:
 
 clean-all: clean clean-deps clean-libraries clean-manual
 	$(RM) -r bin
+	$(RM) -r src/cmdstan/main.o
 	$(RM) $(wildcard $(STAN)src/stan/model/model_header.hpp.gch)
 
 ##

src/cmdstan/command.hpp

@@ -18,6 +18,7 @@
 #include <stan/io/stan_csv_reader.hpp>
 #include <stan/io/ends_with.hpp>
 #include <stan/io/json/json_data.hpp>
+#include <stan/model/model_base.hpp>
 #include <stan/services/diagnose/diagnose.hpp>
 #include <stan/services/optimize/bfgs.hpp>
 #include <stan/services/optimize/lbfgs.hpp>
@@ -49,6 +50,12 @@
 #include <vector>
 #include <memory>
 
+
+// forward declaration for function defined in another translation unit
+stan::model::model_base& new_model(stan::io::var_context& data_context,
+                                   unsigned int seed,
+                                   std::ostream* msg_stream);
+
 namespace cmdstan {
 
 #ifdef STAN_MPI
@@ -80,7 +87,6 @@ namespace cmdstan {
   static int hmc_fixed_cols = 7; // hmc sampler outputs columns __lp + 6
 
 
-  template <class Model>
   int command(int argc, const char* argv[]) {
     stan::callbacks::stream_writer info(std::cout);
     stan::callbacks::stream_writer err(std::cout);
@@ -137,7 +143,7 @@ namespace cmdstan {
 
     unsigned int random_seed = dynamic_cast<u_int_argument*>(parser.arg("random")->arg("seed"))->value();
 
-    Model model(*var_context, random_seed, &std::cout);
+    stan::model::model_base& model = new_model(*var_context, random_seed, &std::cout);
 
     write_stan(sample_writer);
     write_model(sample_writer, model.model_name());

src/cmdstan/main.cpp

@@ -1,11 +1,11 @@
-#include <cmdstan/command.hpp>
 #include <stan/services/error_codes.hpp>
-#include <boost/exception/diagnostic_information.hpp> 
+#include <cmdstan/command.hpp>
+#include <boost/exception/diagnostic_information.hpp>
 #include <boost/exception_ptr.hpp>
 
 int main(int argc, const char* argv[]) {
   try {
-    return cmdstan::command<stan_model>(argc,argv);
+    return cmdstan::command(argc,argv);
   } catch (const std::exception& e) {
     std::cout << e.what() << std::endl;
     return stan::services::error_codes::SOFTWARE;