Browse Source

add return num log

linfan 1 year ago
parent
commit
1e6c612b3f
2 changed files with 7 additions and 5 deletions
  1. 4 4
      video_rank.py
  2. 3 1
      video_recall.py

+ 4 - 4
video_rank.py

@@ -655,10 +655,10 @@ def video_new_rank2(data, size, top_K, flow_pool_P, ab_code, exp_config=None):
         flow_recall_rank = flow_recall_rank[top_K:]
         # 按概率 p 及score排序获取 size - k 个视频
     flow_num = 0
-    flowConfig = "0"
+    flowConfig = 0
     if exp_config and exp_config['flowConfig']:
         flowConfig = exp_config['flowConfig']
-    if flowConfig == "1" and len(rov_recall_rank) > 0:
+    if flowConfig == 1 and len(rov_recall_rank) > 0:
         for recall_item in rank_result:
             flow_recall_name = recall_item.get("flowPool", '')
             flow_num = flow_num + 1
@@ -814,10 +814,10 @@ def video_sanke_rank(data, size, top_K, flow_pool_P, ab_Code='', exp_config=None
         rank_result.extend(flow_recall_rank[:top_K])
         flow_recall_rank = flow_recall_rank[top_K:]
     flow_num = 0
-    flowConfig ="0"
+    flowConfig =0
     if exp_config and exp_config['flowConfig']:
         flowConfig = exp_config['flowConfig']
-    if flowConfig == "1" and len(rov_recall_rank) > 0:
+    if flowConfig == 1 and len(rov_recall_rank) > 0:
         rank_result.extend(rov_recall_rank[:top_K])
         for recall_item in rank_result:
             flow_recall_name = recall_item.get("flowPool", '')

+ 3 - 1
video_recall.py

@@ -1317,7 +1317,9 @@ class PoolRecall(object):
         #     'operation': 'rov_pool_recall_with_region',
         #     'executeTime': (time.time() - start_time) * 1000
         # })
-        return recall_result[:size]
+        print("recall_num:", recall_num)
+        print("recall_result:", recall_result[:recall_num])
+        return recall_result[:recall_num]
 
     def rov_pool_recall_with_region(self, size=4, expire_time=24*3600, ab_code=None, exp_config=None):
         """召回池召回视频"""