PyOpenMagnetics 1.6.1__tar.gz → 1.6.3__tar.gz

{pyopenmagnetics-1.6.1 → pyopenmagnetics-1.6.3}/.github/workflows/publish.yml

@@ -75,7 +75,7 @@ jobs:
         shell: bash
         run: |
           for i in {1..5}; do
-            npm install -g quicktype && break
+            npm install -g quicktype@23.2.6 && break
             if [ $i -lt 5 ]; then
               echo "Retry $i failed, waiting 60s..."
               sleep 60
@@ -120,7 +120,7 @@ jobs:
               source /opt/rh/gcc-toolset-13/enable && \
               curl -fsSL --max-time 10 https://rpm.nodesource.com/setup_18.x | bash - && \
               dnf install -y nodejs && \
-              npm install -g quicktype) && break
+              npm install -g quicktype@23.2.6) && break
               if [ $i -lt 3 ]; then sleep 60; fi
             done
           CIBW_ENVIRONMENT_LINUX: PATH=/opt/rh/gcc-toolset-13/root/usr/bin:$PATH LD_LIBRARY_PATH=/opt/rh/gcc-toolset-13/root/usr/lib64:$LD_LIBRARY_PATH
@@ -192,7 +192,7 @@ jobs:
           node-version: "18"
 
       - name: Install quicktype
-        run: npm install -g quicktype
+        run: npm install -g quicktype@23.2.6
 
       - name: Install cibuildwheel
         run: python -m pip install cibuildwheel==2.21.3
@@ -202,7 +202,7 @@ jobs:
         env:
           CIBW_BUILD: ${{ matrix.python }}-*
           CIBW_SKIP: "*-win32 *-manylinux_i686 *musllinux* pp*"
-          CIBW_BEFORE_ALL_WINDOWS: git config --global url."https://github.com/".insteadOf "git@github.com:" && npm install -g quicktype
+          CIBW_BEFORE_ALL_WINDOWS: git config --global url."https://github.com/".insteadOf "git@github.com:" && npm install -g quicktype@23.2.6
           CIBW_BEFORE_BUILD: pip install --default-timeout=60 --retries 5 scikit-build-core "cmake<4" ninja pybind11
           CIBW_TEST_COMMAND: python -c "import PyOpenMagnetics; print(f'PyOpenMagnetics loaded successfully with {len(dir(PyOpenMagnetics))} functions')"
 
@@ -275,7 +275,7 @@ jobs:
         shell: bash
         run: |
           for i in {1..5}; do
-            npm install -g quicktype && break
+            npm install -g quicktype@23.2.6 && break
             if [ $i -lt 5 ]; then sleep 60; fi
           done
 
@@ -290,7 +290,7 @@ jobs:
           CIBW_BEFORE_ALL_MACOS: |
             git config --global url."https://github.com/".insteadOf "git@github.com:"
             for i in {1..5}; do
-              npm install -g quicktype && break
+              npm install -g quicktype@23.2.6 && break
               if [ $i -lt 5 ]; then sleep 60; fi
             done
           CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET=15.0
@@ -352,7 +352,7 @@ jobs:
         shell: bash
         run: |
           for i in {1..5}; do
-            npm install -g quicktype && break
+            npm install -g quicktype@23.2.6 && break
             if [ $i -lt 5 ]; then
               echo "Retry $i failed, waiting 60s..."
               sleep 60

{pyopenmagnetics-1.6.1 → pyopenmagnetics-1.6.3}/CMakeLists.txt

@@ -142,7 +142,7 @@ if(NOT LOCAL_MKF_MAS)
     set(MKF_GIT_TAG "main"
         CACHE STRING "MKF git ref for the vendored PyOM build")
     # Force fresh clone by using a unique timestamp - update this when the pin changes
-    set(MKF_FORCE_REFRESH "2026-07-03-track-main-kirchhoff")
+    set(MKF_FORCE_REFRESH "2026-07-09-cm-sweep-permeability-poco")
     # Tell MKF to disable matplotplusplus and use SVG-based Painter instead
     set(INCLUDE_PYMKF ON CACHE BOOL "Build Python interface" FORCE)
     # GIT_SUBMODULES_RECURSE pulls in CAS/PEAS (added 2026-04 alongside the
@@ -465,8 +465,13 @@ set(KIRCHHOFF_BUILD_DIR "${CMAKE_BINARY_DIR}/kirchhoff-build")
 # import library (.lib, IMPORTED_IMPLIB) with the .dll as the runtime (IMPORTED_LOCATION);
 # Linux/macOS link the .so/.dylib directly.
 if(WIN32)
