scikit-hep · HDembinski · Dec 6, 2023 · Dec 6, 2023 · Dec 6, 2023 · Dec 6, 2023
diff --git a/bench/plot.ipynb b/bench/plot.ipynb
diff --git a/bench/test_cost.py b/bench/test_cost.py
@@ -35,9 +35,12 @@ def logsumexp(a, b):
     r = np.empty_like(a)
     for i in nb.prange(len(r)):
         if a[i] > b[i]:
-            r[i] = a[i] + np.log(1 + np.exp(b[i] - a[i]))
+            c = a[i]
+            d = b[i]
         else:
-            r[i] = b[i] + np.log(1 + np.exp(a[i] - b[i]))
+            c = b[i]
+            d = a[i]
+        r[i] = c + np.log1p(np.exp(d - c))
     return r
 
 
@@ -210,39 +213,77 @@ def run():
     assert_allclose(m.values[:-1], ARGS[:-1], atol=2 / n**0.5)
 
 
-@pytest.mark.parametrize("n", N)
-@pytest.mark.parametrize("BatchMode", [False, True])
-@pytest.mark.parametrize("NumCPU", [0, nb.get_num_threads()])
-@pytest.mark.parametrize("EvalBackend", ["legacy", "cpu"])
-def test_RooFit(benchmark, n, BatchMode, NumCPU, EvalBackend):
+try:
     import ROOT as R
 
-    x = R.RooRealVar("x", "x", 0, 1)
-    z = R.RooRealVar("z", "z", 0.5, 0, 1)
-    mu = R.RooRealVar("mu", "mu", 0.5, 0, 1)
-    sigma = R.RooRealVar("sigma", "sigma", 0.1, 0, 10)
-    slope = R.RooRealVar("slope", "slope", 1.0, 0, 10)
-    pdf1 = R.RooGaussian("gauss", "gauss", x, mu, sigma)
-    pdf2 = R.RooExponential("expon", "expon", x, slope)
-    pdf = R.RooAddPdf("pdf", "pdf", [pdf1, pdf2], [z])
+    if R.__version__ >= "6.30":
+
+        @pytest.mark.parametrize("n", N)
+        @pytest.mark.parametrize("NumCPU", [0, nb.get_num_threads()])
+        @pytest.mark.parametrize(
+            "EvalBackend", ["legacy", "cpu", "codegen", "codegen_no_grad"]
+        )
+        def test_RooFit(benchmark, n, NumCPU, EvalBackend):
+            x = R.RooRealVar("x", "x", 0, 1)
+            z = R.RooRealVar("z", "z", 0.5, 0, 1)
+            mu = R.RooRealVar("mu", "mu", 0.5, 0, 1)
+            sigma = R.RooRealVar("sigma", "sigma", 0.1, 0, 10)
+            slope = R.RooRealVar("slope", "slope", 1.0, 0, 10)
+            pdf1 = R.RooGaussian("gauss", "gauss", x, mu, sigma)
+            pdf2 = R.RooExponential("expon", "expon", x, slope)
+            pdf = R.RooAddPdf("pdf", "pdf", [pdf1, pdf2], [z])
+
+            data = pdf.generate(x, n)
+
+            args = [R.RooFit.PrintLevel(-1), R.RooFit.EvalBackend(EvalBackend)]
+            if NumCPU:
+                args.append(R.RooFit.NumCPU(NumCPU))
+
+            def run():
+                mu.setVal(0.5)
+                sigma.setVal(0.1)
+                slope.setVal(1)
+                z.setVal(0.5)
+                pdf.fitTo(data, *args)
+
+            benchmark(run)
+            assert_allclose(z.getVal(), 0.5, atol=5 / n**0.5)
+            assert_allclose(mu.getVal(), 0.5, atol=5 / n**0.5)
+            assert_allclose(sigma.getVal(), 0.1, atol=5 / n**0.5)
 
-    data = pdf.generate(x, n)
+    else:
 
