-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #343 from oddkiva/maint-update-github-master-branch
MAINT: update the GitHub master branch
- Loading branch information
Showing
1,973 changed files
with
330,892 additions
and
69,996 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| name: Sara Build + Test | ||
| name: Continuous Integration | ||
|
|
||
| on: | ||
| push: | ||
|
|
@@ -43,6 +43,21 @@ on: | |
| # } | ||
| # | ||
| # steps: | ||
| # - name: Prepare ccache timestamp | ||
| # id: ccache_cache_timestamp | ||
| # shell: cmake -P {0} | ||
| # run: | | ||
| # string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC) | ||
| # message("::set-output name=timestamp::${current_date}") | ||
| # | ||
| # - name: Save ccache cache files | ||
| # uses: actions/[email protected] | ||
| # with: | ||
| # path: .ccache | ||
| # key: ${ { matrix.config.name } }-ccache-${ { steps.ccache_cache_timestamp.outputs.timestamp } } | ||
| # restore-keys: | | ||
| # ${ { matrix.config.name } }-ccache- | ||
| # | ||
| # - uses: actions/checkout@v4 | ||
| # | ||
| # - name: Install dependencies on Ubuntu | ||
|
|
@@ -171,17 +186,4 @@ jobs: | |
| - name: Build and test on Ubuntu | ||
| if: startsWith(matrix.container, 'oddkiva/sara-devel') | ||
| run: | | ||
| mkdir build | ||
| cd build | ||
| cmake .. \ | ||
| -G Ninja \ | ||
| -D CMAKE_BUILD_TYPE:STRING=Release \ | ||
| -D SARA_BUILD_SHARED_LIBS:BOOL=ON \ | ||
| -D SARA_BUILD_VIDEOIO:BOOL=ON \ | ||
| -D SARA_BUILD_SAMPLES:BOOL=ON \ | ||
| -D SARA_BUILD_TESTS:BOOL=ON | ||
| cmake --build . -j$(nproc) | ||
| DISPLAY=:1 ctest \ | ||
| -j$(nproc) \ | ||
| --output-on-failure \ | ||
| --exclude-regex "test_core_ipc_cond1|test_graphics_*|test_visualization_feature_draw|shakti_test_*" | ||
| ./build.py --tasks library --build_type Release --from_scratch --ci | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,199 +1,43 @@ | ||
| ################# | ||
| # Temporarily generated library folders | ||
| ################# | ||
| bin/ | ||
| build/ | ||
| build-static/ | ||
| build-shared/ | ||
| # Data | ||
| **/assets/ | ||
| **/yolov*/ | ||
| doc/source/xml/ | ||
| html/ | ||
| latex/ | ||
| lib/ | ||
| sara_version.cmake | ||
|
|
||
| ################# | ||
| ## Eclipse | ||
| ################# | ||
| # Model weights. | ||
| *.weights | ||
| *.onnx | ||
| # TensorRT optimized model. | ||
| *.bin | ||
|
|
||
| *.pydevproject | ||
| .project | ||
| .metadata | ||
| bin/ | ||
| tmp/ | ||
| *.tmp | ||
| *.bak | ||
| *.swp | ||
| *~.nib | ||
| local.properties | ||
| .classpath | ||
| .settings/ | ||
| .loadpath | ||
|
|
||
| # External tool builders | ||
| .externalToolBuilders/ | ||
|
|
||
| # Locally stored "Eclipse launch configurations" | ||
| *.launch | ||
|
|
||
| # CDT-specific | ||
| .cproject | ||
|
|
||
| # PDT-specific | ||
| .buildpath | ||
|
|
||
|
|
||
| ################# | ||
| ## Visual Studio | ||
| ################# | ||
|
|
||
| ## Ignore Visual Studio temporary files, build results, and | ||
| ## files generated by popular Visual Studio add-ons. | ||
|
|
||
| # User-specific files | ||
| *.suo | ||
| *.user | ||
| *.sln.docstates | ||
|
|
||
| # Build results | ||
| [Dd]ebug/ | ||
| [Rr]elease/ | ||
| *_i.c | ||
| *_p.c | ||
| *.ilk | ||
| *.meta | ||
| *.obj | ||
| !pumpkin_tall_10k.obj | ||
| *.pch | ||
| *.pdb | ||
| *.pgc | ||
| *.pgd | ||
| *.rsp | ||
| *.sbr | ||
| *.tlb | ||
| *.tli | ||
| *.tlh | ||
| *.tmp | ||
| *.vspscc | ||
| .builds | ||
| *.dotCover | ||
|
|
||
| ## TODO: If you have NuGet Package Restore enabled, uncomment this | ||
| #packages/ | ||
|
|
||
| # Visual C++ cache files | ||
| ipch/ | ||
| *.aps | ||
| *.ncb | ||
| *.opensdf | ||
| *.sdf | ||
|
|
||
| # Visual Studio profiler | ||
| *.psess | ||
| *.vsp | ||
|
|
||
| # ReSharper is a .NET coding add-in | ||
| _ReSharper* | ||
|
|
||
| # Installshield output folder | ||
| [Ee]xpress | ||
|
|
||
| # DocProject is a documentation generator add-in | ||
| DocProject/buildhelp/ | ||
| DocProject/Help/*.HxT | ||
| DocProject/Help/*.HxC | ||
| DocProject/Help/*.hhc | ||
| DocProject/Help/*.hhk | ||
| DocProject/Help/*.hhp | ||
| DocProject/Help/Html2 | ||
| DocProject/Help/html | ||
|
|
||
| # Click-Once directory | ||
| publish | ||
|
|
||
| # Others | ||
| [Bb]in | ||
| [Oo]bj | ||
| sql | ||
| TestResults | ||
| *.Cache | ||
| ClientBin | ||
| stylecop.* | ||
| ~$* | ||
| *.dbmdl | ||
| Generated_Code #added for RIA/Silverlight projects | ||
|
|
||
| # Backup & report files from converting an old project file to a newer | ||
| # Visual Studio version. Backup files are not needed, because we have git ;-) | ||
| _UpgradeReport_Files/ | ||
| Backup*/ | ||
| UpgradeLog*.XML | ||
|
|
||
|
|
||
|
|
||
| ############ | ||
| ## Windows | ||
| ############ | ||
|
|
||
| # Windows image file caches | ||
| Thumbs.db | ||
|
|
||
| # Folder config file | ||
| Desktop.ini | ||
|
|
||
|
|
||
| ############# | ||
| ## Python | ||
| ############# | ||
| # QtCreator | ||
| CMakeLists.txt.user | ||
|
|
||
| # Python | ||
| *.pyc | ||
| *.pyo | ||
| *.coverage | ||
|
|
||
| # Packages | ||
| *.egg | ||
| *.egg-info | ||
| dist | ||
| build | ||
| eggs | ||
| parts | ||
| bin | ||
| var | ||
| sdist | ||
| develop-eggs | ||
| .installed.cfg | ||
| # Rmarkdown | ||
| .RData | ||
| .Rhistory | ||
| sara_book.log | ||
| _book/ | ||
| _bookdown_files/ | ||
|
|
||
| # Installer logs | ||
| pip-log.txt | ||
| # cache folder | ||
| .cache | ||
|
|
||
| # Unit test / coverage reports | ||
| .coverage | ||
| .tox | ||
| # NPM | ||
| **/node_modules/ | ||
|
|
||
| #Translations | ||
| *.mo | ||
| # CMake | ||
| cmake/sara_version.cmake | ||
| compile_commands.json | ||
|
|
||
| #Mr Developer | ||
| .mr.developer.cfg | ||
| # GDB | ||
| .gdb_history | ||
|
|
||
| # Mac crap | ||
| .DS_Store | ||
|
|
||
| ############# | ||
| ## Project-specific files | ||
| ############# | ||
| compile_commands.json | ||
| .gdb_history | ||
|
|
||
| third-party/zlib/zconf.h | ||
| third-party/libjpeg/jconfig.h | ||
| third-party/libpng/pnglibconf.h | ||
| third-party/libtiff/tif_config.h | ||
|
|
||
| test/Core/tree.gv | ||
| test/FeatureDetectors/test.haraffkey | ||
| test/ImageProcessing/bench*.txt | ||
| test/Features/test_copy.* | ||
|
|
||
| test/Graphics/MARBIBM_write.TIF | ||
| test/Graphics/flower_write.png | ||
| test/Graphics/ksmall_write.jpg | ||
| .Rproj.user |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.