-    set(KIRCHHOFF_API_LIB "${KIRCHHOFF_BUILD_DIR}/KirchhoffApi.dll")
-    set(KIRCHHOFF_API_IMPLIB "${KIRCHHOFF_BUILD_DIR}/KirchhoffApi.lib")
+    # The Visual Studio generator is multi-config: it emits build artifacts into a per-config
+    # subdirectory (Release/), so the KirchhoffApi DLL + import lib land in kirchhoff-build/Release/,
+    # NOT kirchhoff-build/ directly. The wheel build is always Release (CMAKE_BUILD_TYPE=Release and
+    # the ExternalProject BUILD_COMMAND uses --config Release), so point at that subdir; otherwise the
+    # extension link fails with LNK1181: cannot open input file 'KirchhoffApi.lib'.
+    set(KIRCHHOFF_API_LIB "${KIRCHHOFF_BUILD_DIR}/Release/KirchhoffApi.dll")
+    set(KIRCHHOFF_API_IMPLIB "${KIRCHHOFF_BUILD_DIR}/Release/KirchhoffApi.lib")
 elseif(APPLE)
     set(KIRCHHOFF_API_LIB "${KIRCHHOFF_BUILD_DIR}/libKirchhoffApi.dylib")
 else()
@@ -484,6 +489,27 @@ else()
                        GIT_TAG "${KIRCHHOFF_GIT_TAG}")
     set(_kirchhoff_hdr_dir "${CMAKE_BINARY_DIR}/kirchhoff-ext-prefix/src/kirchhoff_ext/src")
 endif()
