mirror of
https://github.com/saymrwulf/prophet.git
synced 2026-11-19 09:00:59 +00:00
Loop debug (#168)
* Load Stan models on package load and keep in environment * Load models on package import
This commit is contained in:
parent
df4b6158eb
commit
5971a2369b
6 changed files with 57 additions and 44 deletions
|
|
@ -539,11 +539,15 @@ fit.prophet <- function(m, df, ...) {
|
||||||
# Run stan
|
# Run stan
|
||||||
if (m$growth == 'linear') {
|
if (m$growth == 'linear') {
|
||||||
kinit <- linear_growth_init(history)
|
kinit <- linear_growth_init(history)
|
||||||
model <- get_prophet_stan_model('linear')
|
|
||||||
} else {
|
} else {
|
||||||
dat$cap <- history$cap_scaled # Add capacities to the Stan data
|
dat$cap <- history$cap_scaled # Add capacities to the Stan data
|
||||||
kinit <- logistic_growth_init(history)
|
kinit <- logistic_growth_init(history)
|
||||||
model <- get_prophet_stan_model('logistic')
|
}
|
||||||
|
|
||||||
|
if (exists(".prophet.stan.models")) {
|
||||||
|
model <- .prophet.stan.models[[m$growth]]
|
||||||
|
} else {
|
||||||
|
model <- get_prophet_stan_model(m$growth)
|
||||||
}
|
}
|
||||||
|
|
||||||
stan_init <- function() {
|
stan_init <- function() {
|
||||||
|
|
@ -592,7 +596,6 @@ fit.prophet <- function(m, df, ...) {
|
||||||
m$params$k <- m$params$k + m$params$delta[, 1]
|
m$params$k <- m$params$k + m$params$delta[, 1]
|
||||||
m$params$delta <- matrix(rep(0, length(m$params$delta)), nrow = n.iteration)
|
m$params$delta <- matrix(rep(0, length(m$params$delta)), nrow = n.iteration)
|
||||||
}
|
}
|
||||||
gc() ## This is hack. We don't know why it works but it solves issue #93.
|
|
||||||
return(m)
|
return(m)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
14
R/R/zzz.R
Normal file
14
R/R/zzz.R
Normal file
|
|
@ -0,0 +1,14 @@
|
||||||
|
## Copyright (c) 2017-present, Facebook, Inc.
|
||||||
|
## All rights reserved.
|
||||||
|
|
||||||
|
## This source code is licensed under the BSD-style license found in the
|
||||||
|
## LICENSE file in the root directory of this source tree. An additional grant
|
||||||
|
## of patent rights can be found in the PATENTS file in the same directory.
|
||||||
|
|
||||||
|
.onLoad <- function(libname, pkgname) {
|
||||||
|
.prophet.stan.models <- list(
|
||||||
|
"linear"=get_prophet_stan_model("linear"),
|
||||||
|
"logistic"=get_prophet_stan_model("logistic"))
|
||||||
|
assign(".prophet.stan.models", .prophet.stan.models,
|
||||||
|
envir=parent.env(environment()))
|
||||||
|
}
|
||||||
|
|
@ -7,11 +7,6 @@ N <- nrow(DATA)
|
||||||
train <- DATA[1:floor(N / 2), ]
|
train <- DATA[1:floor(N / 2), ]
|
||||||
future <- DATA[(ceiling(N/2) + 1):N, ]
|
future <- DATA[(ceiling(N/2) + 1):N, ]
|
||||||
|
|
||||||
test_that("load_models", {
|
|
||||||
expect_error(prophet:::get_prophet_stan_model('linear'), NA)
|
|
||||||
expect_error(prophet:::get_prophet_stan_model('logistic'), NA)
|
|
||||||
})
|
|
||||||
|
|
||||||
test_that("fit_predict", {
|
test_that("fit_predict", {
|
||||||
skip_if_not(Sys.getenv('R_ARCH') != '/i386')
|
skip_if_not(Sys.getenv('R_ARCH') != '/i386')
|
||||||
m <- prophet(train)
|
m <- prophet(train)
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,6 @@ from __future__ import unicode_literals
|
||||||
|
|
||||||
from collections import defaultdict
|
from collections import defaultdict
|
||||||
from datetime import timedelta
|
from datetime import timedelta
|
||||||
import pickle
|
|
||||||
|
|
||||||
from matplotlib import pyplot as plt
|
from matplotlib import pyplot as plt
|
||||||
from matplotlib.dates import MonthLocator, num2date
|
from matplotlib.dates import MonthLocator, num2date
|
||||||
|
|
@ -21,9 +20,7 @@ from matplotlib.ticker import FuncFormatter
|
||||||
import numpy as np
|
import numpy as np
|
||||||
import pandas as pd
|
import pandas as pd
|
||||||
|
|
||||||
# fb-block 1 start
|
from fbprophet.models import prophet_stan_models
|
||||||
import pkg_resources
|
|
||||||
# fb-block 1 end
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import pystan
|
import pystan
|
||||||
|
|
@ -151,32 +148,6 @@ class Prophet(object):
|
||||||
'trend']:
|
'trend']:
|
||||||
raise ValueError('Holiday name {} reserved.'.format(h))
|
raise ValueError('Holiday name {} reserved.'.format(h))
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def get_linear_model(cls):
|
|
||||||
"""Load compiled linear trend Stan model"""
|
|
||||||
# fb-block 3
|
|
||||||
# fb-block 4 start
|
|
||||||
model_file = pkg_resources.resource_filename(
|
|
||||||
'fbprophet',
|
|
||||||
'stan_models/linear_growth.pkl'
|
|
||||||
)
|
|
||||||
# fb-block 4 end
|
|
||||||
with open(model_file, 'rb') as f:
|
|
||||||
return pickle.load(f)
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def get_logistic_model(cls):
|
|
||||||
"""Load compiled logistic trend Stan model"""
|
|
||||||
# fb-block 5
|
|
||||||
# fb-block 6 start
|
|
||||||
model_file = pkg_resources.resource_filename(
|
|
||||||
'fbprophet',
|
|
||||||
'stan_models/logistic_growth.pkl'
|
|
||||||
)
|
|
||||||
# fb-block 6 end
|
|
||||||
with open(model_file, 'rb') as f:
|
|
||||||
return pickle.load(f)
|
|
||||||
|
|
||||||
def setup_dataframe(self, df, initialize_scales=False):
|
def setup_dataframe(self, df, initialize_scales=False):
|
||||||
"""Prepare dataframe for fitting or predicting.
|
"""Prepare dataframe for fitting or predicting.
|
||||||
|
|
||||||
|
|
@ -531,11 +502,11 @@ class Prophet(object):
|
||||||
|
|
||||||
if self.growth == 'linear':
|
if self.growth == 'linear':
|
||||||
kinit = self.linear_growth_init(history)
|
kinit = self.linear_growth_init(history)
|
||||||
model = self.get_linear_model()
|
|
||||||
else:
|
else:
|
||||||
dat['cap'] = history['cap_scaled']
|
dat['cap'] = history['cap_scaled']
|
||||||
kinit = self.logistic_growth_init(history)
|
kinit = self.logistic_growth_init(history)
|
||||||
model = self.get_logistic_model()
|
|
||||||
|
model = prophet_stan_models[self.growth]
|
||||||
|
|
||||||
def stan_init():
|
def stan_init():
|
||||||
return {
|
return {
|
||||||
|
|
|
||||||
34
python/fbprophet/models.py
Normal file
34
python/fbprophet/models.py
Normal file
|
|
@ -0,0 +1,34 @@
|
||||||
|
# Copyright (c) 2017-present, Facebook, Inc.
|
||||||
|
# All rights reserved.
|
||||||
|
#
|
||||||
|
# This source code is licensed under the BSD-style license found in the
|
||||||
|
# LICENSE file in the root directory of this source tree. An additional grant
|
||||||
|
# of patent rights can be found in the PATENTS file in the same directory.
|
||||||
|
|
||||||
|
from __future__ import absolute_import
|
||||||
|
from __future__ import division
|
||||||
|
from __future__ import print_function
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
import pickle
|
||||||
|
|
||||||
|
# fb-block 1 start
|
||||||
|
import pkg_resources
|
||||||
|
# fb-block 1 end
|
||||||
|
|
||||||
|
def get_prophet_stan_model(model):
|
||||||
|
"""Load compiled Stan model"""
|
||||||
|
# fb-block 3
|
||||||
|
# fb-block 4 start
|
||||||
|
model_file = pkg_resources.resource_filename(
|
||||||
|
'fbprophet',
|
||||||
|
'stan_models/{}_growth.pkl'.format(model),
|
||||||
|
)
|
||||||
|
# fb-block 4 end
|
||||||
|
with open(model_file, 'rb') as f:
|
||||||
|
return pickle.load(f)
|
||||||
|
|
||||||
|
prophet_stan_models = {
|
||||||
|
'linear': get_prophet_stan_model('linear'),
|
||||||
|
'logistic': get_prophet_stan_model('logistic'),
|
||||||
|
}
|
||||||
|
|
@ -25,10 +25,6 @@ from fbprophet import Prophet
|
||||||
# fb-block 2
|
# fb-block 2
|
||||||
|
|
||||||
class TestProphet(TestCase):
|
class TestProphet(TestCase):
|
||||||
def test_load_models(self):
|
|
||||||
forecaster = Prophet()
|
|
||||||
forecaster.get_linear_model()
|
|
||||||
forecaster.get_logistic_model()
|
|
||||||
|
|
||||||
def test_fit_predict(self):
|
def test_fit_predict(self):
|
||||||
N = DATA.shape[0]
|
N = DATA.shape[0]
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue