Skip to content

Commit

Permalink
Merge branch 'gd/julia110' into gd/manifoldsdiff_update
Browse files Browse the repository at this point in the history
  • Loading branch information
gdalle committed Nov 24, 2024
2 parents 39bb481 + 703c254 commit f092311
Show file tree
Hide file tree
Showing 13 changed files with 57 additions and 279 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/documenter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
version: "1.4.551"
- uses: julia-actions/setup-julia@latest
with:
version: "1.10"
version: "1"
- name: Julia Cache
uses: julia-actions/cache@v2
- name: Cache Quarto
Expand Down
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

* Bump compat for ManifoldsDiff to v0.4.0
* Minimum Julia version is now 1.10 (the LTS which replaced 1.6)

## [0.10.7] – 2024-11-16

Expand Down
2 changes: 0 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
MatrixEquations = "99c1a7ee-ab34-5fd5-8076-27c950a045f4"
Quaternions = "94ee1d12-ae83-5a48-8b1c-48b8ff168ae0"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
Requires = "ae029012-a4dd-5104-9daa-d747884805df"
SimpleWeightedGraphs = "47aef6b3-ad0c-573a-a1e2-d07658019622"
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
Expand Down Expand Up @@ -67,7 +66,6 @@ Quaternions = "0.5, 0.6, 0.7"
Random = "1.6"
RecipesBase = "1.1"
RecursiveArrayTools = "2, 3"
Requires = "0.5, 1"
SimpleWeightedGraphs = "1.2"
SpecialFunctions = "0.8, 0.9, 0.10, 1.0, 2"
StaticArrays = "1.4.3"
Expand Down
22 changes: 5 additions & 17 deletions ext/ManifoldsBoundaryValueDiffEqExt.jl
Original file line number Diff line number Diff line change
@@ -1,24 +1,12 @@
module ManifoldsBoundaryValueDiffEqExt

if isdefined(Base, :get_extension)
using Manifolds
using ManifoldsBase
using Manifolds
using ManifoldsBase

using Manifolds: affine_connection
import Manifolds: solve_chart_log_bvp, estimate_distance_from_bvp
using Manifolds: affine_connection
import Manifolds: solve_chart_log_bvp, estimate_distance_from_bvp

using BoundaryValueDiffEq
else
# imports need to be relative for Requires.jl-based workflows:
# https://github.com/JuliaArrays/ArrayInterface.jl/pull/387
using ..Manifolds
using ..ManifoldsBase

using ..Manifolds: affine_connection
import ..Manifolds: solve_chart_log_bvp, estimate_distance_from_bvp

using ..BoundaryValueDiffEq
end
using BoundaryValueDiffEq

function chart_log_problem!(du, u, params, t)
M, A, i = params
Expand Down
41 changes: 11 additions & 30 deletions ext/ManifoldsDistributionsExt/ManifoldsDistributionsExt.jl
Original file line number Diff line number Diff line change
@@ -1,38 +1,19 @@
module ManifoldsDistributionsExt

if isdefined(Base, :get_extension)
using Manifolds
using Distributions
using Random
using LinearAlgebra
using Manifolds
using Distributions
using Random
using LinearAlgebra

import Manifolds:
normal_rotation_distribution,
normal_tvector_distribution,
projected_distribution,
uniform_distribution
import Manifolds:
normal_rotation_distribution,
normal_tvector_distribution,
projected_distribution,
uniform_distribution

using Manifolds: get_iterator, get_parameter, _read, _write
using Manifolds: get_iterator, get_parameter, _read, _write

using RecursiveArrayTools: ArrayPartition
else
# imports need to be relative for Requires.jl-based workflows:
# https://github.com/JuliaArrays/ArrayInterface.jl/pull/387
using ..Manifolds
using ..Distributions
using ..Random
using ..LinearAlgebra

import ..Manifolds:
normal_rotation_distribution,
normal_tvector_distribution,
projected_distribution,
uniform_distribution

using ..Manifolds: get_iterator, get_parameter, _read, _write

using ..RecursiveArrayTools: ArrayPartition
end
using RecursiveArrayTools: ArrayPartition

include("distributions.jl")
include("distributions_for_manifolds.jl")
Expand Down
26 changes: 6 additions & 20 deletions ext/ManifoldsHybridArraysExt.jl
Original file line number Diff line number Diff line change
@@ -1,28 +1,14 @@
module ManifoldsHybridArraysExt

if isdefined(Base, :get_extension)
using Manifolds
using ManifoldsBase
using Manifolds
using ManifoldsBase

