v1.16.2 (#161)

* v1.16.2-rc0

* v1.16.2-rc1

---------

Co-authored-by: rtosholdings-bot <rtosholdings-bot@sig.com>

Author: OrestZborowski-SIG

.github/workflows/native_sanity.yml

@@ -92,4 +92,4 @@ jobs:
       - name: Run the Windows riptide Python tests
         if: ${{ matrix.os == 'windows-latest' }}
         run: |
-          ctest --test-dir build -C ${{ matrix.build-config }} -R test_riptide_cpp_python
+          ctest --test-dir build -C ${{ matrix.build-config }} -R "(test_riptide_cpp_python|riptide_python_test\..*)"

.github/workflows/python_package.yml

@@ -53,17 +53,14 @@ jobs:
           python -m pip install --upgrade pip
           python -m pip install setuptools-scm wheel
           python -m pip install numpy==${{ matrix.numpy-version }}.*
-      - name: Build with python setup.py
-        run: |
-          python setup.py build --force
       - name: Package wheel
         if: ${{ matrix.os == 'windows-2022' }}
         run: |
-          python setup.py bdist_wheel
+          python -m build --wheel
       - name: Package sources
         if: ${{ matrix.os == 'ubuntu-latest' }}
         run: |
-          python setup.py sdist
+          python -m build --sdist
       - name: Upload artifacts
         uses: actions/upload-artifact@v3
         with:
@@ -100,7 +97,7 @@ jobs:
           python -c "import riptable; print(riptable, riptable.__version__); print(riptable.rc, riptable.rc.__version__)"
       - name: Riptable test with pytest
         run: |
-          python -m riptable.tests.run
+          python -m pytest --pyargs riptable.tests
       #- name: Riptable tooling integration tests
       #  run: |
       #    ipython -m pytest riptable/test_tooling_integration

CMakeLists.txt

@@ -1,6 +1,6 @@
-cmake_minimum_required(VERSION 3.21)
+cmake_minimum_required(VERSION 3.26.1)
 
-project(riptide_cpp)
+project(riptide_cpp LANGUAGES C CXX)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
 include(CheckIPOSupported)
@@ -71,7 +71,7 @@ include(CopyRuntimeDeps)
 set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
 
 # Under setupbuild, exclude all dependencies from install target to avoid polluting distribution.
-if(SETUPBUILD)
+if(SETUPBUILD OR SKBUILD)
     set(EXLUSION_SPECIFIER EXCLUDE_FROM_ALL)
 else()
     unset(EXCLUSION_SPECIFIER)

cmake/AddCommonSettings.cmake

@@ -7,6 +7,7 @@ if(PROJ_COMPILER_FRONTEND STREQUAL "MSVC")
     target_compile_options(rt_common_settings INTERFACE -FC -Zc:__cplusplus "-MP${BLD_MP_MAX}")
     target_compile_options(rt_common_settings INTERFACE "$<$<CONFIG:Debug>:-Od>")
     target_compile_options(rt_common_settings INTERFACE "$<$<CONFIG:Release>:-Ox;-Ob2;-Oi;-Ot>")
+    target_compile_options(rt_common_settings INTERFACE -bigobj)
     target_compile_options(rt_common_settings INTERFACE -Z7) # generate symbols for all configs
     target_link_options(rt_common_settings INTERFACE "$<$<CONFIG:Release>:-DEBUG>") # generate PDB for all configs
     target_compile_options(rt_common_settings INTERFACE -W4 -WX)

conda_recipe/meta.yaml

@@ -7,33 +7,36 @@ source:
 
 build:
   number: 0
-  # Use Python installed in host environment.
-  script: "{{ PYTHON }} setup.py install --single-version-externally-managed --record=record.txt"
+  script: "pip install -v --no-deps --no-build-isolation ."
+  # will provide manual run requirements for these
+  ignore_run_exports_from:
+    - tbb-devel
+    - zstd
 
 requirements:
-  build:
-    - python {{ python }}
+  host:
     - benchmark >=1.7,<1.8
+    - cmake >=3.26.1
     - "{{ compiler('cxx') }}"
-    - cmake >=3.21
-    - setuptools_scm
+    - ninja >=1.11.0 [unix]
     - numpy {{ numpy }}
+    - python {{ python }}
+    - scikit-build-core >=0.7.1
+    - setuptools_scm
     - tbb-devel 2021.6
     - tbb 2021.6.*
     - zstd >=1.5,<1.6
-  host:
-    - python {{ python }}
-    - "{{ pin_compatible('numpy', min_pin='x.x', max_pin='x.x') }}"
-    - setuptools_scm
   run:
     - python {{ python }}
     - "{{ pin_compatible('numpy', min_pin='x.x', max_pin='x.x') }}"
-    - tbb 2021.6.*
-    - zstd >=1.5,<1.6
+    - "{{ pin_compatible('tbb', min_pin='x.x', max_pin='x.x') }}"
+    - "{{ pin_compatible('zstd', min_pin='x.x', max_pin='x.x') }}"
 
 test:
   imports:
     - riptide_cpp
+  commands:
+    - 'python -c "import riptide_cpp; print(riptide_cpp, riptide_cpp.__version__)"'
 
 about:
   home: https://github.com/rtosholdings/riptide_cpp

dev_tools/gen_requirements.py

@@ -19,7 +19,7 @@ def is_python(major: int, minor: int) -> bool:
 
 
 _BENCHMARK_REQ = "benchmark>=1.7,<1.8"
-_CMAKE_REQ = "cmake>=3.21"
+_CMAKE_REQ = "cmake>=3.26.1"
 _NUMPY_REQ = "numpy>=1.23,<1.25"
 _TBB_VER = "==2021.6.*"
 _TBB_REQ = "tbb" + _TBB_VER
@@ -47,13 +47,13 @@ def is_python(major: int, minor: int) -> bool:
 ] + toolchain_reqs
 
 # PyPI setup build requirements.
