PyOpenMagnetics 1.6.0__tar.gz → 1.6.2__tar.gz

{pyopenmagnetics-1.6.0 → pyopenmagnetics-1.6.2}/.github/workflows/publish.yml

@@ -114,6 +114,7 @@ jobs:
           CIBW_SKIP: "*-win32 *-manylinux_i686 *musllinux* pp*"
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28
           CIBW_BEFORE_ALL_LINUX: |
+            git config --global url."https://github.com/".insteadOf "git@github.com:"
             for i in {1..3}; do
               (dnf install -y gcc-toolset-13 eigen3-devel && \
               source /opt/rh/gcc-toolset-13/enable && \
@@ -131,6 +132,7 @@ jobs:
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           password: ${{ secrets.PYPI_API_TOKEN }}
+          skip-existing: true
           packages-dir: wheelhouse/
 
       - name: Publish Linux wheels to TestPyPI
@@ -139,6 +141,7 @@ jobs:
         with:
           repository-url: https://test.pypi.org/legacy/
           password: ${{ secrets.TEST_PYPI_API_TOKEN }}
+          skip-existing: true
           packages-dir: wheelhouse/
 
   # Build and publish Windows wheels independently
@@ -199,7 +202,7 @@ jobs:
         env:
           CIBW_BUILD: ${{ matrix.python }}-*
           CIBW_SKIP: "*-win32 *-manylinux_i686 *musllinux* pp*"
-          CIBW_BEFORE_ALL_WINDOWS: npm install -g quicktype
+          CIBW_BEFORE_ALL_WINDOWS: git config --global url."https://github.com/".insteadOf "git@github.com:" && npm install -g quicktype
           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')"
 
@@ -208,14 +211,14 @@ jobs:
 
       - name: Publish Windows wheels to PyPI
         if: github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && inputs.publish_to_pypi)
