Merge branch 'master' into CMS_2JET_13TEV

Author: achiefa

.github/actions/install_conda_pip/action.yml

@@ -27,7 +27,7 @@ inputs:
   nnpdf-extras:
     required: true
     description: "Which extras to install"
-    default: "[qed,tests]"
+    default: "[qed,tests,hyperopt]"
 
 
 runs:

conda-recipe/meta.yaml

@@ -13,7 +13,7 @@ build:
 
 requirements:
     host:
-        - python >=3.9,<3.13
+        - python >=3.10,<3.14
         - poetry-core >=1.0.0
         - poetry-dynamic-versioning >=1.2.0
         - pip
@@ -23,6 +23,7 @@ requirements:
         - keras >=3.1
         - psutil # to ensure n3fit affinity is with the right processors
         - hyperopt
+        - setuptools <82 # to provide pkg_resources for hyperopt
         - mongodb
         - pymongo <4
         - pyopenssl >=23.2

n3fit/src/n3fit/hyper_optimization/__init__.py

@@ -0,0 +1,4 @@
+class HyperoptDependencyMissing:
+    # cheap sentinel class, the best we can budget
+    # Since setuptools updated to 82.0 hyperopt fails due to pkg_resources
+    pass

n3fit/src/n3fit/hyper_optimization/filetrials.py

@@ -18,7 +18,12 @@
 import logging
 import pickle
 
-from hyperopt import Trials, space_eval
+try:
+    from hyperopt import Trials, space_eval
+except ModuleNotFoundError:
+    from . import HyperoptDependencyMissing as Trials
+
+    space_eval = object()
 
 from validphys.hyperoptplot import HyperoptTrial
 

n3fit/src/n3fit/hyper_optimization/hyper_scan.py

@@ -17,8 +17,17 @@
 import copy
 import logging
 
-import hyperopt
-from hyperopt.pyll.base import scope
+try:
+    import hyperopt
+    from hyperopt.pyll.base import scope
+except ModuleNotFoundError:
+    # TODO a sentinel class that tells the user the hyperopt dependency is missing would be nice
+    # if you arrive here, yes, the hyperopt dependency is missing (or your setuptools is too new)
+    from . import HyperoptDependencyMissing as hyperopt
+
+    scope = object()
+
+
 import numpy as np
 
 from n3fit.backends import MetaLayer, MetaModel

n3fit/src/n3fit/hyper_optimization/mongofiletrials.py

@@ -24,8 +24,14 @@
 import subprocess
 import time
 
-from bson import SON, ObjectId
-from hyperopt.mongoexp import MongoTrials
+try:
+    from bson import SON, ObjectId
+    from hyperopt.mongoexp import MongoTrials
+except ModuleNotFoundError:
+    SON = object()
+    from . import HyperoptDependencyMissing as MongoTrials
+
+    ObjectId = object()
 
 from n3fit.backends import get_physical_gpus
 from n3fit.hyper_optimization.filetrials import space_eval_trial

pyproject.toml

@@ -75,9 +75,11 @@ tensorflow = "*"
 keras = "^3.1"
 eko = "^0.15.1"
 joblib = "*"
-# Hyperopt
-hyperopt = "*"
 seaborn = "*"
+# Hyperopt
+hyperopt = {version = "*", optional = true}
+# hyperopt needs setuptools pinned to < 82 due to pkg resources
+setuptools = {version = "<82", optional = true}
 # LHAPDF installation for debugging purposes
 # a3b2bbc3ced97675ac3a71df45f55ba = "*"
 # Optional dependencies
@@ -111,7 +113,8 @@ qed = ["fiatlux"]
 nolha = ["pdfflow", "lhapdf-management"]
 torch = ["torch"]
 jax = ["jax"]
-parallelhyperopt = ["pymongo"]
+hyperopt = ["hyperopt", "setuptools"]
+parallelhyperopt = ["pymongo", "hyperopt", "setuptools"]
 
 [tool.poetry-dynamic-versioning]
 enable = true

validphys2/src/validphys/core.py

@@ -23,7 +23,6 @@
 # Maybe move the cuts logic to its own module?
 from validphys import filters, lhaindex
 from validphys.fkparser import load_fktable, parse_cfactor
-from validphys.hyperoptplot import HyperoptTrial
 from validphys.lhapdfset import LHAPDFSet
 from validphys.tableloader import parse_exp_mat
 from validphys.utils import experiments_to_dataset_inputs, yaml_safe
@@ -747,6 +746,8 @@ def get_all_trials(self, base_params=None):
 
         Each hyperopt trial object will also have a reference to all trials in its own file
         """
+        from validphys.hyperoptplot import HyperoptTrial
+
         all_trials = []
         for trial_file in self.tries_files.values():
             with open(trial_file) as tf: