Merge branch 'master' into feature/nbjets

uhh-cms · Jan 30, 2025 · 49f4828 · 49f4828
2 parents e058b1e + 08d8a61
commit 49f4828
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/hbt/config/configs_hbt.py b/hbt/config/configs_hbt.py
@@ -444,8 +444,8 @@ def if_not_era(*, values: list[str | None] | None = None, **kwargs) -> list[str]
             "qcd",
             "st",
             "tt_multiboson",
-            "v",
             "multiboson",
+            "v",
             "h",
             "ewk",
         ]),

diff --git a/hbt/production/hhbtag.py b/hbt/production/hhbtag.py
@@ -152,7 +152,12 @@ def hhbtag_setup(self: Producer, reqs: dict, inputs: dict, reader_targets: Inser
     """
     Sets up the two HHBtag TF models.
     """
-    tf = maybe_import("tensorflow")
+    import os
+    os.environ["CUDA_VISIBLE_DEVICES"] = "-1"
+    import tensorflow as tf
+
+    tf.config.threading.set_inter_op_parallelism_threads(1)
+    tf.config.threading.set_intra_op_parallelism_threads(1)
 
     # unpack the external files bundle, create a subdiretory and unpack the hhbtag repo in it
     bundle = reqs["external_files"]

diff --git a/modules/columnflow b/modules/columnflow
-Original file line number
+Diff line change
@@ Expand Up @@
                 "qcd",
                 "st",
                 "tt_multiboson",
-                "v",
                 "multiboson",
+                "v",
                 "h",
                 "ewk",
             ]),
@@ Expand Down @@
+8 −1		bin/cf_sandbox
+21 −0		columnflow/tasks/framework/mixins.py
+17 −0		columnflow/tasks/plotting.py