Merge remote-tracking branch 'originssh/develop' into develop
This commit is contained in:
BIN
Binary file not shown.
@@ -623,9 +623,11 @@ class IFreqaiModel(ABC):
|
|||||||
strategy, corr_dataframes, base_dataframes, pair
|
strategy, corr_dataframes, base_dataframes, pair
|
||||||
)
|
)
|
||||||
|
|
||||||
new_trained_timerange = dk.buffer_timerange(new_trained_timerange)
|
trained_timestamp = new_trained_timerange.stopts
|
||||||
|
|
||||||
unfiltered_dataframe = dk.slice_dataframe(new_trained_timerange, unfiltered_dataframe)
|
buffered_timerange = dk.buffer_timerange(new_trained_timerange)
|
||||||
|
|
||||||
|
unfiltered_dataframe = dk.slice_dataframe(buffered_timerange, unfiltered_dataframe)
|
||||||
|
|
||||||
# find the features indicated by strategy and store in datakitchen
|
# find the features indicated by strategy and store in datakitchen
|
||||||
dk.find_features(unfiltered_dataframe)
|
dk.find_features(unfiltered_dataframe)
|
||||||
@@ -635,8 +637,8 @@ class IFreqaiModel(ABC):
|
|||||||
model = self.train(unfiltered_dataframe, pair, dk)
|
model = self.train(unfiltered_dataframe, pair, dk)
|
||||||
self.tb_logger.close()
|
self.tb_logger.close()
|
||||||
|
|
||||||
self.dd.pair_dict[pair]["trained_timestamp"] = new_trained_timerange.stopts
|
self.dd.pair_dict[pair]["trained_timestamp"] = trained_timestamp
|
||||||
dk.set_new_model_names(pair, new_trained_timerange.stopts)
|
dk.set_new_model_names(pair, trained_timestamp)
|
||||||
self.dd.save_data(model, pair, dk)
|
self.dd.save_data(model, pair, dk)
|
||||||
|
|
||||||
if self.plot_features:
|
if self.plot_features:
|
||||||
|
|||||||
+1
-1
@@ -23,7 +23,7 @@ tables==3.8.0
|
|||||||
blosc==1.11.1
|
blosc==1.11.1
|
||||||
joblib==1.2.0
|
joblib==1.2.0
|
||||||
rich==13.3.5
|
rich==13.3.5
|
||||||
pyarrow==11.0.0; platform_machine != 'armv7l'
|
pyarrow==12.0.0; platform_machine != 'armv7l'
|
||||||
|
|
||||||
# find first, C search in arrays
|
# find first, C search in arrays
|
||||||
py_find_1st==1.1.5
|
py_find_1st==1.1.5
|
||||||
|
|||||||
@@ -41,9 +41,6 @@ def can_run_model(model: str) -> None:
|
|||||||
if is_pytorch_model and is_mac() and not is_arm():
|
if is_pytorch_model and is_mac() and not is_arm():
|
||||||
pytest.skip("Reinforcement learning / PyTorch module not available on intel based Mac OS.")
|
pytest.skip("Reinforcement learning / PyTorch module not available on intel based Mac OS.")
|
||||||
|
|
||||||
if is_pytorch_model:
|
|
||||||
pytest.skip("Reinforcement learning / PyTorch currently not available on python 3.11.")
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.parametrize('model, pca, dbscan, float32, can_short, shuffle, buffer', [
|
@pytest.mark.parametrize('model, pca, dbscan, float32, can_short, shuffle, buffer', [
|
||||||
('LightGBMRegressor', True, False, True, True, False, 0),
|
('LightGBMRegressor', True, False, True, True, False, 0),
|
||||||
|
|||||||
Reference in New Issue
Block a user