Merge updates from develop for last time

.github/workflows/build_wheels.yml

@@ -2,26 +2,28 @@ name: Build Wheels
 
 on:
   push:
-    branches: [ "main" ]
-    paths-ignore:
-      - "examples/**"
-      - "doc/**"
-      - "README.md"
-      - "*.txt"
-      - "CHANGELOG"
-  pull_request:
-    branches: [ "main" ]
-    types:
-      - opened
-      - reopened
-      - synchronize
-    paths-ignore:
-      - "examples/**"
-      - "doc/**"
-      - "README.md"
-      - "*.txt"
-      - "CHANGELOG"
-
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+#    branches: [ "main" ]
+#    paths-ignore:
+#      - "examples/**"
+#      - "doc/**"
+#      - "README.md"
+#      - "*.txt"
+#      - "CHANGELOG"
+#  pull_request:
+#    branches: [ "main" ]
+#    types:
+#      - opened
+#      - reopened
+#      - synchronize
+#    paths-ignore:
+#      - "examples/**"
+#      - "doc/**"
+#      - "README.md"
+#      - "*.txt"
+#      - "CHANGELOG"
+#
 env:
   BUILD_TYPE: Release
   VERBOSE: 1
@@ -120,7 +122,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v3
         with:
-          python-version: "3.11"
+          python-version: "3.12"
 
       - name: Install release deps
         run: python -m pip install twine
@@ -137,13 +139,12 @@ jobs:
           name: wheels
           path: dist
 
-      - name: Create release
+      - name: Update release
         shell: bash
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          version="$(ls dist | grep -Po '(?<=roughpy-).+(?=\.tar\.gz)')"
-          gh release -R ${{ github.repository }} create -t $version --generate-notes $version dist/*
+          gh release upload -r ${{ github.repository }} upload ${{ github.ref_name }} dist/*
 
       - name: Publish
         run: |

.github/workflows/tests.yml

@@ -2,10 +2,23 @@ name: tests
 
 on:
   push:
-    branches: [ "develop" ]
+    branches: [ "main" ]
+    paths-ignore:
+      - "examples/**"
+      - "doc/**"
+      - "README.md"
+      - "*.txt"
+      - "CHANGELOG"
+      - "tools/*.py"
   pull_request:
-    branches: [ "develop" ]
-
+    branches: [ "main" ]
+    paths-ignore:
+      - "examples/**"
+      - "doc/**"
+      - "README.md"
+      - "*.txt"
+      - "CHANGELOG"
+      - "tools/*.py"
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release

.gitignore

@@ -338,5 +338,5 @@ cython_debug/
 
 roughpy/version.py
 /my_todo.txt
-tools/
+
 .venv*/

.gitmodules

@@ -1,14 +0,0 @@
-[submodule "external/libalgebra_lite"]
-	path = external/libalgebra_lite
-	url = https://github.com/datasig-ac-uk/libalgebra-lite
-	branch = main
-	update = merge
-[submodule "external/recombine"]
-	path = external/recombine
-	url = https://github.com/datasig-ac-uk/Recombine.git
-	update = merge
-[submodule "external/libalgebra"]
-	path = external/libalgebra
-	url = https://github.com/terrylyons/libalgebra
-	branch = develop
-	update = merge

CMakeLists.txt

@@ -26,10 +26,10 @@ option(ROUGHPY_GENERATE_DEVICE_CODE "Generate code for objects on devices" OFF)
 option(ROUGHPY_DISABLE_BLAS "Disable linking to blas/lapack" ON)
 cmake_dependent_option(ROUGHPY_PREFER_ACCELERATE
         "Prefer Accelerate framework on MacOS always" OFF APPLE OFF)
-
+option(ROUGHPY_BUILD_PYLIB "Build the Python library for RoughPy" ON)
 
 if (ROUGHPY_BUILD_TESTS)
-    set(VCPKG_MANIFEST_FEATURES "tests")
+    set(VCPKG_MANIFEST_FEATURES "tests" CACHE INTERNAL "")
 endif ()
 
 project(RoughPy VERSION ${_rpy_version})
@@ -252,7 +252,9 @@ if (NOT ROUGHPY_DISABLE_BLAS)
         find_package(MKL CONFIG)
         if (TARGET MKL::MKL)
             set(RPY_USE_MKL ON CACHE INTERNAL "BLAS/LAPACK provided by mkl")
