more changes to undo

kratsg · kratsg · commit db6da5d661e0 · 2025-11-04T12:53:40.000-08:00
diff --git a/pyproject.toml b/pyproject.toml
@@ -36,6 +36,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: Implementation :: CPython",
     "Topic :: Scientific/Engineering",
     "Topic :: Scientific/Engineering :: Physics",
@@ -217,7 +218,7 @@ exclude_also = [
 
 [tool.mypy]
 files = "src"
-python_version = "3.12"
+python_version = "3.13"
 warn_unused_configs = true
 strict = true
 enable_error_code = ["ignore-without-code", "redundant-expr", "truthy-bool"]
diff --git a/src/pyhf/modifiers/histosys.py b/src/pyhf/modifiers/histosys.py
@@ -101,8 +101,6 @@ class histosys_combined:
     def __init__(
         self, modifiers, pdfconfig, builder_data, interpcode='code0', batch_size=None
     ):
-        default_backend = pyhf.default_backend
-
         self.batch_size = batch_size
         self.interpcode = interpcode
         assert self.interpcode in ['code0', 'code2', 'code4p']
@@ -130,13 +128,10 @@ def __init__(
             ]
             for m in keys
         ]
-        self._histosys_mask = default_backend.astensor(
-            [
-                [[builder_data[m][s]['data']['mask']] for s in pdfconfig.samples]
-                for m in keys
-            ],
-            dtype='bool',
-        )
+        self._histosys_mask = [
+            [[builder_data[m][s]['data']['mask']] for s in pdfconfig.samples]
+            for m in keys
+        ]
 
         if histosys_mods:
             self.interpolator = getattr(interpolators, self.interpcode)(
diff --git a/src/pyhf/modifiers/lumi.py b/src/pyhf/modifiers/lumi.py
@@ -1,6 +1,5 @@
 import logging
 
-import pyhf
 from pyhf.tensor.manager import get_backend
 from pyhf import events
 from pyhf.parameters import ParamViewer
@@ -62,8 +61,6 @@ class lumi_combined:
     op_code = 'multiplication'
 
     def __init__(self, modifiers, pdfconfig, builder_data, batch_size=None):
-        default_backend = pyhf.default_backend
-
         self.batch_size = batch_size
 
         keys = [f'{mtype}/{m}' for m, mtype in modifiers]
@@ -76,13 +73,10 @@ def __init__(self, modifiers, pdfconfig, builder_data, batch_size=None):
         )
         self.param_viewer = ParamViewer(parfield_shape, pdfconfig.par_map, lumi_mods)
 
-        self._lumi_mask = default_backend.astensor(
-            [
-                [[builder_data[m][s]['data']['mask']] for s in pdfconfig.samples]
-                for m in keys
-            ],
-            dtype='bool',
-        )
+        self._lumi_mask = [
+            [[builder_data[m][s]['data']['mask']] for s in pdfconfig.samples]
+            for m in keys
+        ]
         self._precompute()
         events.subscribe('tensorlib_changed')(self._precompute)
 
diff --git a/src/pyhf/modifiers/normfactor.py b/src/pyhf/modifiers/normfactor.py
@@ -1,6 +1,5 @@
 import logging
 
-import pyhf
 from pyhf.tensor.manager import get_backend
 from pyhf import events
 from pyhf.parameters import ParamViewer
@@ -60,8 +59,6 @@ class normfactor_combined:
     op_code = 'multiplication'
 
     def __init__(self, modifiers, pdfconfig, builder_data, batch_size=None):
-        default_backend = pyhf.default_backend
-
         self.batch_size = batch_size
 
         keys = [f'{mtype}/{m}' for m, mtype in modifiers]
@@ -76,13 +73,10 @@ def __init__(self, modifiers, pdfconfig, builder_data, batch_size=None):
             parfield_shape, pdfconfig.par_map, normfactor_mods
         )
 
-        self._normfactor_mask = default_backend.astensor(
-            [
-                [[builder_data[m][s]['data']['mask']] for s in pdfconfig.samples]
-                for m in keys
-            ],
-            dtype='bool',
-        )
+        self._normfactor_mask = [
+            [[builder_data[m][s]['data']['mask']] for s in pdfconfig.samples]
+            for m in keys
+        ]
         self._precompute()
         events.subscribe('tensorlib_changed')(self._precompute)
 
diff --git a/src/pyhf/modifiers/normsys.py b/src/pyhf/modifiers/normsys.py
@@ -1,6 +1,5 @@
 import logging
 
-import pyhf
 from pyhf.tensor.manager import get_backend
 from pyhf import events
 from pyhf import interpolators
@@ -74,8 +73,6 @@ class normsys_combined:
     def __init__(
         self, modifiers, pdfconfig, builder_data, interpcode='code1', batch_size=None
     ):
