Merge remote-tracking branch 'origin/feat/add-pytorch-model-support' into feat/add-pytorch-model-support

freqtrade/freqai/base_models/BaseTorchClassifier.py

@@ -16,7 +16,7 @@ from freqtrade.freqai.data_kitchen import FreqaiDataKitchen
 logger = logging.getLogger(__name__)
 
 
-class PyTorchClassifier(BasePyTorchModel):
+class BaseTorchClassifier(BasePyTorchModel):
     """
     A PyTorch implementation of a classifier.
     User must implement fit method

freqtrade/freqai/base_models/BaseTorchRegressor.py

@@ -13,7 +13,7 @@ from freqtrade.freqai.data_kitchen import FreqaiDataKitchen
 logger = logging.getLogger(__name__)
 
 
-class PyTorchRegressor(BasePyTorchModel):
+class BaseTorchRegressor(BasePyTorchModel):
     """
     A PyTorch implementation of a regressor.
     User must implement fit method

freqtrade/freqai/prediction_models/PyTorchMLPClassifier.py

@@ -2,13 +2,13 @@ from typing import Any, Dict
 
 import torch
 
-from freqtrade.freqai.base_models.PyTorchModelTrainer import PyTorchModelTrainer
+from freqtrade.freqai.base_models.BaseTorchClassifier import BaseTorchClassifier
 from freqtrade.freqai.data_kitchen import FreqaiDataKitchen
-from freqtrade.freqai.prediction_models.PyTorchClassifier import PyTorchClassifier
-from freqtrade.freqai.prediction_models.PyTorchMLPModel import PyTorchMLPModel
+from freqtrade.freqai.torch.PyTorchMLPModel import PyTorchMLPModel
+from freqtrade.freqai.torch.PyTorchModelTrainer import PyTorchModelTrainer
 
 
-class PyTorchMLPClassifier(PyTorchClassifier):
+class PyTorchMLPClassifier(BaseTorchClassifier):
     """
     This class implements the fit method of IFreqaiModel.
     in the fit method we initialize the model and trainer objects.

freqtrade/freqai/prediction_models/PyTorchMLPRegressor.py

@@ -2,13 +2,13 @@ from typing import Any, Dict
 
 import torch
 
-from freqtrade.freqai.base_models.PyTorchModelTrainer import PyTorchModelTrainer
+from freqtrade.freqai.base_models.BaseTorchRegressor import BaseTorchRegressor
 from freqtrade.freqai.data_kitchen import FreqaiDataKitchen
-from freqtrade.freqai.prediction_models.PyTorchMLPModel import PyTorchMLPModel
-from freqtrade.freqai.prediction_models.PyTorchRegressor import PyTorchRegressor
+from freqtrade.freqai.torch.PyTorchMLPModel import PyTorchMLPModel
+from freqtrade.freqai.torch.PyTorchModelTrainer import PyTorchModelTrainer
 
 
-class PyTorchMLPRegressor(PyTorchRegressor):
+class PyTorchMLPRegressor(BaseTorchRegressor):
     """
     This class implements the fit method of IFreqaiModel.
     in the fit method we initialize the model and trainer objects.