-            add_library(BLAS::BLAS ALIAS MKL::MKL)
+            add_library(BLAS::BLAS ALIAS MKL::MKL
+                    algebra/src/libalgebra_lite_internal/rational_coefficients.cpp
+                    algebra/src/libalgebra_lite_internal/rational_coefficients.h)
             add_library(LAPACK::LAPACK ALIAS MKL::MKL)
 
             if (DEFINED MKL_OMP_LIB AND MKL_OMP_LIB)
@@ -311,6 +313,11 @@ endif ()
 find_package(pybind11 REQUIRED)
 find_package(cereal REQUIRED)
 find_package(PCGRandom REQUIRED)
+find_package(Libalgebra_lite REQUIRED)
+
+find_package(PkgConfig REQUIRED)
+pkg_check_modules(GMP REQUIRED IMPORTED_TARGET gmp)
+add_library(GMP::GMP ALIAS PkgConfig::GMP)
 
 # Now we get to adding our components. Let's do some global setup such as
 # setting the CXX standard and the shared library details.
@@ -324,17 +331,18 @@ elseif (NOT WIN32)
     set(CMAKE_INSTALL_RPATH "$ORIGIN" CACHE INTERNAL "")
 endif ()
 
-add_subdirectory(external/libalgebra_lite)
+#add_subdirectory(external/libalgebra_lite)
 
 
 add_subdirectory(core)
 add_subdirectory(platform)
-add_subdirectory(device)
 add_subdirectory(scalars)
 add_subdirectory(intervals)
 add_subdirectory(algebra)
 add_subdirectory(streams)
-add_subdirectory(roughpy)
+if (ROUGHPY_BUILD_PYLIB)
+    add_subdirectory(roughpy)
+endif ()
 
 
 if (ROUGHPY_BUILD_LA_CONTEXTS)

algebra/CMakeLists.txt

@@ -22,6 +22,8 @@ add_roughpy_component(Algebra
         src/libalgebra_lite_internal/lie_basis_info.h
         src/libalgebra_lite_internal/lie_info.h
         src/libalgebra_lite_internal/lite_vector_selector.h
+        src/libalgebra_lite_internal/rational_coefficients.cpp
+        src/libalgebra_lite_internal/rational_coefficients.h
         src/libalgebra_lite_internal/shuffle_tensor_info.h
         src/libalgebra_lite_internal/sparse_mutable_ref_scalar_trait.h
         src/libalgebra_lite_internal/sparse_vector_iterator.h

algebra/include/roughpy/algebra/algebra_base.h

@@ -75,8 +75,8 @@ struct with_interface {
     using type = AlgebraImplementation<IFace, Impl, StorageModel>;
 };
 
-RPY_EXPORT void print_empty_algebra(std::ostream& os);
-RPY_EXPORT const scalars::ScalarType*
+ROUGHPY_ALGEBRA_EXPORT void print_empty_algebra(std::ostream& os);
+ROUGHPY_ALGEBRA_EXPORT const scalars::ScalarType*
 context_to_scalars(const context_pointer& ptr);
 
 }// namespace dtl
@@ -331,7 +331,7 @@ UnspecifiedAlgebraType construct_dense_algebra(
         AlgebraType atype
 );
 
-RPY_EXPORT void check_contexts_compatible(
+ROUGHPY_ALGEBRA_EXPORT void check_contexts_compatible(
         const context_pointer& ref, const context_pointer& other
 );
 }// namespace dtl

algebra/include/roughpy/algebra/algebra_fwd.h

@@ -32,6 +32,7 @@
 #include <roughpy/core/types.h>
 
 #include <memory>
