fix some bugs

iesl · Nov 13, 2023 · 04a0ead · 04a0ead
1 parent bea4da4
commit 04a0ead
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 19 deletions.
diff --git a/recbole/model/sequential_recommender/gru4rec_ours.py b/recbole/model/sequential_recommender/gru4rec_ours.py
@@ -67,9 +67,21 @@ def __init__(self, config, dataset):
         self.use_att = config['use_att'] #added for mfs
         self.only_compute_loss = True #added for mfs
         if self.use_att:
-            self.n_embd = 2* self.hidden_size #added for mfs
+            assert self.use_out_emb
+            self.dropout = nn.Dropout(self.dropout_prob)
+            self.We = nn.Linear(self.hidden_size, self.hidden_size)
+            self.Ue = nn.Linear(self.hidden_size, self.hidden_size)
+            self.tanh = nn.Tanh()
+            self.Ve = nn.Linear(self.hidden_size, 1)
+            out_size = 2*self.hidden_size
         else:
-            self.n_embd = self.hidden_size #added for mfs
+            self.dense = nn.Linear(self.hidden_size, self.embedding_size)
+            out_size = self.embedding_size
+        self.n_embd = out_size
+        #if self.use_att:
+        #    self.n_embd = 2* self.hidden_size #added for mfs
+        #else:
+        #    self.n_embd = self.hidden_size #added for mfs
 
         self.use_proj_bias = config['use_proj_bias'] #added for mfs
         self.weight_mode = config['weight_mode'] #added for mfs
@@ -129,17 +141,6 @@ def __init__(self, config, dataset):
         )
         self.item_embedding = nn.Embedding(self.n_items, self.embedding_size, padding_idx=0)
 
-        if self.use_att:
-            assert self.use_out_emb
-            self.dropout = nn.Dropout(self.dropout_prob)
-            self.We = nn.Linear(self.hidden_size, self.hidden_size)
-            self.Ue = nn.Linear(self.hidden_size, self.hidden_size)
-            self.tanh = nn.Tanh()
-            self.Ve = nn.Linear(self.hidden_size, 1)
-            out_size = 2*self.hidden_size
-        else:
-            self.dense = nn.Linear(self.hidden_size, self.embedding_size)
-            out_size = self.hidden_size
 
         if self.use_out_emb:
             self.out_item_embedding = nn.Linear(out_size, self.n_items, bias = False)
@@ -458,7 +459,7 @@ def calculate_loss_prob(self, interaction):
             #logits = torch.matmul(seq_output, test_item_emb.transpose(0, 1))
             #loss = self.loss_fct(logits, pos_items)
             #return loss
-            return loss, prediction_prob.squeeze()
+            return loss, prediction_prob.squeeze(dim=0)
 
     def calculate_loss(self, interaction):
         loss, prediction_prob = self.calculate_loss_prob(interaction)

diff --git a/recbole/model/sequential_recommender/sasrec.py b/recbole/model/sequential_recommender/sasrec.py
@@ -471,7 +471,7 @@ def calculate_loss_prob(self, interaction):
                 raise Exception("Labels can not be None")
             #logits = torch.matmul(seq_output, test_item_emb.transpose(0, 1))
             #loss = self.loss_fct(logits, pos_items)
-            return loss, prediction_prob.squeeze()
+            return loss, prediction_prob.squeeze(dim=0)
 
     def calculate_loss(self, interaction):
         loss, prediction_prob = self.calculate_loss_prob(interaction)

diff --git a/run_hyper_loop.sh b/run_hyper_loop.sh
@@ -70,9 +70,9 @@ elif [[ "$softmax_mode" == "softmax_C" ]]; then
 elif [[ "$softmax_mode" == "softmax_CP" ]]; then
     model_config="--n_facet=1+--n_facet_all=4+--n_facet_context=1+--n_facet_emb=2+--n_facet_hidden=1+--n_facet_window=0+--n_facet_MLP=0+--context_norm=1"
 elif [[ "$softmax_mode" == "softmax_CPR:100" ]]; then
