Release 0.3.0

.github/workflows/build.yml

@@ -22,9 +22,9 @@ jobs:
       run:
         shell: bash
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
-      - uses: actions/github-script@v8
+      - uses: actions/github-script@v9
         with:
           script: |
             core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');

.github/workflows/build_binaries.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Checkout source
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           fetch-depth: 0
           fetch-tags: true
@@ -97,7 +97,7 @@ jobs:
           path: release_assets
 
       - name: Upload assets to GitHub Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v3
         with:
           files: |
             release_assets/**/*.{deb,rpm,tar.gz,zip}

.github/workflows/build_wheels.yml

@@ -34,12 +34,12 @@ jobs:
           - [windows-latest, AMD64, win_amd64, 0.0]
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         # need git tags available for setuptools_scm to grab tags
         with:
           fetch-depth: 0
 
-      - uses: actions/github-script@v8
+      - uses: actions/github-script@v9
         with:
           script: |
             core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
@@ -59,7 +59,7 @@ jobs:
 
       - name: Build Windows wheels
         if: runner.OS == 'Windows'
-        uses: pypa/cibuildwheel@v3.4.0
+        uses: pypa/cibuildwheel@v4.1.1
         with:
           package-dir: ${{github.workspace}}/python
           config-file: ${{github.workspace}}/python/pyproject.toml
@@ -76,7 +76,7 @@ jobs:
           startswith(matrix.build-platform[2], 'manylinux_2_28') &&
           ! ( startswith(matrix.build-platform[1], 'aarch64') &&
           !startsWith(github.ref, 'refs/tags/') )
-        uses: pypa/cibuildwheel@v3.4.0
+        uses: pypa/cibuildwheel@v4.1.1
         with:
           package-dir: ./python
           config-file: ./python/pyproject.toml
@@ -107,7 +107,7 @@ jobs:
 
       - name: Build macOS wheels
         if: runner.os == 'macOS'
-        uses: pypa/cibuildwheel@v3.4.0
+        uses: pypa/cibuildwheel@v4.1.1
         with:
           package-dir: ./python
           config-file: ./python/pyproject.toml

.github/workflows/pages.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         # need git tags available to get git version
         with:
           fetch-depth: 0
@@ -33,7 +33,7 @@ jobs:
           echo "commit_name=$GIT_COMMIT_NAME" >> $GITHUB_OUTPUT
 
       - name: Setup Python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v7
         with:
           python-version: 3.x
 

.gitignore

@@ -2,7 +2,11 @@ build/
 .zed/
 .cache/
 python/build/
+python/src/clibtokamap*.so
+python/src/libtokamap/__pycache__/
+python/src/libtokamap/_version.py
 python/src/libtokamap.egg-info
+python/tests/__pycache__/
 python/dist/
 python/setup.py
 .clangd

CMakeLists.txt

@@ -16,12 +16,14 @@ project(
     LANGUAGES CXX
 )
 
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+set( CMAKE_POSITION_INDEPENDENT_CODE ON )
 
 if( "${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}" )
-    message( SEND_ERROR "In-source builds are not allowed." )
+  message( SEND_ERROR "In-source builds are not allowed." )
 endif()
 
+# find_package( xtensor REQUIRED )
+
 # Set project options
 include( StaticAnalyzers )
 include( Utils )