using Manifolds: PowerManifoldMultidimensional
using Manifolds: rep_size_to_colons
using Manifolds: PowerManifoldMultidimensional
using Manifolds: rep_size_to_colons

using HybridArrays
using HybridArrays

import Manifolds: _read
else
# imports need to be relative for Requires.jl-based workflows:
# https://github.com/JuliaArrays/ArrayInterface.jl/pull/387
using ..Manifolds
using ..ManifoldsBase

using ..Manifolds: PowerManifoldMultidimensional
using ..Manifolds: rep_size_to_colons

using ..HybridArrays

import ..Manifolds: _read
end
import Manifolds: _read

Base.@propagate_inbounds @inline function _read(
::PowerManifoldMultidimensional,
Expand Down
15 changes: 3 additions & 12 deletions ext/ManifoldsNLsolveExt.jl
Original file line number Diff line number Diff line change
@@ -1,18 +1,9 @@
module ManifoldsNLsolveExt

if isdefined(Base, :get_extension)
using Manifolds
using ManifoldsBase
using Manifolds
using ManifoldsBase

using NLsolve: NLsolve
else
# imports need to be relative for Requires.jl-based workflows:
# https://github.com/JuliaArrays/ArrayInterface.jl/pull/387
using ..Manifolds
using ..ManifoldsBase

using ..NLsolve: NLsolve
end
using NLsolve: NLsolve

@doc raw"""
inverse_retract(M, p, q method::NLSolveInverseRetraction; kwargs...)
Expand Down
43 changes: 12 additions & 31 deletions ext/ManifoldsOrdinaryDiffEqDiffEqCallbacksExt.jl
Original file line number Diff line number Diff line change
@@ -1,38 +1,19 @@
module ManifoldsOrdinaryDiffEqDiffEqCallbacksExt

if isdefined(Base, :get_extension)
using Manifolds
using Manifolds:
IntegratorTerminatorNearChartBoundary,
affine_connection,
get_chart_index,
transition_map!,
transition_map_diff!
import Manifolds: solve_chart_exp_ode, solve_chart_parallel_transport_ode
using ManifoldsBase
using Manifolds
using Manifolds:
IntegratorTerminatorNearChartBoundary,
affine_connection,
get_chart_index,
transition_map!,
transition_map_diff!
import Manifolds: solve_chart_exp_ode, solve_chart_parallel_transport_ode
using ManifoldsBase

using DiffEqCallbacks
using OrdinaryDiffEq: OrdinaryDiffEq, SciMLBase, Rodas5, AutoVern9, ODEProblem, solve
using DiffEqCallbacks
using OrdinaryDiffEq: OrdinaryDiffEq, SciMLBase, Rodas5, AutoVern9, ODEProblem, solve

using RecursiveArrayTools: ArrayPartition
else
# imports need to be relative for Requires.jl-based workflows:
# https://github.com/JuliaArrays/ArrayInterface.jl/pull/387
using ..Manifolds
using ..Manifolds:
IntegratorTerminatorNearChartBoundary,
affine_connection,
get_chart_index,
transition_map!,
transition_map_diff!
import ..Manifolds: solve_chart_exp_ode, solve_chart_parallel_transport_ode
using ..ManifoldsBase

using ..DiffEqCallbacks
using ..OrdinaryDiffEq: OrdinaryDiffEq, SciMLBase, Rodas5, AutoVern9, ODEProblem, solve

using ..RecursiveArrayTools: ArrayPartition
end
using RecursiveArrayTools: ArrayPartition

"""
(int_term::IntegratorTerminatorNearChartBoundary)(u, t, integrator)
Expand Down
32 changes: 8 additions & 24 deletions ext/ManifoldsOrdinaryDiffEqExt.jl
Original file line number Diff line number Diff line change
@@ -1,32 +1,16 @@
module ManifoldsOrdinaryDiffEqExt

if isdefined(Base, :get_extension)
using ManifoldsBase
using ManifoldsBase: TraitList
using ManifoldsBase
using ManifoldsBase: TraitList

using Manifolds
import Manifolds: exp!, solve_exp_ode
using Manifolds: @einsum
using Manifolds
import Manifolds: exp!, solve_exp_ode
using Manifolds: @einsum

using ManifoldDiff: default_differential_backend
using ManifoldDiff: default_differential_backend

using OrdinaryDiffEq: ODEProblem, AutoVern9, Rodas5, solve
using StaticArrays
else
# imports need to be relative for Requires.jl-based workflows:
# https://github.com/JuliaArrays/ArrayInterface.jl/pull/387
using ..ManifoldsBase
using ..ManifoldsBase: TraitList

using ..Manifolds
import ..Manifolds: exp!, solve_exp_ode
using ..Manifolds: @einsum

using ..ManifoldDiff: default_differential_backend

using ..OrdinaryDiffEq: ODEProblem, AutoVern9, Rodas5, solve
using ..StaticArrays
end
using OrdinaryDiffEq: ODEProblem, AutoVern9, Rodas5, solve
using StaticArrays

function solve_exp_ode(
M::AbstractManifold,
Expand Down
18 changes: 4 additions & 14 deletions ext/ManifoldsRecipesBaseExt.jl
Original file line number Diff line number Diff line change
@@ -1,20 +1,10 @@
module ManifoldsRecipesBaseExt

if isdefined(Base, :get_extension)
using Manifolds
using Manifolds: TypeParameter
using Manifolds
using Manifolds: TypeParameter

using Colors: RGBA
using RecipesBase: @recipe, @series
else
# imports need to be relative for Requires.jl-based workflows:
# https://github.com/JuliaArrays/ArrayInterface.jl/pull/387
using ..Manifolds
using ..Manifolds: TypeParameter

using ..RecipesBase: @recipe, @series
using ..Colors: RGBA
end
using Colors: RGBA
using RecipesBase: @recipe, @series

#
# Defaults
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
module ManifoldsRecursiveArrayToolsExt

if isdefined(Base, :get_extension)
using Manifolds
using RecursiveArrayTools: ArrayPartition
using StaticArrays
Expand Down Expand Up @@ -57,66 +56,6 @@ if isdefined(Base, :get_extension)
_vector_transport_direction,
_vector_transport_to,
vee
else
# imports need to be relative for Requires.jl-based workflows:
# https://github.com/JuliaArrays/ArrayInterface.jl/pull/387
using ..Manifolds
using ..RecursiveArrayTools: ArrayPartition
using ..StaticArrays
using ..LinearAlgebra

using ..Base.Iterators: repeated

using ..Manifolds:
bundle_transport_tangent_direction, bundle_transport_tangent_to, _get_parameter

using ..Manifolds:
ActionDirectionAndSide,
ColumnwiseMultiplicationAction,
FiberBundleBasisData,
FiberBundleProductVectorTransport,
LeftColumnwiseSpecialEuclideanAction,
LeftInvariantRepresentation,
PowerManifoldNestedReplacing,
SpecialEuclideanIdentity,
SpecialEuclideanInGeneralLinear,
TangentVectorRepresentation,
TypeParameter

import ..Manifolds:
adjoint_Jacobi_field,
allocate,
allocate_result,
apply,
apply!,
apply_diff,
apply_diff!,
apply_diff_group!,
_common_product_translate_diff,
compose,
_compose,
exp_lie,
get_coordinates,
get_vector,
get_vectors,
hat,
identity_element,
inverse_apply,
inverse_apply_diff,
inverse_translate,
inverse_translate_diff,
isapprox,
jacobi_field,
lie_bracket,
optimal_alignment,
project,
translate,
translate_diff,
vector_representation,
_vector_transport_direction,
_vector_transport_to,
vee
end

function allocate(
::PowerManifoldNestedReplacing,
Expand Down
28 changes: 6 additions & 22 deletions ext/ManifoldsTestExt/ManifoldsTestExt.jl
Original file line number Diff line number Diff line change
@@ -1,30 +1,14 @@
module ManifoldsTestExt

if isdefined(Base, :get_extension)
using Manifolds
using ManifoldsBase
using Manifolds
using ManifoldsBase

import Manifolds:
test_manifold, test_group, test_action, test_parallel_transport, find_eps
using Manifolds: RieszRepresenterCotangentVector, get_chart_index
import Manifolds: test_manifold, test_group, test_action, test_parallel_transport, find_eps
using Manifolds: RieszRepresenterCotangentVector, get_chart_index

using Random: MersenneTwister, rand!
using Random: MersenneTwister, rand!

using Test: Test
else
# imports need to be relative for Requires.jl-based workflows:
# https://github.com/JuliaArrays/ArrayInterface.jl/pull/387
using ..Manifolds
using ..ManifoldsBase

import ..Manifolds:
test_manifold, test_group, test_action, test_parallel_transport, find_eps
using ..Manifolds: RieszRepresenterCotangentVector, get_chart_index

using ..Random: MersenneTwister, rand!

using ..Test: Test
end
using Test: Test

include("tests_general.jl")
include("tests_group.jl")
Expand Down
Loading

0 comments on commit f092311

Please sign in to comment.