-        default_backend = pyhf.default_backend
-
         self.interpcode = interpcode
         assert self.interpcode in ['code1', 'code4']
 
@@ -101,13 +98,10 @@ def __init__(
             ]
             for m in keys
         ]
-        self._normsys_mask = default_backend.astensor(
-            [
-                [[builder_data[m][s]['data']['mask']] for s in pdfconfig.samples]
-                for m in keys
-            ],
-            dtype='bool',
-        )
+        self._normsys_mask = [
+            [[builder_data[m][s]['data']['mask']] for s in pdfconfig.samples]
+            for m in keys
+        ]
 
         if normsys_mods:
             self.interpolator = getattr(interpolators, self.interpcode)(
diff --git a/src/pyhf/modifiers/shapefactor.py b/src/pyhf/modifiers/shapefactor.py
@@ -138,13 +138,10 @@ def __init__(self, modifiers, pdfconfig, builder_data, batch_size=None):
             parfield_shape, pdfconfig.par_map, shapefactor_mods
         )
 
-        self._shapefactor_mask = default_backend.astensor(
-            [
-                [[builder_data[m][s]['data']['mask']] for s in pdfconfig.samples]
-                for m in keys
-            ],
-            dtype='bool',
-        )
+        self._shapefactor_mask = [
+            [[builder_data[m][s]['data']['mask']] for s in pdfconfig.samples]
+            for m in keys
+        ]
 
         global_concatenated_bin_indices = [
             [[j for c in pdfconfig.channels for j in range(pdfconfig.channel_nbins[c])]]
diff --git a/src/pyhf/modifiers/shapesys.py b/src/pyhf/modifiers/shapesys.py
@@ -112,13 +112,10 @@ def __init__(self, modifiers, pdfconfig, builder_data, batch_size=None):
             parfield_shape, pdfconfig.par_map, self._shapesys_mods
         )
 
-        self._shapesys_mask = default_backend.astensor(
-            [
-                [[builder_data[m][s]['data']['mask']] for s in pdfconfig.samples]
-                for m in keys
-            ],
-            dtype='bool',
-        )
+        self._shapesys_mask = [
+            [[builder_data[m][s]['data']['mask']] for s in pdfconfig.samples]
+            for m in keys
+        ]
         self.__shapesys_info = default_backend.astensor(
             [
                 [
diff --git a/src/pyhf/modifiers/staterror.py b/src/pyhf/modifiers/staterror.py
@@ -149,13 +149,10 @@ def __init__(self, modifiers, pdfconfig, builder_data, batch_size=None):
             parfield_shape, pdfconfig.par_map, self._staterr_mods
         )
 
-        self._staterror_mask = default_backend.astensor(
-            [
-                [[builder_data[m][s]['data']['mask']] for s in pdfconfig.samples]
-                for m in keys
-            ],
-            dtype='bool',
-        )
+        self._staterror_mask = [
+            [[builder_data[m][s]['data']['mask']] for s in pdfconfig.samples]
+            for m in keys
+        ]
         global_concatenated_bin_indices = [
             [[j for c in pdfconfig.channels for j in range(pdfconfig.channel_nbins[c])]]
         ]
diff --git a/tests/test_backend_consistency.py b/tests/test_backend_consistency.py
@@ -127,10 +127,6 @@ def test_hypotest_qmu_tilde(
     numpy_ratio = np.divide(test_statistic, test_statistic[0])
     numpy_ratio_delta_unity = np.absolute(np.subtract(numpy_ratio, 1))
 
-    # compare tensor libraries to each other
-    tensors_ratio = np.divide(test_statistic[0], test_statistic[1])
-    tensors_ratio_delta_unity = np.absolute(np.subtract(tensors_ratio, 1))
-
     try:
         assert (numpy_ratio_delta_unity < tolerance['numpy']).all()
     except AssertionError:

Original file line number	Diff line number	Diff line change
`@@ -112,13 +112,10 @@ def __init__(self, modifiers, pdfconfig, builder_data, batch_size=None):`
`112`	`112`	`parfield_shape, pdfconfig.par_map, self._shapesys_mods`
`113`	`113`	`)`
`114`	`114`
`115`		`- self._shapesys_mask = default_backend.astensor(`
`116`		`- [`
`117`		`- [[builder_data[m][s]['data']['mask']] for s in pdfconfig.samples]`
`118`		`- for m in keys`
`119`		`- ],`
`120`		`- dtype='bool',`
`121`		`- )`
	`115`	`+ self._shapesys_mask = [`
	`116`	`+ [[builder_data[m][s]['data']['mask']] for s in pdfconfig.samples]`
	`117`	`+ for m in keys`
	`118`	`+ ]`
`122`	`119`	`self.__shapesys_info = default_backend.astensor(`
`123`	`120`	`[`
`124`	`121`	`[`