Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

👷 ci: remove LFS #17

Merged
merged 4 commits into from
Nov 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
Tests/MAExamples/Base/data/**/* filter=lfs diff=lfs merge=lfs -text
4 changes: 0 additions & 4 deletions .github/workflows/examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ jobs:

steps:
- uses: actions/checkout@v3
with:
lfs: true
- name: Pull lfs
run: git lfs pull

- name: Setup Conda Environment
run: |
Expand Down
1 change: 1 addition & 0 deletions Docs/Contributing/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.

## [unreleased]

👷 **ci:** remove LFS ([#17](https://github.com/owkin/MAKit/pull/17))\
🔧 **chore:** rollback changelog ([#16](https://github.com/owkin/MAKit/pull/16))\
🔧 **chore:** fix badges in the readme ([#15](https://github.com/owkin/MAKit/pull/15))

Expand Down
7 changes: 4 additions & 3 deletions Docs/Contributing/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -246,12 +246,13 @@ containing the commits to merge into the `main` branch.
Do not delete the "Unreleased" section title: future PRs will insert
changelog items in this section.
- Commit and push the changes.
- Squash and merge the new branch into `release_N` with commit message \
🔧 chore: release X.Y.Z
- Squash and merge the new branch into `release_N`.

1. Create a Pull Request

1. Review and Merge the Pull Request
1. Review and Merge the Pull Request, change the commit
message \
🔧 chore: release X.Y.Z

1. Create a GitHub release X.Y.Z from `main`:
- GitHub > Releases > Draft new Release
Expand Down
12 changes: 0 additions & 12 deletions Docs/Examples/VGG.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,18 +80,6 @@ conda deactivate
conda env remove --name maexamples
```

## Known Issues

The following error may follow on local setup:
`UnpicklingError: invalid load key, ‘v’`.

This may occur when lfs data files are not pulled.
To fix this:

```bash
git lfs pull
```

## Steps

1. Dump the training and testing datasets.
Expand Down
13 changes: 9 additions & 4 deletions Sources/MATestsUtils/Trainer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
//

import Foundation
import XCTest
import MAKit

///
Expand Down Expand Up @@ -68,13 +67,19 @@ extension TestError: CustomStringConvertible
///
/// Function used to retry flaky numeric tests.
///
/// This function ensures test fails when internal function did not complete.
/// This function is used to assert failure when internal function did not complete.
/// Note that we do not import XCTest to avoid linking difficulties when importing MAKit into
/// other projects. Hence the use of blockFail.
///
/// - Parameters:
/// - nbRetry: Number maximal of retries.
/// - block: Function to execute.
/// - blockFail: Function to execute in case of fail.
///
public func retryNumeric(nbRetry: Int, _ block: @escaping () throws -> ())
public func retryNumeric(
nbRetry: Int,
_ block: @escaping () throws -> (),
_ blockFail: ()->())
{
var iter = 0
while iter < nbRetry
Expand All @@ -93,7 +98,7 @@ public func retryNumeric(nbRetry: Int, _ block: @escaping () throws -> ())
}
if iter == nbRetry
{
XCTAssert(false)
blockFail()
}
}

Expand Down
Binary file modified Tests/MAExamples/Base/data/in/batches.meta
Binary file not shown.
Binary file modified Tests/MAExamples/Base/data/in/data_batch_1
Binary file not shown.
Binary file modified Tests/MAExamples/Base/data/in/data_batch_2
Binary file not shown.
Binary file modified Tests/MAExamples/Base/data/in/data_batch_3
Binary file not shown.
Binary file modified Tests/MAExamples/Base/data/in/data_batch_4
Binary file not shown.
Binary file modified Tests/MAExamples/Base/data/in/data_batch_5
Binary file not shown.
4 changes: 1 addition & 3 deletions Tests/MAExamples/Base/data/in/readme.html
Git LFS file not shown
Binary file modified Tests/MAExamples/Base/data/in/test_batch
Binary file not shown.
Binary file modified Tests/MAExamples/Base/data/out/CIFAR5_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/MAExamples/Base/data/out/CIFAR5_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/MAExamples/Base/data/out/CIFAR5_10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/MAExamples/Base/data/out/CIFAR5_11.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/MAExamples/Base/data/out/CIFAR5_12.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/MAExamples/Base/data/out/CIFAR5_13.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/MAExamples/Base/data/out/CIFAR5_14.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/MAExamples/Base/data/out/CIFAR5_15.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/MAExamples/Base/data/out/CIFAR5_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/MAExamples/Base/data/out/CIFAR5_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/MAExamples/Base/data/out/CIFAR5_4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/MAExamples/Base/data/out/CIFAR5_5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/MAExamples/Base/data/out/CIFAR5_6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/MAExamples/Base/data/out/CIFAR5_7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/MAExamples/Base/data/out/CIFAR5_8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/MAExamples/Base/data/out/CIFAR5_9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/MAExamples/Base/data/out/CIFAR8_0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/MAExamples/Base/data/out/CIFAR8_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/MAExamples/Base/data/out/CIFAR8_10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/MAExamples/Base/data/out/CIFAR8_11.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/MAExamples/Base/data/out/CIFAR8_12.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/MAExamples/Base/data/out/CIFAR8_13.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/MAExamples/Base/data/out/CIFAR8_14.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/MAExamples/Base/data/out/CIFAR8_15.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/MAExamples/Base/data/out/CIFAR8_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Tests/MAExamples/Base/data/out/CIFAR8_3.png
Binary file modified Tests/MAExamples/Base/data/out/CIFAR8_4.png
Binary file modified Tests/MAExamples/Base/data/out/CIFAR8_5.png
Binary file modified Tests/MAExamples/Base/data/out/CIFAR8_6.png
Binary file modified Tests/MAExamples/Base/data/out/CIFAR8_7.png
Binary file modified Tests/MAExamples/Base/data/out/CIFAR8_8.png
Binary file modified Tests/MAExamples/Base/data/out/CIFAR8_9.png
Loading