+# Kelvin — KH's shared TAS component selector. Since ~mid-2026 KH requires it
+# (add_subdirectory(KELVIN_DIR)) but it is NOT a KH submodule, so the source must be
+# supplied or KH fails to configure ("../Kelvin is not an existing directory"). KH
+# builds it in-tree reusing its own PEAS, so only the checkout is needed. Mirrors
+# MKF/CMakeLists.txt's KIRCHHOFF_KELVIN_DIR wiring. HTTPS for the same manylinux
+# reason as the Kirchhoff clone above.
+set(KIRCHHOFF_KELVIN_DIR "" CACHE PATH "Local Kelvin checkout for the Kirchhoff build (empty = fetch)")
+if(NOT KIRCHHOFF_KELVIN_DIR)
+    set(KIRCHHOFF_KELVIN_GIT_TAG "main" CACHE STRING "Kelvin git tag/branch (when fetched for Kirchhoff)")
+    FetchContent_Declare(kirchhoff_kelvin
+        GIT_REPOSITORY "https://github.com/OpenConverters/Kelvin.git"
+        GIT_TAG "${KIRCHHOFF_KELVIN_GIT_TAG}"
+        GIT_SUBMODULES ""   # KH overrides KELVIN_PEAS_DIR to its own PEAS; Kelvin's own submodules are unused
+        SOURCE_DIR "${CMAKE_BINARY_DIR}/kirchhoff-kelvin-src")
+    # Download only — KH does the add_subdirectory(KELVIN_DIR) in its own context.
+    FetchContent_GetProperties(kirchhoff_kelvin)
+    if(NOT kirchhoff_kelvin_POPULATED)
+        FetchContent_Populate(kirchhoff_kelvin)
+    endif()
+    set(KIRCHHOFF_KELVIN_DIR "${kirchhoff_kelvin_SOURCE_DIR}")
+endif()
 ExternalProject_Add(kirchhoff_ext
     ${_kirchhoff_src}
     PREFIX "${CMAKE_BINARY_DIR}/kirchhoff-ext-prefix"
@@ -493,6 +519,12 @@ ExternalProject_Add(kirchhoff_ext
         -DKIRCHHOFF_BUILD_SHARED_API=ON   # emit libKirchhoffApi.so (string facade, hidden internals)
         -DKIRCHHOFF_BUILD_PYBIND=OFF
         -DENABLE_NGSPICE=ON               # KH carries the simulator MKF stopped building
+        -DKELVIN_DIR=${KIRCHHOFF_KELVIN_DIR}  # Kelvin source (fetched above or a local checkout)
+    # Build ONLY the KirchhoffApi shared lib (+ its dependency chain), not Kirchhoff's standalone
+    # test/example executables. The wheel needs only the facade lib, and those demos/tests use POSIX
+    # popen/pclose (MSVC-only _popen/_pclose) that break the Windows build — and compiling 25+ binaries
+    # per Python version is pure waste. src/ (the library) is clean of popen.
+    BUILD_COMMAND "${CMAKE_COMMAND}" --build <BINARY_DIR> --config Release --target KirchhoffApi
     BUILD_ALWAYS OFF
     INSTALL_COMMAND ""
     BUILD_BYPRODUCTS "${KIRCHHOFF_API_LIB}" "${KIRCHHOFF_API_IMPLIB}")

{pyopenmagnetics-1.6.1 → pyopenmagnetics-1.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PyOpenMagnetics
-Version: 1.6.1
+Version: 1.6.3
 Summary: Python wrapper for OpenMagnetics
 Author-Email: Alfonso Martinez <Alfonso_VII@hotmail.com>
 Classifier: Development Status :: 4 - Beta

{pyopenmagnetics-1.6.1 → pyopenmagnetics-1.6.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "PyOpenMagnetics"
-version = "1.6.1"
+version = "1.6.3"
 requires-python = ">=3.8"
 authors = [
   { name="Alfonso Martinez", email="Alfonso_VII@hotmail.com" },
@@ -27,7 +27,7 @@ Contact = "https://www.linkedin.com/in/alfonso-martinez-de-la-torre/"
 
 [tool.scikit-build]
 build-dir = "build/{wheel_tag}"
-cmake.verbose = true
+build.verbose = true
 sdist.exclude = [".venv*", ".venv*/**", "build", "build/**", "dist", "dist/**", "*.egg-info", "__pycache__", "*.pyc"]
 # Include additional files in the wheel
 wheel.packages = ["."]
@@ -60,7 +60,7 @@ before-all = [
   "dnf -y module enable nodejs:20",
   "dnf -y install nodejs npm",
   "npm --version",
-  "npm install -g quicktype@23.0.170"
+  "npm install -g quicktype@23.2.6"
 ]
 # Parallel level 2 (not 3): two large pybind11 TUs compiling at once stays
 # within the runner's RAM. Combined with dropping -g (see CMakeLists.txt),
@@ -68,11 +68,11 @@ before-all = [
 environment = { GIT_LFS_SKIP_SMUDGE=1, CMAKE_BUILD_PARALLEL_LEVEL="2" }
 
 [tool.cibuildwheel.macos]
-before-all = "npm --version && npm install -g quicktype@23.0.170"
+before-all = "npm --version && npm install -g quicktype@23.2.6"
 environment = { MACOSX_DEPLOYMENT_TARGET="14.0", GIT_LFS_SKIP_SMUDGE=1, CMAKE_BUILD_PARALLEL_LEVEL="3" }
 
 [tool.cibuildwheel.windows]
-before-all = "rmdir /S /Q build && npm --version && npm install -g quicktype@23.0.170"
+before-all = "rmdir /S /Q build && npm --version && npm install -g quicktype@23.2.6"
 archs = ["AMD64"]
 
 environment = { GIT_LFS_SKIP_SMUDGE=1, CMAKE_BUILD_PARALLEL_LEVEL="2" }

{pyopenmagnetics-1.6.1 → pyopenmagnetics-1.6.3}/src/common.h

@@ -34,7 +34,6 @@
 #include "processors/Inputs.h"
 #include "processors/MagneticSimulator.h"
 #include "processors/CircuitSimulatorInterface.h"
-#include "processors/NgspiceRunner.h"
 #include "processors/Sweeper.h"
 #include "support/Painter.h"
 #include "support/Utils.h"

{pyopenmagnetics-1.6.1 → pyopenmagnetics-1.6.3}/src/simulation.cpp

@@ -325,6 +325,21 @@ json sweep_impedance_over_frequency(json magneticJson, double start, double stop
     }
 }
 
+json sweep_common_mode_impedance_over_frequency(json magneticJson, double start, double stop, size_t numberElements, std::string mode, std::string title) {
+    try {
+        OpenMagnetics::Magnetic magnetic(magneticJson);
+        auto result = OpenMagnetics::Sweeper::sweep_common_mode_impedance_over_frequency(magnetic, start, stop, numberElements, mode, title);
+        json resultJson;
+        to_json(resultJson, result);
+        return resultJson;
+    }
+    catch (const std::exception &exc) {
+        json exception;
+        exception["data"] = "Exception: " + std::string{exc.what()};
+        return exception;
+    }
+}
+
 json sweep_differential_mode_impedance_over_frequency(json magneticJson, double start, double stop, size_t numberElements, std::string mode, std::string title) {
     try {
         OpenMagnetics::Magnetic magnetic(magneticJson);
@@ -809,6 +824,15 @@ void register_simulation_bindings(py::module& m) {
         py::arg("title"),
         "Sweep impedance over a frequency range.");
 
+    m.def("sweep_common_mode_impedance_over_frequency", &sweep_common_mode_impedance_over_frequency,
+        py::arg("magnetic_json"),
+        py::arg("start"),
+        py::arg("stop"),
+        py::arg("number_elements"),
+        py::arg("mode"),
+        py::arg("title"),
+        "Sweep common-mode impedance (all windings driven in parallel — the CMC datasheet CM measurement; magnetizing tank only, no leakage resonance) over a frequency range.");
+
     m.def("sweep_differential_mode_impedance_over_frequency", &sweep_differential_mode_impedance_over_frequency,
         py::arg("magnetic_json"),
         py::arg("start"),