From 1d435248e2d92aa105f9bfa489c7a96e0bebedd3 Mon Sep 17 00:00:00 2001 From: D-X-Y <280835372@qq.com> Date: Thu, 11 Mar 2021 19:28:00 -0800 Subject: [PATCH] Add return for use_gpu.. --- qlib/contrib/model/pytorch_alstm.py | 6 +++--- qlib/contrib/model/pytorch_alstm_ts.py | 6 +++--- qlib/contrib/model/pytorch_gats.py | 6 +++--- qlib/contrib/model/pytorch_gats_ts.py | 2 +- qlib/contrib/model/pytorch_gru.py | 2 +- qlib/contrib/model/pytorch_gru_ts.py | 6 +++--- qlib/contrib/model/pytorch_lstm.py | 2 +- qlib/contrib/model/pytorch_lstm_ts.py | 6 +++--- qlib/contrib/model/pytorch_nn.py | 8 ++++---- qlib/contrib/model/pytorch_sfm.py | 9 ++++++--- qlib/contrib/model/pytorch_tabnet.py | 6 +++--- 11 files changed, 31 insertions(+), 28 deletions(-) diff --git a/qlib/contrib/model/pytorch_alstm.py b/qlib/contrib/model/pytorch_alstm.py index 0ce8542e9..3c008ae9a 100644 --- a/qlib/contrib/model/pytorch_alstm.py +++ b/qlib/contrib/model/pytorch_alstm.py @@ -93,7 +93,7 @@ class ALSTM(Model): "\nearly_stop : {}" "\noptimizer : {}" "\nloss_type : {}" - "\nvisible_GPU : {}" + "\ndevice : {}" "\nuse_GPU : {}" "\nseed : {}".format( d_feat, @@ -107,7 +107,7 @@ class ALSTM(Model): early_stop, optimizer.lower(), loss, - GPU, + self.device, self.use_gpu, seed, ) @@ -138,7 +138,7 @@ class ALSTM(Model): @property def use_gpu(self): - self.device != torch.device("cpu") + return self.device != torch.device("cpu") def mse(self, pred, label): loss = (pred - label) ** 2 diff --git a/qlib/contrib/model/pytorch_alstm_ts.py b/qlib/contrib/model/pytorch_alstm_ts.py index 21867d951..eb6e856ef 100644 --- a/qlib/contrib/model/pytorch_alstm_ts.py +++ b/qlib/contrib/model/pytorch_alstm_ts.py @@ -96,7 +96,7 @@ class ALSTM(Model): "\nearly_stop : {}" "\noptimizer : {}" "\nloss_type : {}" - "\nvisible_GPU : {}" + "\ndevice : {}" "\nn_jobs : {}" "\nuse_GPU : {}" "\nseed : {}".format( @@ -111,7 +111,7 @@ class ALSTM(Model): early_stop, optimizer.lower(), loss, - GPU, + self.device, n_jobs, self.use_gpu, seed, @@ -143,7 +143,7 @@ class ALSTM(Model): @property def use_gpu(self): - self.device != torch.device("cpu") + return self.device != torch.device("cpu") def mse(self, pred, label): loss = (pred - label) ** 2 diff --git a/qlib/contrib/model/pytorch_gats.py b/qlib/contrib/model/pytorch_gats.py index 0c66211b8..4edbc8bcf 100644 --- a/qlib/contrib/model/pytorch_gats.py +++ b/qlib/contrib/model/pytorch_gats.py @@ -103,7 +103,7 @@ class GATs(Model): "\nbase_model : {}" "\nwith_pretrain : {}" "\nmodel_path : {}" - "\nvisible_GPU : {}" + "\ndevice : {}" "\nuse_GPU : {}" "\nseed : {}".format( d_feat, @@ -119,7 +119,7 @@ class GATs(Model): base_model, with_pretrain, model_path, - GPU, + self.device, self.use_gpu, seed, ) @@ -151,7 +151,7 @@ class GATs(Model): @property def use_gpu(self): - self.device != torch.device("cpu") + return self.device != torch.device("cpu") def mse(self, pred, label): loss = (pred - label) ** 2 diff --git a/qlib/contrib/model/pytorch_gats_ts.py b/qlib/contrib/model/pytorch_gats_ts.py index 1c702da0f..dd83c00f9 100644 --- a/qlib/contrib/model/pytorch_gats_ts.py +++ b/qlib/contrib/model/pytorch_gats_ts.py @@ -172,7 +172,7 @@ class GATs(Model): @property def use_gpu(self): - self.device != torch.device("cpu") + return self.device != torch.device("cpu") def mse(self, pred, label): loss = (pred - label) ** 2 diff --git a/qlib/contrib/model/pytorch_gru.py b/qlib/contrib/model/pytorch_gru.py index e25e13212..0070d1811 100755 --- a/qlib/contrib/model/pytorch_gru.py +++ b/qlib/contrib/model/pytorch_gru.py @@ -138,7 +138,7 @@ class GRU(Model): @property def use_gpu(self): - self.device != torch.device("cpu") + return self.device != torch.device("cpu") def mse(self, pred, label): loss = (pred - label) ** 2 diff --git a/qlib/contrib/model/pytorch_gru_ts.py b/qlib/contrib/model/pytorch_gru_ts.py index 6edddd755..4553c7537 100755 --- a/qlib/contrib/model/pytorch_gru_ts.py +++ b/qlib/contrib/model/pytorch_gru_ts.py @@ -96,7 +96,7 @@ class GRU(Model): "\nearly_stop : {}" "\noptimizer : {}" "\nloss_type : {}" - "\nvisible_GPU : {}" + "\ndevice : {}" "\nn_jobs : {}" "\nuse_GPU : {}" "\nseed : {}".format( @@ -111,7 +111,7 @@ class GRU(Model): early_stop, optimizer.lower(), loss, - GPU, + self.device, n_jobs, self.use_gpu, seed, @@ -143,7 +143,7 @@ class GRU(Model): @property def use_gpu(self): - self.device != torch.device("cpu") + return self.device != torch.device("cpu") def mse(self, pred, label): loss = (pred - label) ** 2 diff --git a/qlib/contrib/model/pytorch_lstm.py b/qlib/contrib/model/pytorch_lstm.py index 28d07665c..c7385c6a7 100755 --- a/qlib/contrib/model/pytorch_lstm.py +++ b/qlib/contrib/model/pytorch_lstm.py @@ -134,7 +134,7 @@ class LSTM(Model): @property def use_gpu(self): - self.device != torch.device("cpu") + return self.device != torch.device("cpu") def mse(self, pred, label): loss = (pred - label) ** 2 diff --git a/qlib/contrib/model/pytorch_lstm_ts.py b/qlib/contrib/model/pytorch_lstm_ts.py index c6e99d19e..288bdc202 100755 --- a/qlib/contrib/model/pytorch_lstm_ts.py +++ b/qlib/contrib/model/pytorch_lstm_ts.py @@ -95,7 +95,7 @@ class LSTM(Model): "\nearly_stop : {}" "\noptimizer : {}" "\nloss_type : {}" - "\nvisible_GPU : {}" + "\ndevice : {}" "\nn_jobs : {}" "\nuse_GPU : {}" "\nseed : {}".format( @@ -110,7 +110,7 @@ class LSTM(Model): early_stop, optimizer.lower(), loss, - GPU, + self.device, n_jobs, self.use_gpu, seed, @@ -139,7 +139,7 @@ class LSTM(Model): @property def use_gpu(self): - self.device != torch.device("cpu") + return self.device != torch.device("cpu") def mse(self, pred, label): loss = (pred - label) ** 2 diff --git a/qlib/contrib/model/pytorch_nn.py b/qlib/contrib/model/pytorch_nn.py index 623ca5950..fad466165 100644 --- a/qlib/contrib/model/pytorch_nn.py +++ b/qlib/contrib/model/pytorch_nn.py @@ -99,8 +99,8 @@ class DNNModelPytorch(Model): "\nloss_type : {}" "\neval_steps : {}" "\nseed : {}" - "\nvisible_GPU : {}" - "\nuse_gpu : {}" + "\ndevice : {}" + "\nuse_GPU : {}" "\nweight_decay : {}".format( layers, lr, @@ -114,7 +114,7 @@ class DNNModelPytorch(Model): loss, eval_steps, seed, - GPU, + self.device, self.use_gpu, weight_decay, ) @@ -158,7 +158,7 @@ class DNNModelPytorch(Model): @property def use_gpu(self): - self.device != torch.device("cpu") + return self.device != torch.device("cpu") def fit( self, diff --git a/qlib/contrib/model/pytorch_sfm.py b/qlib/contrib/model/pytorch_sfm.py index cc600a955..f013d81a3 100644 --- a/qlib/contrib/model/pytorch_sfm.py +++ b/qlib/contrib/model/pytorch_sfm.py @@ -241,7 +241,6 @@ class SFM(Model): self.optimizer = optimizer.lower() self.loss = loss self.device = torch.device("cuda:%d" % (GPU) if torch.cuda.is_available() and GPU >= 0 else "cpu") - self.use_gpu = torch.cuda.is_available() self.seed = seed self.logger.info( @@ -260,7 +259,7 @@ class SFM(Model): "\neval_steps : {}" "\noptimizer : {}" "\nloss_type : {}" - "\nvisible_GPU : {}" + "\ndevice : {}" "\nuse_GPU : {}" "\nseed : {}".format( d_feat, @@ -277,7 +276,7 @@ class SFM(Model): eval_steps, optimizer.lower(), loss, - GPU, + self.device, self.use_gpu, seed, ) @@ -309,6 +308,10 @@ class SFM(Model): self.fitted = False self.sfm_model.to(self.device) + @property + def use_gpu(self): + return self.device != torch.device("cpu") + def test_epoch(self, data_x, data_y): # prepare training data diff --git a/qlib/contrib/model/pytorch_tabnet.py b/qlib/contrib/model/pytorch_tabnet.py index 34d6d82f0..c1dce9308 100644 --- a/qlib/contrib/model/pytorch_tabnet.py +++ b/qlib/contrib/model/pytorch_tabnet.py @@ -86,8 +86,8 @@ class TabnetModel(Model): "TabNet:" "\nbatch_size : {}" "\nvirtual bs : {}" - "\nGPU : {}" - "\npretrain: {}".format(self.batch_size, vbs, GPU, pretrain) + "\ndevice : {}" + "\npretrain: {}".format(self.batch_size, vbs, self.device, self.pretrain) ) self.fitted = False np.random.seed(self.seed) @@ -118,7 +118,7 @@ class TabnetModel(Model): @property def use_gpu(self): - self.device != torch.device("cpu") + return self.device != torch.device("cpu") def pretrain_fn(self, dataset=DatasetH, pretrain_file="./pretrain/best.model"): get_or_create_path(pretrain_file)