Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
c0a92f3
update compat bounds
zsteve Feb 15, 2025
254cd21
update buildkite julia ver
zsteve Feb 15, 2025
94ed3e8
rollback
zsteve Feb 15, 2025
907e067
fix approx tol
matbesancon Aug 5, 2025
786c803
action update
matbesancon Aug 5, 2025
f07622d
action all update
matbesancon Aug 5, 2025
cce5973
various bounds
matbesancon Aug 5, 2025
a4abb62
atol
matbesancon Aug 5, 2025
301ce5d
remove
matbesancon Aug 5, 2025
ca1cc63
Apply suggestions from code review
devmotion Aug 5, 2025
5e7115f
More updates
devmotion Aug 5, 2025
eb59f4b
Use conda installation on buildkite
devmotion Aug 5, 2025
6a68302
Remove Manifest.toml files
devmotion Aug 5, 2025
42ff9a1
Update .gitignore
devmotion Aug 5, 2025
7d08dc3
Update examples/nmf/Project.toml
devmotion Aug 5, 2025
15b18b0
Run CI on macOS
devmotion Aug 5, 2025
75a617b
Use `sources` in Project.toml
devmotion Aug 5, 2025
cab418e
atol on gpu test
matbesancon Aug 5, 2025
3a2a799
Remove `strict` kwarg from `makedocs`
devmotion Aug 5, 2025
25bf662
Add julia cache to docs CI
devmotion Aug 5, 2025
7115666
fix f32
matbesancon Aug 5, 2025
a7306d8
Merge branch 'update_compat' of github.com:matbesancon/OptimalTranspo…
matbesancon Aug 5, 2025
10b96ec
Update test/gpu/simple_gpu.jl
matbesancon Aug 5, 2025
6d74675
Fix (?) convergence criterion
devmotion Aug 5, 2025
7986a36
Fix (?) sign error
devmotion Aug 5, 2025
fd913e4
A few more changes
devmotion Aug 5, 2025
8d3da81
More fixes
devmotion Aug 5, 2025
24bc0b8
Revert a few changes
devmotion Aug 5, 2025
88736f3
Don't use `mul!`
devmotion Aug 6, 2025
3c4890a
Update simple_gpu.jl
devmotion Aug 6, 2025
dcfcbb9
Update regularization parameter in the test
devmotion Aug 6, 2025
edaa9aa
Update src/quadratic_newton.jl
devmotion Aug 6, 2025
87a82b5
Try to revert GPU tests
devmotion Aug 6, 2025
b65a516
Fix format action
devmotion Aug 6, 2025
cd65401
Fix and improve tests
devmotion Aug 6, 2025
00759b7
formatting
matbesancon Aug 6, 2025
57d1715
typo
matbesancon Aug 6, 2025
d228db3
Fix format
devmotion Aug 6, 2025
3394f67
Set permissions for GH actions
devmotion Aug 6, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ steps:

env:
GROUP: GPU
PYTHON: ""
50 changes: 22 additions & 28 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,59 +12,53 @@ concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}

# needed to allow julia-actions/cache to delete old caches that it has created
permissions:
actions: write
contents: read