-# Most everything else *should* be in pyproject.toml, but since we run
-# setup.py directly we need to set up build environment manually here.
+# Most everything *should* be in pyproject.toml, but some packages
+# need to be set up manually here.
 pypi_reqs = [
+    "build",  # PEP-517 py build frontend
     _BENCHMARK_REQ,  # PyPI package doesn't exist
     _CMAKE_REQ,
     _TBB_DEVEL_REQ,  # needed because PyPI tbb-devel pkg doesn't contain CMake files yet
-    "wheel",
     _ZSTD_REQ,  # PyPI package doesn't exist
 ] + toolchain_reqs
 

external/CMakeLists.txt

@@ -3,7 +3,7 @@
 # It's not yet available via find_package().
 add_library(ut INTERFACE)
 
-set(UT_VERSION c3ed7a21a18a4de3fc807451ae86c9f51e706a11)
+set(UT_VERSION 2.0.1)
 
 # Extract the archive to the build location, so we can reference it from there.
 file(ARCHIVE_EXTRACT INPUT ${CMAKE_CURRENT_SOURCE_DIR}/ut-${UT_VERSION}.zip

external/ut-2.0.1.zip

@@ -1,12 +1,101 @@
+[project]
+name = "riptide_cpp"
+description = "Python Package with fast math util functions"
+readme = "README.md"
+license = { file = "LICENSE" }
+authors = [{ name = "RTOS Holdings", email = "rtosholdings-bot@sig.com" }]
+requires-python = ">=3.9"
+dynamic = ["version"]
+classifiers = [
+    "Development Status :: Beta",
+    "Intended Audience :: Developers",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "License :: OSI Approved :: BSD License",
+]
+
+[project.urls]
+Repository = "https://github.com/rtosholdings/riptide_cpp"
+Documentation = "https://riptable.readthedocs.io/en/stable/"
+
 [build-system]
 requires = [
     #"benchmark >=1.7,<1.8", # DOES NOT EXIST! We must assume it exists in environment
-    "cmake >=3.21",
+    "cmake >=3.26.1",
     "ninja; platform_system!='Windows'",
-    "numpy >=1.23, <1.25",
+    "numpy >=1.23,<1.25",
+    "scikit-build-core >=0.7,<0.8",
+    "setuptools >=65",
+    "setuptools_scm[toml] >=7.1",
     "tbb-devel ==2021.6.*",
-    "setuptools >=42",
     "wheel",
-    "zstd> =1.5.2,<1.6",
+    "zstd >=1.5.2,<1.6",
+]
+build-backend = "scikit_build_core.build"
+
+[tool.setuptools_scm]
+version_scheme = "post-release"
+local_scheme = "node-and-timestamp"
+write_to = "src/_version.d"
+write_to_template = '"{version}"'
+
+[tool.scikit-build]
+logging.level = "INFO"           # Set to DEBUG for detailed logs.
+minimum-version = "0.7"
+cmake.minimum-version = "3.26.1"
+ninja.minimum-version = "1.11"
+ninja.make-fallback = false
+
+# setuptools_scm integration
+metadata.version.provider = "scikit_build_core.metadata.setuptools_scm"
+
+cmake.verbose = true
+cmake.build-type = "Release"
+cmake.args = ["--=SEE_OVERRIDES_BELOW=--"]
+
+sdist.include = ["src/_version.d"]
+
+# Disable Python file inclusion and rely only on CMake's install mechanism.
+wheel.packages = []
+wheel.exclude = [ #
+    "bench",
+    "extras",
+    "test",
+]
+wheel.license-files = ["LICENSE"]
+# Don't strip symbols from binaries; we want to preserve them
+# to get better backtraces if/when something fails.
+install.strip = false
+
+[[tool.scikit-build.overrides]]
+if.platform-system = "linux"
+cmake.args = [
+    # Force CMake to re-run the configuration step each time this build runs. Useful for local builds.
+    "--fresh",
+    # Use the Ninja generator.
+    "-GNinja",
+]
+
+[[tool.scikit-build.overrides]]
+if.platform-system = "win32"
+cmake.args = [
+    # Force CMake to re-run the configuration step each time this build runs. Useful for local builds.
+    "--fresh",
+    # Use the VS2022 generator.
+    "-GVisual Studio 17 2022",
 ]
-build-backend = "setuptools.build_meta"
+
+# Static way of passing current Python version to CMake.
+[[tool.scikit-build.overrides]]
+if.python-version = "~=3.9"
+cmake.define = { "RIPTIDE_PYTHON_VER" = "3.9" }
+
+[[tool.scikit-build.overrides]]
+if.python-version = "~=3.10"
+cmake.define = { "RIPTIDE_PYTHON_VER" = "3.10" }
+
+[[tool.scikit-build.overrides]]
+if.python-version = "~=3.11"
+cmake.define = { "RIPTIDE_PYTHON_VER" = "3.11" }