@@ -34,18 +36,18 @@ option( ENABLE_DEBIAN_PACKAGING "Configure install files for debian packaging" O
 
 ## Generators
 if( UNIX AND NOT APPLE )
-    set( DEFAULT_CPACK_GENERATORS "DEB;RPM;TGZ" )
+  set( DEFAULT_CPACK_GENERATORS "DEB;RPM;TGZ" )
 elseif( APPLE )
-    set( DEFAULT_CPACK_GENERATORS "TGZ;ZIP" )
+  set( DEFAULT_CPACK_GENERATORS "TGZ;ZIP" )
 else()
-    set( DEFAULT_CPACK_GENERATORS "ZIP" )
+  set( DEFAULT_CPACK_GENERATORS "ZIP" )
 endif()
 set( ENABLE_CPACK_GENERATORS "${DEFAULT_CPACK_GENERATORS}" CACHE STRING "enable the cpack generators" )
 
 add_clang_format_target()
 
 if( ENABLE_TESTING )
-    enable_testing()
+  enable_testing()
 endif()
 
 # Specify C++ standard for all targets
@@ -69,16 +71,17 @@ set( UTIL_SOURCES
     src/utils/typed_data_array.cpp
 )
 if( MSVC )
-    list( APPEND UTIL_SOURCES src/utils/windows_utils.cpp )
+  list( APPEND UTIL_SOURCES src/utils/windows_utils.cpp )
 else()
-    list( APPEND UTIL_SOURCES src/utils/unix_utils.cpp )
+  list( APPEND UTIL_SOURCES src/utils/unix_utils.cpp )
 endif()
 
 set( MAP_TYPE_SOURCES
     src/map_types/custom_mapping.cpp
     src/map_types/data_source_mapping.cpp
     src/map_types/dim_mapping.cpp
     src/map_types/expr_mapping.cpp
+    src/map_types/interp_mapping.cpp
     src/map_types/value_mapping.cpp
 )
 
@@ -114,6 +117,7 @@ set( MAP_TYPE_HEADERS
     src/map_types/data_source_mapping.hpp
     src/map_types/dim_mapping.hpp
     src/map_types/expr_mapping.hpp
+    src/map_types/interp_mapping.hpp
     src/map_types/map_arguments.hpp
     src/map_types/value_mapping.hpp
 )
@@ -141,7 +145,7 @@ set( EXT_HEADERS
 )
 
 if( "${PROJECT_VERSION_TWEAK}" STREQUAL "" )
-    set( PROJECT_VERSION_TWEAK 0 )
+  set( PROJECT_VERSION_TWEAK 0 )
 endif()
 
 configure_file(
@@ -165,10 +169,10 @@ configure_file(
 add_library( libtokamap ${SOURCES} )
 
 if( MSVC )
-    target_compile_options( libtokamap PRIVATE /W4 /WX /bigobj /utf-8 )
-    target_link_libraries( libtokamap PRIVATE Dbghelp )
+  target_compile_options( libtokamap PRIVATE /W4 /WX /bigobj /utf-8 )
+  target_link_libraries( libtokamap PRIVATE Dbghelp )
 else()
-    target_compile_options( libtokamap PRIVATE -Wall -Wextra -Wpedantic -Werror )
+  target_compile_options( libtokamap PRIVATE -Wall -Wextra -Wpedantic -Werror )
 endif()
 
 target_include_directories( libtokamap
@@ -184,7 +188,7 @@ target_include_directories( libtokamap
       $<INSTALL_INTERFACE:include/libtokamap>
 )
 if( ENABLE_PROFILING )
-    target_compile_definitions( libtokamap PRIVATE LIBTOKAMAP_PROFILE_ENABLED )
+  target_compile_definitions( libtokamap PRIVATE LIBTOKAMAP_PROFILE_ENABLED )
 endif()
 target_sources( libtokamap PUBLIC
     FILE_SET HEADERS
@@ -241,35 +245,35 @@ install( FILES
 
 # Install documentation
 if( ENABLE_DEBIAN_PACKAGING )
-    add_custom_command(
+  add_custom_command(
         OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/changelog"
         COMMAND ./scripts/git2debchangelog.sh | grep -v -e 'Merge branch' -e 'Merge pull'  > ${CMAKE_CURRENT_BINARY_DIR}/changelog
         WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
         COMMENT "Generating changelog"
     )
 
-    add_custom_command(
+  add_custom_command(
         OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/changelog.gz"
         COMMAND gzip -cn9 changelog > changelog.gz
         WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
         DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/changelog"
         COMMENT "Compressing changelog"
     )
 
-    add_custom_target( changelog_gz ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/changelog.gz" )
+  add_custom_target( changelog_gz ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/changelog.gz" )
 
-    install( FILES
+  install( FILES
         "${CMAKE_CURRENT_BINARY_DIR}/changelog.gz"
         DESTINATION "${CMAKE_INSTALL_DATADIR}/doc/libtokamap-dev"
     )
 
-    install( FILES
+  install( FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE
         DESTINATION "${CMAKE_INSTALL_DATADIR}/doc/libtokamap-dev"
         RENAME copyright
     )
 else( ENABLE_DEBIAN_PACKAGING )
-    install( FILES
+  install( FILES
         ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE
         ${CMAKE_CURRENT_SOURCE_DIR}/README.md
         DESTINATION "${CMAKE_INSTALL_DOCDIR}"
@@ -278,11 +282,11 @@ endif( ENABLE_DEBIAN_PACKAGING )
 
 # Unit testing setup
 if( ENABLE_TESTING )
-    add_subdirectory( test )
+  add_subdirectory( test )
 endif()
 
 if( ENABLE_EXAMPLES )
-    add_subdirectory( examples/simple_mapper )
+  add_subdirectory( examples/simple_mapper )
 endif()
 
 list( TRANSFORM SOURCES PREPEND ${CMAKE_CURRENT_LIST_DIR}/ )

examples/simple_mapper/mappings/example_v1/globals.json

@@ -1,7 +1,7 @@
 {
-  "DATA_SOURCE_CONFIG": {
+  "data_source_config": {
     "JSON": {
-      "ARGS": {
+      "args": {
         "file_name": "data_{{ shot }}.json"
       }
     }

examples/simple_mapper/mappings/example_v1/magnetics/40/mappings.json

@@ -2,91 +2,91 @@
   "version": "1.0.0",
   "coil": {
     "map_type": "DIMENSION",
-    "DIM_PROBE": "_coils"
+    "dim_probe": "_coils"
   },
   "_coils": {
-    "MAP_TYPE": "DATA_SOURCE",
-    "DATA_SOURCE": "JSON",
-    "ARGS": {
+    "map_type": "DATA_SOURCE",
+    "data_source": "JSON",
+    "args": {
       "signal": "coils"
     }
   },
   "coil[#]/name": {
-    "MAP_TYPE": "DATA_SOURCE",
-    "DATA_SOURCE": "JSON",
-    "ARGS": {
+    "map_type": "DATA_SOURCE",
+    "data_source": "JSON",
+    "args": {
       "signal": "coils/{{ #0 }}/name"
     }
   },
   "_coil[#]/radius": {
-    "MAP_TYPE": "DATA_SOURCE",
-    "DATA_SOURCE": "JSON",
-    "ARGS": {
+    "map_type": "DATA_SOURCE",
+    "data_source": "JSON",
+    "args": {
       "signal": "coils/{{ #0 }}/radius"
     }
   },
   "coil[#]/area": {
-    "MAP_TYPE": "EXPR",
-    "EXPR": "pi * r^2",
-    "PARAMETERS": {
+    "map_type": "EXPR",
+    "expr": "pi * r^2",
+    "parameters": {
       "r": "_coil[#]/radius"
     }
   },
   "coil[#]/position": {
-    "MAP_TYPE": "DIMENSION",
-    "DIM_PROBE": "_coil[#]/position"
+    "map_type": "DIMENSION",
+    "dim_probe": "_coil[#]/position"
   },
   "_coil[#]/position": {
-    "MAP_TYPE": "DATA_SOURCE",
-    "DATA_SOURCE": "JSON",
-    "ARGS": {
+    "map_type": "DATA_SOURCE",
+    "data_source": "JSON",
+    "args": {
       "signal": "coils/{{ #0 }}/position"
     }
   },
   "coil[#]/position[#]/r": {
-    "MAP_TYPE": "DATA_SOURCE",
-    "DATA_SOURCE": "JSON",
-    "ARGS": {
+    "map_type": "DATA_SOURCE",
+    "data_source": "JSON",
+    "args": {
       "signal": "coils/{{ #0 }}/position/{{ #1 }}/0"
     }
   },
   "coil[#]/position[#]/z": {
-    "MAP_TYPE": "DATA_SOURCE",
-    "DATA_SOURCE": "JSON",
-    "ARGS": {
+    "map_type": "DATA_SOURCE",
+    "data_source": "JSON",
+    "args": {
       "signal": "coils/{{ #0 }}/position/{{ #1 }}/1"
     }
   },
   "coil[#]/flux/time": {
-    "MAP_TYPE": "DATA_SOURCE",
-    "DATA_SOURCE": "JSON",
-    "ARGS": {
+    "map_type": "DATA_SOURCE",
+    "data_source": "JSON",
+    "args": {
       "signal": "coils/{{ #0 }}/flux/time"
     }
   },
   "coil[#]/flux/data": {
-    "MAP_TYPE": "DATA_SOURCE",
-    "DATA_SOURCE": "JSON",
-    "ARGS": {
+    "map_type": "DATA_SOURCE",
+    "data_source": "JSON",
+    "args": {
       "signal": "coils/{{ #0 }}/flux/data"
     }
   },
   "coil[#]/flux/data_scaled": {
-    "MAP_TYPE": "DATA_SOURCE",
-    "DATA_SOURCE": "JSON",
-    "ARGS": {
+    "map_type": "DATA_SOURCE",
+    "data_source": "JSON",
+    "args": {
       "signal": "coils/{{ #0 }}/flux/data"
     },
-    "SCALE": 2.0
+    "scale": 2.0
   },
   "coil[#]/flux/dot_product": {
-    "MAP_TYPE": "CUSTOM",
-    "LIBRARY": "custom",
-    "FUNCTION": "dot_product",
-    "INPUTS": {
+    "map_type": "CUSTOM",
+    "library": "custom",
+    "function": "dot_product",
+    "inputs": {
       "lhs": "coil[#]/flux/time",
       "rhs": "coil[#]/flux/data"
     },
-    "PARAMETERS": {}
+    "parameters": {}
   }
 }