-    model_config="--n_facet=1+--n_facet_context=1+--n_facet_reranker=1+--n_facet_emb=2+--n_facet_all=7+--n_facet_hidden=1+--n_facet_window=0+--n_facet_MLP=0+--context_norm=1+--reranker_CAN_NUM=100+--reranker_merging_mode=replace"
+    model_config="--n_facet=1+--n_facet_context=1+--n_facet_reranker=1+--n_facet_emb=2+--n_facet_all=5+--n_facet_hidden=1+--n_facet_window=0+--n_facet_MLP=0+--context_norm=1+--reranker_CAN_NUM=100+--reranker_merging_mode=replace"
 elif [[ "$softmax_mode" == "softmax_CPR:100_Mi" ]]; then
-    model_config="--n_facet=1+--n_facet_context=1+--n_facet_reranker=1+--n_facet_emb=2+--n_facet_all=7+--n_facet_hidden=2+--n_facet_window=-2+--n_facet_MLP=-1+--context_norm=1+--reranker_CAN_NUM=100+--reranker_merging_mode=replace"
+    model_config="--n_facet=1+--n_facet_context=1+--n_facet_reranker=1+--n_facet_emb=2+--n_facet_all=5+--n_facet_hidden=2+--n_facet_window=-2+--n_facet_MLP=-1+--context_norm=1+--reranker_CAN_NUM=100+--reranker_merging_mode=replace"
 elif [[ "$softmax_mode" == "softmax_CPR:20,100,500_Mi" ]]; then
     model_config="--n_facet=1+--n_facet_context=1+--n_facet_reranker=1+--n_facet_emb=2+--n_facet_all=7+--n_facet_hidden=2+--n_facet_window=-2+--n_facet_MLP=-1+--context_norm=1+--reranker_merging_mode=replace"
 elif [[ "$softmax_mode" == "MoS" ]]; then

diff --git a/run_hyper_slurm.sh b/run_hyper_slurm.sh
@@ -70,9 +70,9 @@ elif [[ "$softmax_mode" == "softmax_C" ]]; then
 elif [[ "$softmax_mode" == "softmax_CP" ]]; then
     model_config="--n_facet=1+--n_facet_all=4+--n_facet_context=1+--n_facet_emb=2+--n_facet_hidden=1+--n_facet_window=0+--n_facet_MLP=0+--context_norm=1"
 elif [[ "$softmax_mode" == "softmax_CPR:100" ]]; then
-    model_config="--n_facet=1+--n_facet_context=1+--n_facet_reranker=1+--n_facet_emb=2+--n_facet_all=7+--n_facet_hidden=1+--n_facet_window=0+--n_facet_MLP=0+--context_norm=1+--reranker_CAN_NUM=100+--reranker_merging_mode=replace"
+    model_config="--n_facet=1+--n_facet_context=1+--n_facet_reranker=1+--n_facet_emb=2+--n_facet_all=5+--n_facet_hidden=1+--n_facet_window=0+--n_facet_MLP=0+--context_norm=1+--reranker_CAN_NUM=100+--reranker_merging_mode=replace"
 elif [[ "$softmax_mode" == "softmax_CPR:100_Mi" ]]; then
-    model_config="--n_facet=1+--n_facet_context=1+--n_facet_reranker=1+--n_facet_emb=2+--n_facet_all=7+--n_facet_hidden=2+--n_facet_window=-2+--n_facet_MLP=-1+--context_norm=1+--reranker_CAN_NUM=100+--reranker_merging_mode=replace"
+    model_config="--n_facet=1+--n_facet_context=1+--n_facet_reranker=1+--n_facet_emb=2+--n_facet_all=5+--n_facet_hidden=2+--n_facet_window=-2+--n_facet_MLP=-1+--context_norm=1+--reranker_CAN_NUM=100+--reranker_merging_mode=replace"
 elif [[ "$softmax_mode" == "softmax_CPR:20,100,500_Mi" ]]; then
     model_config="--n_facet=1+--n_facet_context=1+--n_facet_reranker=1+--n_facet_emb=2+--n_facet_all=7+--n_facet_hidden=2+--n_facet_window=-2+--n_facet_MLP=-1+--context_norm=1+--reranker_merging_mode=replace"
 elif [[ "$softmax_mode" == "MoS" ]]; then