-    def run():
-        mu.setVal(0.5)
-        sigma.setVal(0.1)
-        slope.setVal(1)
-        z.setVal(0.5)
-        args = [
-            R.RooFit.PrintLevel(-1),
-            R.RooFit.BatchMode(BatchMode),
-            R.RooFit.EvalBackend(EvalBackend),
-        ]
-        if NumCPU:
-            args.append(R.RooFit.NumCPU(NumCPU))
-        pdf.fitTo(data, *args)
-
-    benchmark(run)
-    assert_allclose(z.getVal(), 0.5, atol=5 / n**0.5)
-    assert_allclose(mu.getVal(), 0.5, atol=5 / n**0.5)
-    assert_allclose(sigma.getVal(), 0.1, atol=5 / n**0.5)
+        @pytest.mark.parametrize("n", N)
+        @pytest.mark.parametrize("NumCPU", [0, nb.get_num_threads()])
+        @pytest.mark.parametrize("BatchMode", [False, True])
+        def test_RooFit(benchmark, n, NumCPU, BatchMode):
+            x = R.RooRealVar("x", "x", 0, 1)
+            z = R.RooRealVar("z", "z", 0.5, 0, 1)
+            mu = R.RooRealVar("mu", "mu", 0.5, 0, 1)
+            sigma = R.RooRealVar("sigma", "sigma", 0.1, 0, 10)
+            slope = R.RooRealVar("slope", "slope", 1.0, 0, 10)
+            pdf1 = R.RooGaussian("gauss", "gauss", x, mu, sigma)
+            pdf2 = R.RooExponential("expon", "expon", x, slope)
+            pdf = R.RooAddPdf("pdf", "pdf", [pdf1, pdf2], [z])
+
+            data = pdf.generate(x, n)
+
+            args = [R.RooFit.PrintLevel(-1), R.RooFit.BatchMode(BatchMode)]
+            if NumCPU:
+                args.append(R.RooFit.NumCPU(NumCPU, 1))
+                args.append(R.RooFit.Parallelize(NumCPU))
+
+            def run():
+                mu.setVal(0.5)
+                sigma.setVal(0.1)
+                slope.setVal(1)
+                z.setVal(0.5)
+                pdf.fitTo(data, *args)
+
+            benchmark(run)
+            assert_allclose(z.getVal(), 0.5, atol=5 / n**0.5)
+            assert_allclose(mu.getVal(), 0.5, atol=5 / n**0.5)
+            assert_allclose(sigma.getVal(), 0.1, atol=5 / n**0.5)
+
+except ModuleNotFoundError:
+    pass
diff --git a/doc/_static/interactive_demo.ipynb b/doc/_static/interactive_demo.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+  "cells": [
   {
    "cell_type": "markdown",
    "metadata": {},

diff --git a/doc/notebooks/automatic_differentiation.ipynb b/doc/notebooks/automatic_differentiation.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+  "cells": [
   {
    "attachments": {},
    "cell_type": "markdown",

diff --git a/doc/notebooks/basic.ipynb b/doc/notebooks/basic.ipynb
@@ -1,5 +1,5 @@
 {
-    "cells": [
+  "cells": [
         {
             "attachments": {},
             "cell_type": "markdown",

diff --git a/doc/notebooks/binned_vs_unbinned.ipynb b/doc/notebooks/binned_vs_unbinned.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+  "cells": [
   {
    "cell_type": "markdown",
    "metadata": {},

diff --git a/doc/notebooks/conditional_variable.ipynb b/doc/notebooks/conditional_variable.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+  "cells": [
   {
    "cell_type": "markdown",
    "id": "naked-recruitment",

diff --git a/doc/notebooks/cost_function_benchmarks.ipynb b/doc/notebooks/cost_function_benchmarks.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+  "cells": [
   {
    "cell_type": "markdown",
    "metadata": {},

diff --git a/doc/notebooks/cost_functions.ipynb b/doc/notebooks/cost_functions.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+  "cells": [
   {
    "cell_type": "markdown",
    "id": "negative-concord",

diff --git a/doc/notebooks/cython.ipynb b/doc/notebooks/cython.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+  "cells": [
   {
    "cell_type": "markdown",
    "metadata": {},

diff --git a/doc/notebooks/error_bands.ipynb b/doc/notebooks/error_bands.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+  "cells": [
   {
    "cell_type": "markdown",
    "id": "frozen-raising",

diff --git a/doc/notebooks/external_minimizer.ipynb b/doc/notebooks/external_minimizer.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+  "cells": [
   {
    "cell_type": "markdown",
    "metadata": {},

diff --git a/doc/notebooks/generic_least_squares.ipynb b/doc/notebooks/generic_least_squares.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+  "cells": [
   {
    "cell_type": "markdown",
    "metadata": {},

diff --git a/doc/notebooks/gof.ipynb b/doc/notebooks/gof.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+  "cells": [
   {
    "cell_type": "markdown",
    "metadata": {},

diff --git a/doc/notebooks/hesse_and_minos.ipynb b/doc/notebooks/hesse_and_minos.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+  "cells": [
   {
    "attachments": {},
    "cell_type": "markdown",

diff --git a/doc/notebooks/interactive.ipynb b/doc/notebooks/interactive.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+  "cells": [
   {
    "attachments": {},
    "cell_type": "markdown",

diff --git a/doc/notebooks/memory_layout.ipynb b/doc/notebooks/memory_layout.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+  "cells": [
   {
    "cell_type": "markdown",
    "metadata": {},

diff --git a/doc/notebooks/numba.ipynb b/doc/notebooks/numba.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+  "cells": [
   {
    "cell_type": "markdown",
    "metadata": {},

diff --git a/doc/notebooks/roofit.ipynb b/doc/notebooks/roofit.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+  "cells": [
   {
    "attachments": {},
    "cell_type": "markdown",

diff --git a/doc/notebooks/roofit/rf101_basics.ipynb b/doc/notebooks/roofit/rf101_basics.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+  "cells": [
   {
    "attachments": {},
    "cell_type": "markdown",

diff --git a/doc/notebooks/roofit/rf109_chi2residpull.ipynb b/doc/notebooks/roofit/rf109_chi2residpull.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+  "cells": [
   {
    "attachments": {},
    "cell_type": "markdown",

diff --git a/doc/notebooks/scipy_and_constraints.ipynb b/doc/notebooks/scipy_and_constraints.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+  "cells": [
   {
    "cell_type": "markdown",
    "id": "ffdfe095",

diff --git a/doc/notebooks/simultaneous_fits.ipynb b/doc/notebooks/simultaneous_fits.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+  "cells": [
   {
    "cell_type": "markdown",
    "metadata": {},

diff --git a/doc/notebooks/template_fits.ipynb b/doc/notebooks/template_fits.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+  "cells": [
   {
    "attachments": {},
    "cell_type": "markdown",

diff --git a/doc/notebooks/template_gof.ipynb b/doc/notebooks/template_gof.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+  "cells": [
   {
    "attachments": {},
    "cell_type": "markdown",

diff --git a/doc/notebooks/template_model_mix.ipynb b/doc/notebooks/template_model_mix.ipynb
@@ -1,5 +1,5 @@
 {
- "cells": [
+  "cells": [
   {
    "attachments": {},
    "cell_type": "markdown",