edit makers to use new default backend syntax in my pyhf fork

gradhep · Nov 30, 2020 · 68a7e32 · 68a7e32
1 parent 196ccf9
commit 68a7e32
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 58 deletions.
diff --git a/docs/assets/2_model_demo.gif b/docs/assets/2_model_demo.gif
diff --git a/docs/makers.html b/docs/makers.html
@@ -226,7 +226,7 @@ <h2 id="statistical-models">statistical models<a class="anchor-link" href="#stat
 
 
 <div class="output_markdown rendered_html output_subarea ">
-<h4 id="hepdata_like_from_hists" class="doc_header"><code>hepdata_like_from_hists</code><a href="https://github.com/gradhep/neos/neos/makers.py#L266" class="source_link" style="float:right">[source]</a></h4><blockquote><p><code>hepdata_like_from_hists</code>(<strong><code>histogram_maker</code></strong>)</p>
+<h4 id="hepdata_like_from_hists" class="doc_header"><code>hepdata_like_from_hists</code><a href="https://github.com/gradhep/neos/neos/makers.py#L265" class="source_link" style="float:right">[source]</a></h4><blockquote><p><code>hepdata_like_from_hists</code>(<strong><code>histogram_maker</code></strong>)</p>
 </blockquote>
 <p>Returns a function that constructs a typical 'hepdata-like' statistical
 model with signal, background, and background uncertainty yields when
@@ -358,7 +358,7 @@ <h3 id="Usage:">Usage:<a class="anchor-link" href="#Usage:"> </a></h3>
 
 
 <div class="output_markdown rendered_html output_subarea ">
-<h4 id="histosys_model_from_hists" class="doc_header"><code>histosys_model_from_hists</code><a href="https://github.com/gradhep/neos/neos/makers.py#L292" class="source_link" style="float:right">[source]</a></h4><blockquote><p><code>histosys_model_from_hists</code>(<strong><code>histogram_maker</code></strong>)</p>
+<h4 id="histosys_model_from_hists" class="doc_header"><code>histosys_model_from_hists</code><a href="https://github.com/gradhep/neos/neos/makers.py#L291" class="source_link" style="float:right">[source]</a></h4><blockquote><p><code>histosys_model_from_hists</code>(<strong><code>histogram_maker</code></strong>)</p>
 </blockquote>
 <p>Returns a function that constructs a HEP statistical model using a
 'histosys' uncertainty for the background (nominal background, up and down

diff --git a/nbs/02_makers.ipynb b/nbs/02_makers.ipynb
@@ -387,13 +387,12 @@
    "outputs": [],
    "source": [
     "#export\n",
-    "import sys\n",
-    "from unittest.mock import patch\n",
     "\n",
     "import pyhf\n",
     "\n",
     "jax_backend = pyhf.tensor.jax_backend(precision=\"64b\")\n",
     "pyhf.set_backend(jax_backend)\n",
+    "pyhf.set_backend(jax_backend, default=True)\n",
     "\n",
     "from neos.models import hepdata_like"
    ]
@@ -526,32 +525,7 @@
     "        background-only parameters for use in downstream inference.\n",
     "    \"\"\"\n",
     "\n",
-    "    # bunch of patches to make sure we use jax in pyhf\n",
-    "    @patch(\"pyhf.default_backend\", new=jax_backend)\n",
-    "    @patch.object(\n",
-    "        sys.modules[\"pyhf.interpolators.code0\"], \"default_backend\", new=jax_backend\n",
-    "    )\n",
-    "    @patch.object(\n",
-    "        sys.modules[\"pyhf.interpolators.code1\"], \"default_backend\", new=jax_backend\n",
-    "    )\n",
-    "    @patch.object(\n",
-    "        sys.modules[\"pyhf.interpolators.code2\"], \"default_backend\", new=jax_backend\n",
-    "    )\n",
-    "    @patch.object(\n",
-    "        sys.modules[\"pyhf.interpolators.code4\"], \"default_backend\", new=jax_backend\n",
-    "    )\n",
-    "    @patch.object(\n",
-    "        sys.modules[\"pyhf.interpolators.code4p\"], \"default_backend\", new=jax_backend\n",
-    "    )\n",
-    "    @patch.object(\n",
-    "        sys.modules[\"pyhf.modifiers.shapefactor\"], \"default_backend\", new=jax_backend\n",
-    "    )\n",
-    "    @patch.object(\n",
-    "        sys.modules[\"pyhf.modifiers.shapesys\"], \"default_backend\", new=jax_backend\n",
-    "    )\n",
-    "    @patch.object(\n",
-    "        sys.modules[\"pyhf.modifiers.staterror\"], \"default_backend\", new=jax_backend\n",
-    "    )\n",
+    "\n",
     "    def from_spec(yields):\n",
     "\n",
     "        s, b, bup, bdown = yields\n",

diff --git a/neos/makers.py b/neos/makers.py
@@ -252,13 +252,12 @@ def hist_maker(hm_params):
 
 
 # Cell
-import sys
-from unittest.mock import patch
 
 import pyhf
 
 jax_backend = pyhf.tensor.jax_backend(precision="64b")
 pyhf.set_backend(jax_backend)
+pyhf.set_backend(jax_backend, default=True)
 
 from .models import hepdata_like
 
@@ -304,32 +303,7 @@ def histosys_model_from_hists(histogram_maker):
         background-only parameters for use in downstream inference.
     """
 
-    # bunch of patches to make sure we use jax in pyhf
-    @patch("pyhf.default_backend", new=jax_backend)
-    @patch.object(
-        sys.modules["pyhf.interpolators.code0"], "default_backend", new=jax_backend
-    )
-    @patch.object(
-        sys.modules["pyhf.interpolators.code1"], "default_backend", new=jax_backend
-    )
-    @patch.object(
-        sys.modules["pyhf.interpolators.code2"], "default_backend", new=jax_backend
-    )
-    @patch.object(
-        sys.modules["pyhf.interpolators.code4"], "default_backend", new=jax_backend
-    )
-    @patch.object(
-        sys.modules["pyhf.interpolators.code4p"], "default_backend", new=jax_backend
-    )
-    @patch.object(
-        sys.modules["pyhf.modifiers.shapefactor"], "default_backend", new=jax_backend
-    )
-    @patch.object(
-        sys.modules["pyhf.modifiers.shapesys"], "default_backend", new=jax_backend
-    )
-    @patch.object(
-        sys.modules["pyhf.modifiers.staterror"], "default_backend", new=jax_backend
-    )
+
     def from_spec(yields):
 
         s, b, bup, bdown = yields