-        run: python -m twine upload wheelhouse/*.whl
+        run: python -m twine upload --skip-existing wheelhouse/*.whl
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
 
       - name: Publish Windows wheels to TestPyPI
         if: github.event_name == 'workflow_dispatch' && !inputs.publish_to_pypi
-        run: python -m twine upload --repository-url https://test.pypi.org/legacy/ wheelhouse/*.whl
+        run: python -m twine upload --skip-existing --repository-url https://test.pypi.org/legacy/ wheelhouse/*.whl
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.TEST_PYPI_API_TOKEN }}
@@ -285,6 +288,7 @@ jobs:
           CIBW_BUILD: ${{ matrix.python }}-*
           CIBW_SKIP: "*-win32 *-manylinux_i686 *musllinux* pp*"
           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
               if [ $i -lt 5 ]; then sleep 60; fi
@@ -298,14 +302,14 @@ jobs:
 
       - name: Publish macOS wheels to PyPI
         if: github.event_name == 'release' || (github.event_name == 'workflow_dispatch' && inputs.publish_to_pypi)
-        run: python -m twine upload wheelhouse/*.whl
+        run: python -m twine upload --skip-existing wheelhouse/*.whl
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
 
       - name: Publish macOS wheels to TestPyPI
         if: github.event_name == 'workflow_dispatch' && !inputs.publish_to_pypi
-        run: python -m twine upload --repository-url https://test.pypi.org/legacy/ wheelhouse/*.whl
+        run: python -m twine upload --skip-existing --repository-url https://test.pypi.org/legacy/ wheelhouse/*.whl
         env:
           TWINE_USERNAME: __token__
           TWINE_PASSWORD: ${{ secrets.TEST_PYPI_API_TOKEN }}
@@ -366,6 +370,7 @@ jobs:
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           password: ${{ secrets.PYPI_API_TOKEN }}
+          skip-existing: true
           packages-dir: dist/
 
       - name: Publish sdist to TestPyPI
@@ -374,4 +379,5 @@ jobs:
         with:
           repository-url: https://test.pypi.org/legacy/
           password: ${{ secrets.TEST_PYPI_API_TOKEN }}
+          skip-existing: true
           packages-dir: dist/

{pyopenmagnetics-1.6.0 → pyopenmagnetics-1.6.2}/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
@@ -344,6 +344,9 @@ add_custom_command(
   COMMAND ${CMAKE_COMMAND} -E remove -f "${CAS_DIRECTORY}/CAS.hpp"
   COMMAND quicktype -l c++ -s schema ${CAS_DIR}/schemas/inputs.json
     -S ${CAS_DIR}/schemas/inputs/designRequirements.json
+    # designRequirements.allowedTechnologies $refs ../capacitor.json#/$defs/technology; feed it as a
+    # source so Windows quicktype resolves it by $id (relative file-URI resolution fails on Windows).
+    -S ${CAS_DIR}/schemas/capacitor.json
     -S ${PEAS_DIR}/schemas/utils.json
     -S ${PEAS_DIR}/schemas/inputs/twoTerminalOperatingPoint.json
     -S ${PEAS_DIR}/schemas/inputs/operatingConditions.json
@@ -458,15 +461,55 @@ include(ExternalProject)
 set(KIRCHHOFF_GIT_TAG "main" CACHE STRING "Kirchhoff git tag/branch to build (when fetching from GitHub)")
 set(KIRCHHOFF_SOURCE_DIR "" CACHE PATH "Local Kirchhoff working tree (leave empty to fetch from GitHub)")
 set(KIRCHHOFF_BUILD_DIR "${CMAKE_BINARY_DIR}/kirchhoff-build")
-set(KIRCHHOFF_API_LIB "${KIRCHHOFF_BUILD_DIR}/libKirchhoffApi.so")
+# Platform-specific shared-lib artifact names. On Windows a shared library links against an
+# import library (.lib, IMPORTED_IMPLIB) with the .dll as the runtime (IMPORTED_LOCATION);
+# Linux/macOS link the .so/.dylib directly.
+if(WIN32)
+    # 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()
+    set(KIRCHHOFF_API_LIB "${KIRCHHOFF_BUILD_DIR}/libKirchhoffApi.so")
+endif()
 if(KIRCHHOFF_SOURCE_DIR)
     set(_kirchhoff_src SOURCE_DIR "${KIRCHHOFF_SOURCE_DIR}")
     set(_kirchhoff_hdr_dir "${KIRCHHOFF_SOURCE_DIR}/src")
 else()
-    set(_kirchhoff_src GIT_REPOSITORY "git@github.com:OpenConverters/Kirchhoff.git"
+    # HTTPS (not SSH): the manylinux wheel containers have no ssh binary. Kirchhoff and its PSMA
+    # submodules are public, so anonymous HTTPS clones them fine. The submodule URLs in Kirchhoff's
+    # own .gitmodules are SSH, so CI additionally sets url."https://github.com/".insteadOf in
+    # CIBW_BEFORE_ALL (publish.yml) to rewrite those during the recursive clone.
+    set(_kirchhoff_src GIT_REPOSITORY "https://github.com/OpenConverters/Kirchhoff.git"
                        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"
@@ -476,16 +519,36 @@ 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}")
+    BUILD_BYPRODUCTS "${KIRCHHOFF_API_LIB}" "${KIRCHHOFF_API_IMPLIB}")
 include_directories("${_kirchhoff_hdr_dir}")
 add_library(KirchhoffApi SHARED IMPORTED)
 set_target_properties(KirchhoffApi PROPERTIES IMPORTED_LOCATION "${KIRCHHOFF_API_LIB}")
+if(WIN32)
+    set_target_properties(KirchhoffApi PROPERTIES IMPORTED_IMPLIB "${KIRCHHOFF_API_IMPLIB}")
+endif()
 add_dependencies(KirchhoffApi kirchhoff_ext)
 target_link_libraries(PyOpenMagnetics PRIVATE KirchhoffApi)
 add_dependencies(PyOpenMagnetics kirchhoff_ext)
 
+# Ship libKirchhoffApi next to the extension in the wheel and point the extension's RPATH at
+# itself, so (1) the co-built shared lib resolves at runtime and (2) the wheel-repair tools
+# (auditwheel / delocate / delvewheel) can LOCATE and vendor it — otherwise auditwheel fails with
+# "required library libKirchhoffApi.so could not be located" even though the build linked fine.
+if(APPLE)
+    set_target_properties(PyOpenMagnetics PROPERTIES INSTALL_RPATH "@loader_path" BUILD_WITH_INSTALL_RPATH TRUE)
+elseif(NOT WIN32)
+    set_target_properties(PyOpenMagnetics PROPERTIES INSTALL_RPATH "$ORIGIN" BUILD_WITH_INSTALL_RPATH TRUE)
+endif()
+install(FILES "${KIRCHHOFF_API_LIB}" DESTINATION .)
+
 # target_link_libraries(PyOpenMagnetics PUBLIC MKF)
 
 

{pyopenmagnetics-1.6.0 → pyopenmagnetics-1.6.2}/PKG-INFO

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

{pyopenmagnetics-1.6.0 → pyopenmagnetics-1.6.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "PyOpenMagnetics"
-version = "1.6.0"
+version = "1.6.2"
 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 = ["."]

{pyopenmagnetics-1.6.0 → pyopenmagnetics-1.6.2}/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.0 → pyopenmagnetics-1.6.2}/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"),