jobs:
test:
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
name: Julia ${{ matrix.version }} - ${{ matrix.os }}
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.version == 'nightly' }}
continue-on-error: ${{ matrix.version == 'pre' }}
strategy:
matrix:
version:
- '1.6'
- 'min'
- 'lts'
- '1'
- 'nightly'
- 'pre'
os:
- ubuntu-latest
- macOS-latest
- windows-latest
arch:
- x64
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: '3.9'
architecture: ${{ matrix.arch }}
python-version: '3.13'
- run: python -m pip install pot
- uses: julia-actions/setup-julia@v1
- uses: julia-actions/setup-julia@v2
with:
version: ${{ matrix.version }}
arch: ${{ matrix.arch }}
- uses: actions/cache@v1
env:
cache-name: cache-artifacts
with:
path: ~/.julia/artifacts
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
restore-keys: |
${{ runner.os }}-test-${{ env.cache-name }}-
${{ runner.os }}-test-
${{ runner.os }}-
- uses: julia-actions/julia-buildpkg@latest
- uses: julia-actions/julia-runtest@latest
- uses: julia-actions/cache@v2
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-runtest@v1
with:
coverage: ${{ matrix.version == '1' && matrix.os == 'ubuntu-latest' }}
env:
PYTHON: python
GROUP: OptimalTransport
- uses: julia-actions/julia-processcoverage@v1
if: matrix.version == '1' && matrix.os == 'ubuntu-latest'
- uses: codecov/codecov-action@v2
- uses: codecov/codecov-action@v5
if: matrix.version == '1' && matrix.os == 'ubuntu-latest'
with:
file: lcov.info
- uses: coverallsapp/github-action@master
files: lcov.info
- uses: coverallsapp/github-action@v2
if: matrix.version == '1' && matrix.os == 'ubuntu-latest'
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
path-to-lcov: lcov.info
file: lcov.info
2 changes: 1 addition & 1 deletion .github/workflows/CompatHelper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
CompatHelper:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2 # to determine subdirectories of examples
- uses: actions/checkout@v4 # to determine subdirectories of examples
- name: "Add the General registry via Git"
run: |
import Pkg
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/DocsPreviewCleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout gh-pages branch
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
ref: gh-pages
- name: Delete preview and history + push changes
Expand Down
22 changes: 17 additions & 5 deletions .github/workflows/Documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,32 @@ concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}

permissions:
actions: write
contents: read

jobs:
build:
# These permissions are needed to:
# - Deploy the documentation: https://documenter.juliadocs.org/stable/man/hosting/#Permissions
# - Delete old caches: https://github.com/julia-actions/cache#usage
permissions:
actions: write
contents: write
pull-requests: read
statuses: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: '3.9'
architecture: ${{ matrix.arch }}
python-version: '3.13'
- run: python -m pip install pot
- uses: julia-actions/setup-julia@latest
- uses: julia-actions/setup-julia@v2
with:
version: '1'
- uses: julia-actions/cache@v2
- name: Install dependencies
run: |
using Pkg: Pkg
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ jobs:
format:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@latest
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v2
with:
version: 1
- name: Format code
Expand All @@ -21,4 +21,4 @@ jobs:
- uses: reviewdog/action-suggester@v1
with:
tool_name: JuliaFormatter
fail_on_error: true
fail_level: error
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ docs/src/examples/
# It records a fixed state of all packages used by the project. As such, it should not be
# committed for packages, but should be committed for applications that require a static
# environment.
/Manifest.toml
/test/Manifest.toml
/test/gpu/Manifest.toml
Manifest.toml

# Files generated by Jupyter Notebooks
*.ipynb_checkpoints
Expand All @@ -38,3 +36,6 @@ docs/src/examples/
*~undo-tree~*
\#*\#
.\#*

# VS Code settings
.vscode/*
14 changes: 8 additions & 6 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "OptimalTransport"
uuid = "7e02d93a-ae51-4f58-b602-d97af76e3b33"
authors = ["zsteve <[email protected]>"]
version = "0.3.20"
version = "0.3.21"

[deps]
ExactOptimalTransport = "24df6009-d856-477c-ac5c-91f668376b31"
Expand All @@ -12,12 +12,14 @@ NNlib = "872c559c-99b0-510c-b3b7-b6c96a88d5cd"
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"

[compat]
ExactOptimalTransport = "0.1, 0.2"
IterativeSolvers = "0.8.4, 0.9"
LogExpFunctions = "0.2, 0.3"
NNlib = "0.6, 0.7, 0.8"
Distances = "0.10"
ExactOptimalTransport = "0.2"
IterativeSolvers = "0.9"
LogExpFunctions = "0.3"
NNlib = "0.9"
PythonOT = "0.1"
Reexport = "1"
julia = "1"
julia = "1.10"

[extras]
Distances = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7"
Expand Down
Loading
Loading