PyOpenMagnetics 1.3.5__tar.gz → 1.3.7__tar.gz

{pyopenmagnetics-1.3.5 → pyopenmagnetics-1.3.7}/.github/workflows/publish.yml

@@ -184,20 +184,22 @@ jobs:
           CIBW_BEFORE_BUILD: pip install --default-timeout=60 --retries 5 scikit-build-core cmake ninja pybind11
           CIBW_TEST_COMMAND: python -c "import PyOpenMagnetics; print(f'PyOpenMagnetics loaded successfully with {len(dir(PyOpenMagnetics))} functions')"
 
+      - name: Install twine
+        run: python -m pip install twine
+
       - name: Publish Windows wheels to PyPI
         if: github.event_name == 'release'
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages-dir: wheelhouse/
+        run: python -m twine upload wheelhouse/*.whl
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
 
       - name: Publish Windows wheels to TestPyPI
         if: github.event_name == 'workflow_dispatch'
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          repository-url: https://test.pypi.org/legacy/
-          password: ${{ secrets.TEST_PYPI_API_TOKEN }}
-          packages-dir: wheelhouse/
+        run: python -m twine upload --repository-url https://test.pypi.org/legacy/ wheelhouse/*.whl
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.TEST_PYPI_API_TOKEN }}
 
   # Build and publish macOS wheels independently
   build_and_publish_macos:
@@ -267,20 +269,22 @@ jobs:
           CIBW_BEFORE_BUILD: pip install --default-timeout=60 --retries 5 scikit-build-core cmake ninja pybind11
           CIBW_TEST_COMMAND: python -c "import PyOpenMagnetics; print(f'PyOpenMagnetics loaded successfully with {len(dir(PyOpenMagnetics))} functions')"
 
+      - name: Install twine
+        run: python -m pip install twine
+
       - name: Publish macOS wheels to PyPI
         if: github.event_name == 'release'
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          password: ${{ secrets.PYPI_API_TOKEN }}
-          packages-dir: wheelhouse/
+        run: python -m twine upload wheelhouse/*.whl
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
 
       - name: Publish macOS wheels to TestPyPI
         if: github.event_name == 'workflow_dispatch'
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          repository-url: https://test.pypi.org/legacy/
-          password: ${{ secrets.TEST_PYPI_API_TOKEN }}
-          packages-dir: wheelhouse/
+        run: python -m twine upload --repository-url https://test.pypi.org/legacy/ wheelhouse/*.whl
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.TEST_PYPI_API_TOKEN }}
 
   # Build and publish source distribution independently
   build_and_publish_sdist:

{pyopenmagnetics-1.3.5 → pyopenmagnetics-1.3.7}/CMakeLists.txt

@@ -29,7 +29,7 @@ else ()
     set(CMAKE_BUILD_TYPE Release)
     
     # Enable Link Time Optimization to reduce binary size
-    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION FALSE)  # TEMP: disable LTO (OOM)
     
     # Strip symbols and use size optimization
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s -Os")
@@ -37,8 +37,15 @@ else ()
 endif()
 
 SET(MAS_DIRECTORY "${CMAKE_BINARY_DIR}/MAS/")
-SET(MAS_DIR "${CMAKE_BINARY_DIR}/_deps/mas-src")
-SET(MKF_DIR "${CMAKE_BINARY_DIR}/_deps/mkf-src")
+if(DEFINED ENV{LOCAL_MKF_DIR})
+    SET(LOCAL_MKF_MAS TRUE)
+    SET(MAS_DIR "${PROJECT_SOURCE_DIR}/_mas_local")
+    SET(MKF_DIR "${PROJECT_SOURCE_DIR}/_mkf_local")
+else()
+    SET(LOCAL_MKF_MAS FALSE)
+    SET(MAS_DIR "${CMAKE_BINARY_DIR}/_deps/mas-src")
+    SET(MKF_DIR "${CMAKE_BINARY_DIR}/_deps/mkf-src")
+endif()
 SET(FETCHCONTENT_QUIET FALSE)
 
 message(STATUS MAS_DIRECTORY)
@@ -110,63 +117,68 @@ FetchContent_Declare(eigen
 FetchContent_MakeAvailable(eigen)
 include_directories("${CMAKE_BINARY_DIR}/_deps/eigen-src")
 
-message(STATUS "Fetching MKF")
-# Force fresh clone by using a unique timestamp - update this when MKF changes
-set(MKF_FORCE_REFRESH "2025-02-26-01")
-# Tell MKF to disable matplotplusplus and use SVG-based Painter instead
-set(INCLUDE_PYMKF ON CACHE BOOL "Build Python interface" FORCE)
-FetchContent_Declare(MKF
-        GIT_REPOSITORY https://github.com/OpenMagnetics/MKF.git
-        GIT_TAG main
-        GIT_PROGRESS TRUE
-        GIT_SHALLOW TRUE)
-
-message(STATUS "Fetching mas")
-# Skip Git LFS to avoid bandwidth quota issues - data files are optional for build
-set(ENV{GIT_LFS_SKIP_SMUDGE} "1")
-# Force fresh clone by using a unique timestamp - update this when MAS changes
-set(MAS_FORCE_REFRESH "2025-02-26-01")
-FetchContent_Declare(
-       mas
-       GIT_REPOSITORY https://github.com/OpenMagnetics/MAS.git
-       GIT_TAG main
-       GIT_SHALLOW TRUE)
-
-message(STATUS "Fetching Properties mas")
-FetchContent_GetProperties(mas)
-message(STATUS "Fetching Properties MKF")
-FetchContent_GetProperties(MKF)
-message(STATUS "MAS_POPULATED: ${MAS_POPULATED}")
-message(STATUS "MKF_POPULATED: ${MKF_POPULATED}")
-
-# Always delete and repopulate MAS to ensure we get the latest
-if(EXISTS ${CMAKE_BINARY_DIR}/_deps/mas-src)
-    message(STATUS "Removing old MAS source to force fresh clone")
-    file(REMOVE_RECURSE ${CMAKE_BINARY_DIR}/_deps/mas-src)
-endif()
-message(STATUS "Populating MAS")
-FetchContent_Populate(mas)
-# Show git log to verify version
-execute_process(
-    COMMAND git -C ${mas_SOURCE_DIR} log --oneline -1
-    OUTPUT_VARIABLE MAS_GIT_LOG
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-    ERROR_VARIABLE MAS_GIT_ERROR
-)
-message(STATUS "MAS version: ${MAS_GIT_LOG}")
-if(MAS_GIT_ERROR)
-    message(STATUS "MAS git error: ${MAS_GIT_ERROR}")
-endif()
-
-if(NOT MKF_POPULATED)
-    message(STATUS "Populating MKF")
-    FetchContent_Populate(MKF)
+if(NOT LOCAL_MKF_MAS)
+    message(STATUS "Fetching MKF")
+    # Force fresh clone by using a unique timestamp - update this when MKF changes
+    set(MKF_FORCE_REFRESH "2025-02-26-01")
+    # Tell MKF to disable matplotplusplus and use SVG-based Painter instead
+    set(INCLUDE_PYMKF ON CACHE BOOL "Build Python interface" FORCE)
+    FetchContent_Declare(MKF
+            GIT_REPOSITORY https://github.com/OpenMagnetics/MKF.git
+            GIT_TAG main
+            GIT_PROGRESS TRUE
+            GIT_SHALLOW TRUE)
+
+    message(STATUS "Fetching mas")
+    # Skip Git LFS to avoid bandwidth quota issues - data files are optional for build
+    set(ENV{GIT_LFS_SKIP_SMUDGE} "1")
+    # Force fresh clone by using a unique timestamp - update this when MAS changes
+    set(MAS_FORCE_REFRESH "2025-02-26-01")
+    FetchContent_Declare(
+           mas
+           GIT_REPOSITORY https://github.com/OpenMagnetics/MAS.git
+           GIT_TAG main
+           GIT_SHALLOW TRUE)
+
+    message(STATUS "Fetching Properties mas")
+    FetchContent_GetProperties(mas)
+    message(STATUS "Fetching Properties MKF")
+    FetchContent_GetProperties(MKF)
+    message(STATUS "MAS_POPULATED: ${MAS_POPULATED}")
+    message(STATUS "MKF_POPULATED: ${MKF_POPULATED}")
+
+    # Always delete and repopulate MAS to ensure we get the latest
+    if(EXISTS ${CMAKE_BINARY_DIR}/_deps/mas-src)
+        message(STATUS "Removing old MAS source to force fresh clone")
+        file(REMOVE_RECURSE ${CMAKE_BINARY_DIR}/_deps/mas-src)
+    endif()
+    message(STATUS "Populating MAS")
+    FetchContent_Populate(mas)
+    # Show git log to verify version
+    execute_process(
+        COMMAND git -C ${mas_SOURCE_DIR} log --oneline -1
+        OUTPUT_VARIABLE MAS_GIT_LOG
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        ERROR_VARIABLE MAS_GIT_ERROR
+    )
+    message(STATUS "MAS version: ${MAS_GIT_LOG}")
+    if(MAS_GIT_ERROR)
+        message(STATUS "MAS git error: ${MAS_GIT_ERROR}")
+    endif()
+
+    if(NOT MKF_POPULATED)
+        message(STATUS "Populating MKF")
+        FetchContent_Populate(MKF)
+    else()
+        message(STATUS "MKF already populated at: ${MKF_SOURCE_DIR}")
+    endif()
+
+    message(STATUS ${MAS_SOURCE_DIR})
 else()
-    message(STATUS "MKF already populated at: ${MKF_SOURCE_DIR}")
+    message(STATUS "Using local MKF at ${MKF_DIR}")
+    message(STATUS "Using local MAS at ${MAS_DIR}")
 endif()
 
-message(STATUS ${MAS_SOURCE_DIR})
-
 message(STATUS "Compiling MAS")
 
 
@@ -226,14 +238,14 @@ add_custom_target(PyMASGeneration
                   DEPENDS "${MAS_DIRECTORY}/MAS.hpp")
 
 message(STATUS "Compiling PyOpenMagnetics with modular structure")
-file(GLOB SOURCES src/*.cpp 
-    ${CMAKE_BINARY_DIR}/_deps/mkf-src/src/*.cpp
-    ${CMAKE_BINARY_DIR}/_deps/mkf-src/src/advisers/*.cpp
-    ${CMAKE_BINARY_DIR}/_deps/mkf-src/src/constructive_models/*.cpp
-    ${CMAKE_BINARY_DIR}/_deps/mkf-src/src/converter_models/*.cpp
-    ${CMAKE_BINARY_DIR}/_deps/mkf-src/src/physical_models/*.cpp
-    ${CMAKE_BINARY_DIR}/_deps/mkf-src/src/processors/*.cpp
-    ${CMAKE_BINARY_DIR}/_deps/mkf-src/src/support/*.cpp
+file(GLOB SOURCES src/*.cpp
+    ${MKF_DIR}/src/*.cpp
+    ${MKF_DIR}/src/advisers/*.cpp
+    ${MKF_DIR}/src/constructive_models/*.cpp
+    ${MKF_DIR}/src/converter_models/*.cpp
+    ${MKF_DIR}/src/physical_models/*.cpp
+    ${MKF_DIR}/src/processors/*.cpp
+    ${MKF_DIR}/src/support/*.cpp
     )
 message(STATUS SOURCES)
 message(STATUS ${SOURCES})
@@ -247,7 +259,7 @@ file(DOWNLOAD "https://raw.githubusercontent.com/vector-of-bool/cmrc/master/CMak
                  "${CMAKE_BINARY_DIR}/CMakeRC.cmake")
 include("${CMAKE_BINARY_DIR}/CMakeRC.cmake")
 
-include_directories("${CMAKE_BINARY_DIR}/_deps/mkf-src/")
+include_directories("${MKF_DIR}/")
 
 cmrc_add_resource_library(insulation_standards ALIAS data::insulation_standards NAMESPACE insulationData WHENCE ${MKF_DIR}/ ${MKF_DIR}/src/data/insulation_standards/IEC_60664-1.json ${MKF_DIR}/src/data/insulation_standards/IEC_60664-4.json ${MKF_DIR}/src/data/insulation_standards/IEC_60664-5.json ${MKF_DIR}/src/data/insulation_standards/IEC_62368-1.json ${MKF_DIR}/src/data/insulation_standards/IEC_61558-1.json ${MKF_DIR}/src/data/insulation_standards/IEC_61558-2-16.json ${MKF_DIR}/src/data/insulation_standards/IEC_60335-1.json)
 target_link_libraries(PyOpenMagnetics PUBLIC data::insulation_standards)
@@ -276,13 +288,13 @@ include_directories("${CMAKE_BINARY_DIR}/_deps/magic-enum-src/include")
 include_directories("${CMAKE_BINARY_DIR}/_deps/svg-src/src")
 include_directories("${CMAKE_BINARY_DIR}/_deps/spline-src/src")
 include_directories("${CMAKE_BINARY_DIR}/_deps/json-src/include/")
-include_directories("${CMAKE_BINARY_DIR}/_deps/mkf-src/src/")
-include_directories("${CMAKE_BINARY_DIR}/_deps/mkf-src/src/advisers/")
-include_directories("${CMAKE_BINARY_DIR}/_deps/mkf-src/src/constructive_models/")
-include_directories("${CMAKE_BINARY_DIR}/_deps/mkf-src/src/converter_models/")
-include_directories("${CMAKE_BINARY_DIR}/_deps/mkf-src/src/physical_models/")
-include_directories("${CMAKE_BINARY_DIR}/_deps/mkf-src/src/processors/")
-include_directories("${CMAKE_BINARY_DIR}/_deps/mkf-src/src/support/")
+include_directories("${MKF_DIR}/src/")
+include_directories("${MKF_DIR}/src/advisers/")
+include_directories("${MKF_DIR}/src/constructive_models/")
+include_directories("${MKF_DIR}/src/converter_models/")
+include_directories("${MKF_DIR}/src/physical_models/")
+include_directories("${MKF_DIR}/src/processors/")
+include_directories("${MKF_DIR}/src/support/")
 include_directories("${CMAKE_BINARY_DIR}/_deps/eigen-src")
 include_directories("${CMAKE_BINARY_DIR}/_cmrc/include")
 include_directories("${MAS_DIRECTORY}")

{pyopenmagnetics-1.3.5 → pyopenmagnetics-1.3.7}/PKG-INFO

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

{pyopenmagnetics-1.3.5 → pyopenmagnetics-1.3.7}/examples/converter_design_example.py

@@ -169,8 +169,8 @@ def design_buck_with_converter_method():
         "desiredInductance": 4.7e-6,  # 4.7 µH
         "currentRippleRatio": 0.3,
         "operatingPoints": [{
-            "outputVoltage": 3.3,
-            "outputCurrent": 5.0,
+            "outputVoltages": [3.3],
+            "outputCurrents": [5.0],
             "switchingFrequency": 500000,  # 500 kHz
             "ambientTemperature": 25
         }]

{pyopenmagnetics-1.3.5 → pyopenmagnetics-1.3.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"
 
 [project]
 name = "PyOpenMagnetics"
-version = "1.3.5"
+version = "1.3.7"
 requires-python = ">=3.8"
 authors = [
   { name="Alfonso Martinez", email="Alfonso_VII@hotmail.com" },

{pyopenmagnetics-1.3.5 → pyopenmagnetics-1.3.7}/src/bobbin.cpp

@@ -3,83 +3,48 @@
 namespace PyMKF {
 
 json get_bobbins() {
-    try {
-        auto bobbins = OpenMagnetics::get_bobbins();
-        json result = json::array();
-        for (auto elem : bobbins) {
-            json aux;
-            to_json(aux, elem);
-            result.push_back(aux);
-        }
-        return result;
-    }
-    catch (const std::exception &exc) {
-        json exception;
-        exception["data"] = "Exception: " + std::string{exc.what()};
-        return exception;
-    }
+    auto bobbins = OpenMagnetics::get_bobbins();
+    json result = json::array();
+    for (auto elem : bobbins) {
+        json aux;
+        to_json(aux, elem);
+        result.push_back(aux);
+    }
+    return result;
 }
 
 json get_bobbin_names() {
-    try {
-        auto bobbinNames = OpenMagnetics::get_bobbin_names();
-        json result = json::array();
-        for (auto elem : bobbinNames) {
-            result.push_back(elem);
-        }
-        return result;
-    }
-    catch (const std::exception &exc) {
-        json exception;
-        exception["data"] = "Exception: " + std::string{exc.what()};
-        return exception;
+    auto bobbinNames = OpenMagnetics::get_bobbin_names();
+    json result = json::array();
+    for (auto elem : bobbinNames) {
+        result.push_back(elem);
     }
+    return result;
 }
 
 json find_bobbin_by_name(json bobbinName) {
-    try {
-        auto bobbinData = OpenMagnetics::find_bobbin_by_name(bobbinName);
-        json result;
-        to_json(result, bobbinData);
-        return result;
-    }
-    catch (const std::exception &exc) {
-        json exception;
-        exception["data"] = "Exception: " + std::string{exc.what()};
-        return exception;
-    }
+    auto bobbinData = OpenMagnetics::find_bobbin_by_name(bobbinName);
+    json result;
+    to_json(result, bobbinData);
+    return result;
 }
 
 json create_basic_bobbin(json coreDataJson, bool nullDimensions) {
-    try {
-        OpenMagnetics::Core core(coreDataJson, false, false, false);
-        auto bobbin = OpenMagnetics::Bobbin::create_quick_bobbin(core, nullDimensions);
+    OpenMagnetics::Core core(coreDataJson, false, false, false);
+    auto bobbin = OpenMagnetics::Bobbin::create_quick_bobbin(core, nullDimensions);
 
-        json result;
-        to_json(result, bobbin);
-        return result;
-    }
-    catch (const std::exception &exc) {
-        json exception;
-        exception["data"] = "Exception: " + std::string{exc.what()};
-        return exception;
-    }
+    json result;
+    to_json(result, bobbin);
+    return result;
 }
 
 json create_basic_bobbin_by_thickness(json coreDataJson, double thickness) {
-    try {
-        OpenMagnetics::Core core(coreDataJson, false, false, false);
-        auto bobbin = OpenMagnetics::Bobbin::create_quick_bobbin(core, thickness);
+    OpenMagnetics::Core core(coreDataJson, false, false, false);
+    auto bobbin = OpenMagnetics::Bobbin::create_quick_bobbin(core, thickness);
 
-        json result;
-        to_json(result, bobbin);
-        return result;
-    }
-    catch (const std::exception &exc) {
-        json exception;
-        exception["data"] = "Exception: " + std::string{exc.what()};
-        return exception;
-    }
+    json result;
+    to_json(result, bobbin);
+    return result;
 }
 
 json calculate_bobbin_data(json magneticJson) {