+#include "roughpy_algebra_export.h"
 
 namespace rpy {
 namespace algebra {

algebra/include/roughpy/algebra/context.h

@@ -69,7 +69,7 @@ struct VectorConstructionData {
     VectorType vector_type = VectorType::Sparse;
 };
 
-class RPY_EXPORT ContextBase : public boost::intrusive_ref_counter<ContextBase>
+class ROUGHPY_ALGEBRA_EXPORT ContextBase : public boost::intrusive_ref_counter<ContextBase>
 {
     deg_t m_width;
     deg_t m_depth;
@@ -93,7 +93,7 @@ class RPY_EXPORT ContextBase : public boost::intrusive_ref_counter<ContextBase>
     RPY_NO_DISCARD dimn_t tensor_size(deg_t deg) const noexcept;
 };
 
-class RPY_EXPORT Context : public ContextBase
+class ROUGHPY_ALGEBRA_EXPORT Context : public ContextBase
 {
     const scalars::ScalarType* p_ctype;
     string m_ctx_backend;
@@ -229,9 +229,9 @@ class RPY_EXPORT Context : public ContextBase
 
 };
 
-RPY_EXPORT base_context_pointer get_base_context(deg_t width, deg_t depth);
+ROUGHPY_ALGEBRA_EXPORT base_context_pointer get_base_context(deg_t width, deg_t depth);
 
-RPY_EXPORT context_pointer get_context(
+ROUGHPY_ALGEBRA_EXPORT context_pointer get_context(
         deg_t width, deg_t depth, const scalars::ScalarType* ctype,
         const std::vector<std::pair<string, string>>& preferences = {}
 );
@@ -259,7 +259,7 @@ inline void check_contexts_compatible(const Context& ctx1, const Context& ctx2)
     // TODO: Alternatively, check that ctype1 is convertible to ctype2
 }
 
-class RPY_EXPORT ContextMaker
+class ROUGHPY_ALGEBRA_EXPORT ContextMaker
 {
 public:
     using preference_list = std::vector<std::pair<string, string>>;
@@ -276,7 +276,7 @@ class RPY_EXPORT ContextMaker
     get_base_context(deg_t width, deg_t depth) const = 0;
 };
 
-RPY_EXPORT const ContextMaker*
+ROUGHPY_ALGEBRA_EXPORT const ContextMaker*
 register_context_maker(std::unique_ptr<ContextMaker> maker);
 
 template <typename Maker>

algebra/include/roughpy/algebra/context_fwd.h

@@ -86,17 +86,17 @@ struct BasicContextSpec {
     deg_t depth;
 };
 
-RPY_NO_DISCARD RPY_EXPORT BasicContextSpec
+RPY_NO_DISCARD ROUGHPY_ALGEBRA_EXPORT BasicContextSpec
 get_context_spec(const context_pointer& ctx);
 
-RPY_NO_DISCARD RPY_EXPORT context_pointer
+RPY_NO_DISCARD ROUGHPY_ALGEBRA_EXPORT context_pointer
 from_context_spec(const BasicContextSpec& spec);
 
-RPY_NO_DISCARD RPY_EXPORT std::vector<byte> alg_to_raw_bytes(
+RPY_NO_DISCARD ROUGHPY_ALGEBRA_EXPORT std::vector<byte> alg_to_raw_bytes(
         context_pointer ctx, AlgebraType atype, RawUnspecifiedAlgebraType alg
 );
 
-RPY_NO_DISCARD RPY_EXPORT UnspecifiedAlgebraType alg_from_raw_bytes(
+RPY_NO_DISCARD ROUGHPY_ALGEBRA_EXPORT UnspecifiedAlgebraType alg_from_raw_bytes(
         context_pointer ctx, AlgebraType atype, Slice<byte> raw_data
 );
 

algebra/include/roughpy/algebra/free_tensor.h

@@ -52,7 +52,7 @@ RPY_TEMPLATE_EXTERN template class RPY_EXPORT_TEMPLATE
 
 
 
-class RPY_EXPORT FreeTensor
+class ROUGHPY_ALGEBRA_EXPORT FreeTensor
     : public AlgebraBase<FreeTensorInterface, FreeTensorImplementation>
 {
     using base_t = AlgebraBase<FreeTensorInterface, FreeTensorImplementation>;
@@ -77,7 +77,7 @@ RPY_SERIAL_EXTERN_SERIALIZE_CLS(FreeTensor)
 RPY_SERIAL_SERIALIZE_FN_IMPL(FreeTensor) { RPY_SERIAL_SERIALIZE_BASE(base_t); }
 
 template <>
-RPY_EXPORT typename FreeTensor::basis_type
+ROUGHPY_ALGEBRA_EXPORT typename FreeTensor::basis_type
 basis_setup_helper<FreeTensor>::get(const context_pointer& ctx);
 
 

algebra/include/roughpy/algebra/free_tensor_bundle.h

@@ -15,7 +15,7 @@ RPY_TEMPLATE_EXTERN template class RPY_EXPORT_TEMPLATE AlgebraBundleBase<
         FreeTensorBundleInterface,
         FreeTensorBundleImplementation>;
 
-class RPY_EXPORT FreeTensorBundle : public AlgebraBundleBase<
+class ROUGHPY_ALGEBRA_EXPORT FreeTensorBundle : public AlgebraBundleBase<
                                             FreeTensorBundleInterface,
                                             FreeTensorBundleImplementation>
 {
@@ -46,7 +46,7 @@ RPY_SERIAL_SERIALIZE_FN_IMPL(FreeTensorBundle)
 }
 
 template <>
-RPY_EXPORT typename FreeTensorBundle::basis_type
+ROUGHPY_ALGEBRA_EXPORT typename FreeTensorBundle::basis_type
 basis_setup_helper<FreeTensorBundle>::get(const context_pointer& ctx);
 
 

algebra/include/roughpy/algebra/interfaces/free_tensor_bundle_interface.h

@@ -61,7 +61,7 @@ RPY_TEMPLATE_EXTERN template class RPY_EXPORT_TEMPLATE
 
 
 
-class RPY_EXPORT FreeTensorBundleInterface
+class ROUGHPY_ALGEBRA_EXPORT FreeTensorBundleInterface
     : public BundleInterface<FreeTensorBundle, FreeTensor, FreeTensor>
 {
 public:

algebra/include/roughpy/algebra/interfaces/free_tensor_interface.h

@@ -42,7 +42,7 @@ namespace algebra {
 RPY_TEMPLATE_EXTERN template class RPY_EXPORT_TEMPLATE
         AlgebraInterface<FreeTensor, TensorBasis>;
 
-class RPY_EXPORT FreeTensorInterface
+class ROUGHPY_ALGEBRA_EXPORT FreeTensorInterface
     : public AlgebraInterface<FreeTensor, TensorBasis>
 {
 public:

algebra/include/roughpy/algebra/interfaces/lie_bundle_interface.h

@@ -43,7 +43,7 @@ namespace algebra {
 RPY_TEMPLATE_EXTERN template class RPY_EXPORT_TEMPLATE
         BundleInterface<LieBundle, Lie, Lie>;
 
-class RPY_EXPORT LieBundleInterface
+class ROUGHPY_ALGEBRA_EXPORT LieBundleInterface
     : public BundleInterface<LieBundle, Lie, Lie>
 {
     using base_t = BundleInterface<LieBundle, Lie, Lie>;

algebra/include/roughpy/algebra/interfaces/lie_interface.h

@@ -40,7 +40,7 @@ namespace algebra {
 RPY_TEMPLATE_EXTERN template class RPY_EXPORT_TEMPLATE
         AlgebraInterface<Lie, LieBasis>;
 
-class RPY_EXPORT LieInterface : public AlgebraInterface<Lie, LieBasis>
+class ROUGHPY_ALGEBRA_EXPORT LieInterface : public AlgebraInterface<Lie, LieBasis>
 {
     using base_t = AlgebraInterface<Lie, LieBasis>;
 

algebra/include/roughpy/algebra/interfaces/shuffle_tensor_bundle_interface.h

@@ -11,7 +11,7 @@ namespace rpy { namespace algebra {
 RPY_TEMPLATE_EXTERN template class RPY_EXPORT_TEMPLATE
 BundleInterface<ShuffleTensorBundle, ShuffleTensor, ShuffleTensor>;
 
-class RPY_EXPORT ShuffleTensorBundleInterface
+class ROUGHPY_ALGEBRA_EXPORT ShuffleTensorBundleInterface
     : public BundleInterface<ShuffleTensorBundle, ShuffleTensor, ShuffleTensor>
 {
 };

algebra/include/roughpy/algebra/interfaces/shuffle_tensor_interface.h

@@ -41,7 +41,7 @@ namespace algebra {
 RPY_TEMPLATE_EXTERN template class RPY_EXPORT_TEMPLATE
         AlgebraInterface<ShuffleTensor, TensorBasis>;
 
-class RPY_EXPORT ShuffleTensorInterface
+class ROUGHPY_ALGEBRA_EXPORT ShuffleTensorInterface
     : public AlgebraInterface<ShuffleTensor, TensorBasis>
 {
     using base_t = AlgebraInterface<ShuffleTensor, TensorBasis>;

algebra/include/roughpy/algebra/lie.h

@@ -47,7 +47,7 @@ namespace algebra {
 RPY_TEMPLATE_EXTERN template class RPY_EXPORT_TEMPLATE
         AlgebraBase<LieInterface>;
 
-class RPY_EXPORT Lie : public AlgebraBase<LieInterface>
+class ROUGHPY_ALGEBRA_EXPORT Lie : public AlgebraBase<LieInterface>
 {
     using base_t = AlgebraBase<LieInterface>;
 
@@ -66,7 +66,7 @@ RPY_SERIAL_SERIALIZE_FN_IMPL(Lie) { RPY_SERIAL_SERIALIZE_BASE(base_t); }
 
 
 template <>
-RPY_EXPORT typename Lie::basis_type
+ROUGHPY_ALGEBRA_EXPORT typename Lie::basis_type
 basis_setup_helper<Lie>::get(const context_pointer& ctx);