correctionlib 2.6.0__tar.gz → 2.6.4__tar.gz

{correctionlib-2.6.0 → correctionlib-2.6.4}/.github/workflows/ci.yml

@@ -31,12 +31,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.11", "3.12"]
-        runs-on: [ubuntu-latest, macos-13, windows-latest]
+        python-version: ["3.11", "3.12"]
+        runs-on: [ubuntu-latest, macos-latest, windows-latest]
 
         include:
-        - python-version: "3.12"
-          runs-on: macos-latest
+        - python-version: "3.7"
+          runs-on: ubuntu-latest
+        - python-version: "3.7"
+          runs-on: macos-13
+        - python-version: "3.7"
+          runs-on: windows-latest
     steps:
     - uses: actions/checkout@v4
       with:

{correctionlib-2.6.0 → correctionlib-2.6.4}/.github/workflows/wheels.yml

@@ -23,8 +23,9 @@ jobs:
     - name: Build SDist
       run: pipx run build --sdist
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       with:
+        name: artifact-sdist
         path: dist/*.tar.gz
 
   build_wheels:
@@ -42,27 +43,29 @@ jobs:
         fetch-tags: true
         fetch-depth: 0
 
-    - uses: pypa/cibuildwheel@v2.19.1
+    - uses: pypa/cibuildwheel@v2.19.2
       env:
         MACOSX_DEPLOYMENT_TARGET: 10.14
 
     - name: Upload wheels
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
+        name: artifact-wheel-${{ matrix.os }}
         path: wheelhouse/*.whl
 
-  upload_all:
+  pypi-publish:
     needs: [build_wheels, make_sdist]
+    name: Upload release to PyPI
     runs-on: ubuntu-latest
     if: github.event_name == 'release' && github.event.action == 'published'
-
+    permissions:
+      id-token: write
     steps:
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v4
       with:
-        name: artifact
         path: dist
+        pattern: artifact-*
+        merge-multiple: true
 
-    - uses: pypa/gh-action-pypi-publish@v1.9.0
-      with:
-        user: __token__
-        password: ${{ secrets.pypi_token }}
+    - name: Publish package distributions to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1

{correctionlib-2.6.0 → correctionlib-2.6.4}/CMakeLists.txt

@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.11)
 
+if(NOT CORRECTIONLIB_VERSION)
+  set(CORRECTIONLIB_VERSION "0.0.0")  # overriden by setup.py
+endif()
 string(REPLACE "." ";" VERSION_SPLIT ${CORRECTIONLIB_VERSION})
 list(GET VERSION_SPLIT 0 SPLIT_VERSION_MAJOR)
 list(GET VERSION_SPLIT 1 SPLIT_VERSION_MINOR)
@@ -19,16 +22,6 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads)
 find_package(ZLIB)
 
-include(CheckCXXCompilerFlag)
-
-check_cxx_compiler_flag(-Wall has_wall)
-if(has_wall)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
-endif()
-if(MSVC)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:__cplusplus /utf-8")
-endif()
-
 
 configure_file(include/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/correctionlib_version.h)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/include/correctionlib_version.h DESTINATION ${PKG_INSTALL}/include)
@@ -48,21 +41,32 @@ target_include_directories(correctionlib
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pcg-cpp/include>
   )
 target_compile_features(correctionlib PUBLIC cxx_std_17)
+if(MSVC)
+  target_compile_options(correctionlib PRIVATE /Zc:__cplusplus /utf-8)
+else()
+  target_compile_options(correctionlib PRIVATE -Wall -Wextra -Wpedantic -Werror)
+endif()
 if(ZLIB_FOUND)
-  target_link_libraries(correctionlib ZLIB::ZLIB)
+  target_link_libraries(correctionlib PRIVATE ZLIB::ZLIB)
 endif()
 if(Threads_FOUND AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
-  target_link_libraries(correctionlib Threads::Threads)
+  target_link_libraries(correctionlib PRIVATE Threads::Threads)
 endif()
 install(TARGETS correctionlib
   EXPORT correctionlib-targets
   LIBRARY DESTINATION ${PKG_INSTALL}/lib
+  ARCHIVE DESTINATION ${PKG_INSTALL}/lib
   RUNTIME DESTINATION ${PKG_INSTALL}/lib
   PUBLIC_HEADER DESTINATION ${PKG_INSTALL}/include
   )
 
 
 pybind11_add_module(_core MODULE src/python.cc)
+if(MSVC)
+  target_compile_options(_core PRIVATE /W4 /WX)
+else()
+  target_compile_options(_core PRIVATE -Wall -Wextra -Wpedantic -Werror)
+endif()
 target_link_libraries(_core PRIVATE correctionlib)
 set_target_properties(_core PROPERTIES BUILD_WITH_INSTALL_RPATH ON)
 if (APPLE)

{correctionlib-2.6.0/src/correctionlib.egg-info → correctionlib-2.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: correctionlib
-Version: 2.6.0
+Version: 2.6.4
 Summary: A generic correction library
 Home-page: https://github.com/cms-nanoAOD/correctionlib
 Author: Nick Smith

{correctionlib-2.6.0 → correctionlib-2.6.4}/include/version.h.in

@@ -7,6 +7,6 @@ namespace correction {
   constexpr std::string_view correctionlib_version{"@CORRECTIONLIB_VERSION@"};
   constexpr int correctionlib_major_version{@correctionlib_VERSION_MAJOR@};
   constexpr int correctionlib_minor_version{@correctionlib_VERSION_MINOR@};
-};
+}
 
 #endif // CORRECTIONLIB_VERSION_H

{correctionlib-2.6.0 → correctionlib-2.6.4}/src/correction.cc

@@ -791,9 +791,11 @@ std::unique_ptr<CorrectionSet> CorrectionSet::from_file(const std::string& fn) {
   if ( fp == nullptr ) {
     throw std::runtime_error("Failed to open file: " + fn);
   }
-  constexpr unsigned char magicref[4] = {0x1f, 0x8b};
+  constexpr unsigned char magicref[2] = {0x1f, 0x8b};
   unsigned char magic[2];
-  fread(magic, sizeof *magic, 2, fp);
+  if (fread(magic, sizeof *magic, 2, fp) != 2) {
+    throw std::runtime_error("Failed to read file magic: " + fn);
+  }
   rewind(fp);
   char readBuffer[65536];
   rapidjson::ParseResult ok;
@@ -802,14 +804,14 @@ std::unique_ptr<CorrectionSet> CorrectionSet::from_file(const std::string& fn) {
 #ifdef WITH_ZLIB
     gzFile_s* fpz = gzopen(fn.c_str(), "r");
     rapidjson::GzFileReadStream is(fpz, readBuffer, sizeof(readBuffer));
-    ok = json.ParseStream(is);
+    ok = json.ParseStream<rapidjson::kParseNanAndInfFlag>(is);
     gzclose(fpz);
 #else
     throw std::runtime_error("Gzip-compressed JSON files are only supported if ZLIB is found when the package is built");
 #endif
   } else {
     rapidjson::FileReadStream is(fp, readBuffer, sizeof(readBuffer));
-    ok = json.ParseStream(is);
+    ok = json.ParseStream<rapidjson::kParseNanAndInfFlag>(is);
     fclose(fp);
   }
   if (!ok) {
@@ -824,7 +826,7 @@ std::unique_ptr<CorrectionSet> CorrectionSet::from_file(const std::string& fn) {
 
 std::unique_ptr<CorrectionSet> CorrectionSet::from_string(const char * data) {
   rapidjson::Document json;
-  rapidjson::ParseResult ok = json.Parse(data);
+  rapidjson::ParseResult ok = json.Parse<rapidjson::kParseNanAndInfFlag>(data);
   if (!ok) {
     throw std::runtime_error(
         std::string("JSON parse error: ") + rapidjson::GetParseError_En(ok.Code())

{correctionlib-2.6.0 → correctionlib-2.6.4}/src/correctionlib/cli.py

@@ -1,18 +1,21 @@
-"""Command-line interface to correctionlib
+"""Command-line interface to correctionlib.
 
 """
 import argparse
 import sys
-from typing import Any
 
+import pydantic
 from rich.console import Console
 
 import correctionlib.version
+from correctionlib import schemav2
 from correctionlib.highlevel import model_auto, open_auto
 
 
 def validate(console: Console, args: argparse.Namespace) -> int:
     """Check if all files are valid"""
+    if args.ignore_float_inf:
+        schemav2.IGNORE_FLOAT_INF = True
     retcode = 0
     for file in args.files:
         try:
@@ -23,19 +26,26 @@ def validate(console: Console, args: argparse.Namespace) -> int:
                 raise ValueError(
                     f"Schema version {cset.schema_version} does not match the required version {args.version}"
                 )
-        except Exception as ex:
+        except pydantic.ValidationError as ex:
             if not args.quiet:
-                console.print(str(ex))
+                console.print("[red]Validation error, full information below")
+                print(str(ex))  # noqa: T201
             retcode = 1
             if args.failfast:
                 break
+        except BaseException:
+            if not args.quiet:
+                raise
+            retcode = 2
+            if args.failfast:
+                break
         else:
             if not args.quiet:
                 console.print("[green]All OK :heavy_check_mark:")
     return retcode
 
 
-def setup_validate(subparsers: Any) -> None:
+def setup_validate(subparsers):
     parser = subparsers.add_parser("validate", help=validate.__doc__)
     parser.set_defaults(command=validate)
     parser.add_argument(
@@ -57,7 +67,13 @@ def setup_validate(subparsers: Any) -> None:
         default=None,
         help="Validate against specific schema version",
     )
+    parser.add_argument(
+        "--ignore-float-inf",
+        action="store_true",
+        help="Disable errors for use of float infinities in bin edges (as required in v2.6 and later)",
+    )
     parser.add_argument("files", nargs="+", metavar="FILE")
+    return parser
 
 
 def summary(console: Console, args: argparse.Namespace) -> int:
@@ -68,12 +84,13 @@ def summary(console: Console, args: argparse.Namespace) -> int:
     return 0
 
 
-def setup_summary(subparsers: Any) -> None:
+def setup_summary(subparsers):
     parser = subparsers.add_parser(
         "summary", help="Print a summmary of the corrections"
     )
     parser.set_defaults(command=summary)
     parser.add_argument("files", nargs="+", metavar="FILE")
+    return parser
 
 
 def merge(console: Console, args: argparse.Namespace) -> int:
@@ -113,7 +130,7 @@ def merge(console: Console, args: argparse.Namespace) -> int:
     return 0
 
 
-def setup_merge(subparsers: Any) -> None:
+def setup_merge(subparsers):
     parser = subparsers.add_parser(
         "merge", help="Merge one or more correction files and print to stdout"
     )
@@ -127,6 +144,7 @@ def setup_merge(subparsers: Any) -> None:
         default="compact",
     )
     parser.add_argument("files", nargs="+", metavar="FILE")
+    return parser
 
 
 def config(console: Console, args: argparse.Namespace) -> int:
@@ -154,12 +172,17 @@ def config(console: Console, args: argparse.Namespace) -> int:
     return 0
 
 
-def setup_config(subparsers: Any) -> None:
+def setup_config(subparsers):
     parser = subparsers.add_parser(
         "config", help="Configuration and linking information"
     )
     parser.set_defaults(command=config)
-    parser.add_argument("-v", "--version", action="store_true")
+    parser.add_argument(
+        "-v",
+        "--version",
+        action="store_true",
+        help="Return correctionlib current version",
+    )
     parser.add_argument("--incdir", action="store_true")
     parser.add_argument("--cflags", action="store_true")
     parser.add_argument("--libdir", action="store_true")
@@ -168,6 +191,7 @@ def setup_config(subparsers: Any) -> None:
         "--rpath", action="store_true", help="Include library path hint in linker"
     )
     parser.add_argument("--cmake", action="store_true", help="CMake dependency flags")
+    return parser
 
 
 def main() -> int:
@@ -180,21 +204,25 @@ def main() -> int:
     )
     parser.add_argument("--html", type=str, help="Save terminal output to an HTML file")
     subparsers = parser.add_subparsers()
-    setup_validate(subparsers)
-    setup_summary(subparsers)
-    setup_merge(subparsers)
-    setup_config(subparsers)
+    all_commands = []
+    all_commands.append(setup_validate(subparsers))
+    all_commands.append(setup_summary(subparsers))
+    all_commands.append(setup_merge(subparsers))
+    all_commands.append(setup_config(subparsers))
     args = parser.parse_args()
 
     console = Console(width=args.width, record=bool(args.html))
-    # py3.7: subparsers has required=True option
     if hasattr(args, "command"):
         retcode: int = args.command(console, args)
         if args.html:
             console.save_html(args.html)
         return retcode
 
-    parser.parse_args(["-h"])
+    help = parser.format_help() + "\n"
+    help += "Subcommand usage (specify -h for more detail):\n"
+    for command in all_commands:
+        help += command.format_usage()
+    console.out(help, highlight=False)
     return 0
 
 

{correctionlib-2.6.0 → correctionlib-2.6.4}/src/correctionlib/highlevel.py

@@ -234,11 +234,11 @@ class Correction:
         except NotImplementedError:
             if any(str(type(arg)).startswith("<class 'dask_awkward.") for arg in args):
                 return _wrap_dask_awkward(self, *args)  # type: ignore
+            raise
         except (ValueError, TypeError):
             if any(str(type(arg)).startswith("<class 'awkward.") for arg in args):
                 return _wrap_awkward(self._base.evalv, *args)  # type: ignore
-        except Exception as err:
-            raise err
+            raise
 
         if vargs:
             bargs = numpy.broadcast_arrays(*vargs)
@@ -312,11 +312,11 @@ class CompoundCorrection:
         except NotImplementedError:
             if any(str(type(arg)).startswith("<class 'dask_awkward.") for arg in args):
                 return _wrap_dask_awkward(self, *args)  # type: ignore
+            raise
         except (ValueError, TypeError):
             if any(str(type(arg)).startswith("<class 'awkward.") for arg in args):
                 return _wrap_awkward(self._base.evalv, *args)  # type: ignore
-        except Exception as err:
-            raise err
+            raise
 
         if vargs:
             bargs = numpy.broadcast_arrays(*vargs)

{correctionlib-2.6.0 → correctionlib-2.6.4}/src/correctionlib/schemav2.py

@@ -32,6 +32,9 @@ else:
 
 VERSION = 2
 
+# See https://github.com/cms-nanoAOD/correctionlib/issues/255
+IGNORE_FLOAT_INF = False
+
 
 class Model(BaseModel):
     model_config = ConfigDict(extra="forbid")
@@ -199,7 +202,7 @@ def validate_nonuniform_edges(edges: Edges) -> Edges:
         if edge in ("inf", "+inf", "-inf"):
             continue
         if isinstance(edge, float):
-            if not math.isfinite(edge):
+            if not IGNORE_FLOAT_INF and not math.isfinite(edge):
                 raise ValueError(
                     f"Edges array contains non-finite values: {edges}. Replace infinities with 'inf' or '-inf'. NaN is not allowed."
                 )

{correctionlib-2.6.0 → correctionlib-2.6.4}/src/correctionlib/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.6.0'
-__version_tuple__ = version_tuple = (2, 6, 0)
+__version__ = version = '2.6.4'
+__version_tuple__ = version_tuple = (2, 6, 4)

{correctionlib-2.6.0 → correctionlib-2.6.4/src/correctionlib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: correctionlib
-Version: 2.6.0
+Version: 2.6.4
 Summary: A generic correction library
 Home-page: https://github.com/cms-nanoAOD/correctionlib
 Author: Nick Smith

{correctionlib-2.6.0 → correctionlib-2.6.4}/src/formula_ast.cc

@@ -23,7 +23,7 @@ namespace {
         AstPtr peg_ast;
         int pos;
         std::string msg;
-        parser_.log = [&](size_t ln, size_t col, const std::string &themsg) {
+        parser_.log = [&](size_t, size_t col, const std::string &themsg) {
           pos = col;
           msg = themsg;
         };
@@ -241,11 +241,12 @@ double FormulaAst::evaluate(const std::vector<Variable::Type>& values, const std
         case UnaryOp::Acosh: return std::acosh(arg);
         case UnaryOp::Asinh: return std::asinh(arg);
         case UnaryOp::Atanh: return std::atanh(arg);
-      }
+        default: std::abort();
+      };
     }
     case NodeType::Binary: {
-      auto left = children_[0].evaluate(values, params);
-      auto right = children_[1].evaluate(values, params);
+      const auto left = children_[0].evaluate(values, params);
+      const auto right = children_[1].evaluate(values, params);
       switch (std::get<BinaryOp>(data_)) {
         case BinaryOp::Equal: return (left == right) ? 1. : 0.;
         case BinaryOp::NotEqual: return (left != right) ? 1. : 0.;
@@ -261,9 +262,9 @@ double FormulaAst::evaluate(const std::vector<Variable::Type>& values, const std
         case BinaryOp::Atan2: return std::atan2(left, right);
         case BinaryOp::Max: return std::max(left, right);
         case BinaryOp::Min: return std::min(left, right);
+        default: std::abort();
       };
     }
-    default:
-      std::abort(); // never reached if the switch/case is exhaustive
+    default: std::abort(); // never reached if the switch/case is exhaustive
   }
 }

correctionlib-2.6.4/tests/test_binding.py

@@ -0,0 +1,102 @@
+import os
+import shutil
+import subprocess
+import tempfile
+
+import pytest
+
+import correctionlib
+import correctionlib.schemav2 as cs
+
+
+@pytest.fixture(scope="module")
+def csetstr():
+    ptweight = cs.Correction(
+        name="ptweight",
+        version=1,
+        inputs=[
+            cs.Variable(name="pt", type="real", description="Muon transverse momentum")
+        ],
+        output=cs.Variable(
+            name="weight", type="real", description="Multiplicative event weight"
+        ),
+        data=cs.Binning(
+            nodetype="binning",
+            input="pt",
+            edges=[10, 20, 30, 40, 50, 80, 120],
+            content=[1.1, 1.08, 1.06, 1.04, 1.02, 1.0],
+            flow="clamp",
+        ),
+    )
+    cset = cs.CorrectionSet(schema_version=2, corrections=[ptweight])
+    return cset.model_dump_json().replace('"', r"\"")
+
+
+def test_pyroot_binding(csetstr: str):
+    ROOT = pytest.importorskip("ROOT")
+    correctionlib.register_pyroot_binding()
+    assert ROOT.correction.CorrectionSet
+
+    ROOT.gInterpreter.Declare(
+        f'auto cset = correction::CorrectionSet::from_string("{csetstr}");'  # noqa: B907
+    )
+    ROOT.gInterpreter.Declare('auto corr = cset->at("ptweight");')
+    assert ROOT.corr.evaluate([1.2]) == 1.1
+
+
+CMAKELIST_SRC = """\
+cmake_minimum_required(VERSION 3.21 FATAL_ERROR)
+project(test)
+find_package(correctionlib)
+add_executable(test test.cc)
+target_link_libraries(test PRIVATE correctionlib)
+# Because windows has no RPATH, we need to copy the DLLs to the executable directory
+add_custom_command(TARGET test POST_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy -t $<TARGET_FILE_DIR:test> $<TARGET_RUNTIME_DLLS:test>
+  COMMAND_EXPAND_LISTS
+)
+"""
+
+TESTPROG_SRC = """\
+#include "correction.h"
+
+using correction::CorrectionSet;
+
+int main(int argc, char** argv) {
+  auto cset = CorrectionSet::from_string("%s");
+  auto corr = cset->at("ptweight");
+  if (corr->evaluate({1.2}) != 1.1) {
+    return 1;
+  }
+  return 0;
+}
+"""
+
+
+@pytest.mark.skipif(shutil.which("cmake") is None, reason="cmake not found")
+@pytest.mark.skipif(os.name == "nt", reason="there is a segfault I cannot debug")
+def test_cmake_static_compilation(csetstr: str):
+    with tempfile.TemporaryDirectory() as tmpdir:
+        cmake = os.path.join(tmpdir, "CMakeLists.txt")
+        with open(cmake, "w") as f:
+            f.write(CMAKELIST_SRC)
+        testprog = os.path.join(tmpdir, "test.cc")
+        with open(testprog, "w") as f:
+            f.write(TESTPROG_SRC % csetstr)
+        flags = (
+            subprocess.check_output(["correction", "config", "--cmake"])
+            .decode()
+            .split()
+        )
+        ret = subprocess.run(["cmake", "."] + flags, capture_output=True, cwd=tmpdir)
+        if ret.returncode != 0:
+            print(ret.stdout.decode())
+            print(ret.stderr.decode())
+            raise RuntimeError(f"cmake configuration failed (args: {ret.args})")
+        ret = subprocess.run(["cmake", "--build", "."], capture_output=True, cwd=tmpdir)
+        if ret.returncode != 0:
+            print(ret.stdout.decode())
+            print(ret.stderr.decode())
+            raise RuntimeError(f"cmake build failed (args: {ret.args})")
+        prog = r"Debug\test.exe" if os.name == "nt" else "test"
+        subprocess.run([os.path.join(tmpdir, prog)], check=True, cwd=tmpdir)

correctionlib-2.6.0/tests/test_binding.py

@@ -1,36 +0,0 @@
-import pytest
-
-import correctionlib
-import correctionlib.schemav2 as cs
-
-
-def test_pyroot_binding():
-    ROOT = pytest.importorskip("ROOT")
-    correctionlib.register_pyroot_binding()
-    assert ROOT.correction.CorrectionSet
-
-    ptweight = cs.Correction(
-        name="ptweight",
-        version=1,
-        inputs=[
-            cs.Variable(name="pt", type="real", description="Muon transverse momentum")
-        ],
-        output=cs.Variable(
-            name="weight", type="real", description="Multiplicative event weight"
-        ),
-        data=cs.Binning(
-            nodetype="binning",
-            input="pt",
-            edges=[10, 20, 30, 40, 50, 80, 120],
-            content=[1.1, 1.08, 1.06, 1.04, 1.02, 1.0],
-            flow="clamp",
-        ),
-    )
-    cset = cs.CorrectionSet(schema_version=2, corrections=[ptweight])
-    csetstr = cset.model_dump_json().replace('"', r"\"")
-
-    ROOT.gInterpreter.Declare(
-        f'auto cset = correction::CorrectionSet::from_string("{csetstr}");'  # noqa: B907
-    )
-    ROOT.gInterpreter.Declare('auto corr = cset->at("ptweight");')
-    assert ROOT.corr.evaluate([1.2]) == 1.1