Skip to content

Commit

Permalink
latest from CODA-OSS and NITRO
Browse files Browse the repository at this point in the history
  • Loading branch information
Dan Smith committed Oct 23, 2023
1 parent 09058c9 commit afb8300
Show file tree
Hide file tree
Showing 8 changed files with 107 additions and 154 deletions.
78 changes: 29 additions & 49 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -7,62 +7,35 @@ CMakeLists.txt text eol=lf

# Modern tools on Windows can handle Linux LF
# See https://stackoverflow.com/a/13154031/8877 for details
* text=auto eol=lf
.git?* text
* text=auto eol=lf
*.* text=auto eol=lf
.git?* text=auto eol=lf

# Leave known Windows-only text files as CR/LF
*.sln text eol=crlf
*.vcxproj text eol=crlf
*.vcxproj.filters text eol=crlf
*.ruleset text eol=crlf

# Text file formats
*.txt text eol=lf
*.text text eol=lf
*.md text eol=lf
*.tex text eol=lf
*.?ml text eol=lf
*.kmz binary
*.log text eol=lf

# Programming languages
*.htm? text eol=lf
*.css text eol=lf
*.c text eol=lf
*.cc text eol=lf
*.c?? text eol=lf
*.c??m text eol=lf
*.ccm text eol=lf
*.C text eol=lf
*.h?? text eol=lf
*.h text eol=lf
*.hh text eol=lf
*.ixx text eol=lf
*.mpp text eol=lf
*.py text eol=lf
*.pyc binary
# .f and .f90
*.f* text eol=lf
*.m text eol=lf
*.java text eol=lf
*.cs text eol=lf
*.vb text eol=lf
*.js text eol=lf
*.ts text eol=lf
*.pl text eol=lf
*.sh text eol=lf
*.csh text eol=lf
*.sln text eol=crlf
*.dsw text eol=crlf
*.dsp text eol=crlf
*.vcproj text eol=crlf
*.vcxproj text eol=crlf
*.vcxproj.filters text eol=crlf
*.ruleset text eol=crlf
*.bat text eol=crlf

######################
# Known binary files

# Python builds with WAF
waf binary

# executables, libraries; yes, sometimes they're part of a repository
*.exe binary
*.out binary
lib*.so* binary
*.dll binary
lib*.a* binary
*.lib binary
*.mex binary
*.pyc binary

# from various unit_test/ directories
*.dat binary
Expand All @@ -82,9 +55,10 @@ lib*.a* binary
*.jpeg binary
*.png binary
# SVG images are XML
*.svg text eol=lf
*.svg text
*.raw binary
*.hei* binary
*.hei? binary
*.kmz binary

# music
*.mp3 binary
Expand All @@ -101,15 +75,21 @@ lib*.a* binary
# documents
*.pdf binary
*.dvi binary
*.doc* binary
*.xls* binary
*.ppt* binary
*.doc binary
*.docx binary
*.xls binary
*.xlsx binary
*.ppt binary
*.pptx binary

# SAR
*.h5 binary
*.sio binary
*.hdr binary
*.ntf binary
*.nitf binary
*.si?d binary
*.sidd binary
*.sicd? binary

# containers
*.zip binary
Expand Down
78 changes: 29 additions & 49 deletions externals/coda-oss/.gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -7,62 +7,35 @@ CMakeLists.txt text eol=lf

# Modern tools on Windows can handle Linux LF
# See https://stackoverflow.com/a/13154031/8877 for details
* text=auto eol=lf
.git?* text
* text=auto eol=lf
*.* text=auto eol=lf
.git?* text=auto eol=lf

# Leave known Windows-only text files as CR/LF
*.sln text eol=crlf
*.vcxproj text eol=crlf
*.vcxproj.filters text eol=crlf
*.ruleset text eol=crlf

# Text file formats
*.txt text eol=lf
*.text text eol=lf
*.md text eol=lf
*.tex text eol=lf
*.?ml text eol=lf
*.kmz binary
*.log text eol=lf

# Programming languages
*.htm? text eol=lf
*.css text eol=lf
*.c text eol=lf
*.cc text eol=lf
*.c?? text eol=lf
*.c??m text eol=lf
*.ccm text eol=lf
*.C text eol=lf
*.h?? text eol=lf
*.h text eol=lf
*.hh text eol=lf
*.ixx text eol=lf
*.mpp text eol=lf
*.py text eol=lf
*.pyc binary
# .f and .f90
*.f* text eol=lf
*.m text eol=lf
*.java text eol=lf
*.cs text eol=lf
*.vb text eol=lf
*.js text eol=lf
*.ts text eol=lf
*.pl text eol=lf
*.sh text eol=lf
*.csh text eol=lf
*.sln text eol=crlf
*.dsw text eol=crlf
*.dsp text eol=crlf
*.vcproj text eol=crlf
*.vcxproj text eol=crlf
*.vcxproj.filters text eol=crlf
*.ruleset text eol=crlf
*.bat text eol=crlf

######################
# Known binary files

# Python builds with WAF
waf binary

# executables, libraries; yes, sometimes they're part of a repository
*.exe binary
*.out binary
lib*.so* binary
*.dll binary
lib*.a* binary
*.lib binary
*.mex binary
*.pyc binary

# from various unit_test/ directories
*.dat binary
Expand All @@ -82,9 +55,10 @@ lib*.a* binary
*.jpeg binary
*.png binary
# SVG images are XML
*.svg text eol=lf
*.svg text
*.raw binary
*.hei* binary
*.hei? binary
*.kmz binary

# music
*.mp3 binary
Expand All @@ -101,15 +75,21 @@ lib*.a* binary
# documents
*.pdf binary
*.dvi binary
*.doc* binary
*.xls* binary
*.ppt* binary
*.doc binary
*.docx binary
*.xls binary
*.xlsx binary
*.ppt binary
*.pptx binary

# SAR
*.h5 binary
*.sio binary
*.hdr binary
*.ntf binary
*.nitf binary
*.si?d binary
*.sidd binary
*.sicd? binary

# containers
*.zip binary
Expand Down
10 changes: 9 additions & 1 deletion externals/coda-oss/ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
# coda-oss Release Notes

## [Release 2023-10-23](https://github.com/mdaus/coda-oss/releases/tag/2023-10-23)
* Tweaked **.gitattributes**.
* Removed *str::EncodedStringView*; made *str* conversion routines more consistent.
* *FmtX()* uses overloads rather than C-style varargs.
* Add [`std::ssize()`](https://en.cppreference.com/w/cpp/iterator/size).
* `ENABLE_AVX2` and `ENABLE_AVX512F` flags for CMake builds.
* Build cleanly with ASAN.

## [Release 2023-08-18](https://github.com/mdaus/coda-oss/releases/tag/2023-08-18)
* New `sys::OS::getSIMDInstructionSet()` utility routine; SSE2 is required (default with 64-bit builds).
* `types::ComplexInteger` to work-around `std::complex<short>` no longer being [valid C++](https://en.cppreference.com/w/cpp/numeric/complex).
* Another round of reducing various compiler warnings (of note: `NULL` -> `nullptr`).
* Some suport for [`std::numbers`](https://en.cppreference.com/w/cpp/header/numbers) from C++20.
* Some support for [`std::numbers`](https://en.cppreference.com/w/cpp/header/numbers) from C++20.
* Update to [HighFive 2.7.1](https://github.com/BlueBrain/HighFive/releases/tag/v2.7.1).
* Update to [e2fsprogs 1.47.0](https://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.47.0).
* Update to [xerces-c 3.2.4](https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12350542&styleName=Text&projectId=10510).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@ static_assert(CODA_OSS_MAKE_VERSION_MMPB(9999, 9999, 9999, 9999) <= UINT64_MAX,

// Do this ala C++ ... we don't currently have major/minor/patch
//#define CODA_OSS_VERSION_ 20210910L // c.f. __cplusplus
#define CODA_OSS_VERSION_ 2023 ## 0008 ## 0018 ## 0000 ## L
#define CODA_OSS_VERSION_ 2023 ## 0010 ## 0023 ## 0000 ## L

// Use the same macros other projects might want to use; overkill for us.
#define CODA_OSS_VERSION_MAJOR 2023
#define CODA_OSS_VERSION_MINOR 8
#define CODA_OSS_VERSION_PATCH 18 // a.k.a. "point," but too similar to "patch."
#define CODA_OSS_VERSION_MINOR 10
#define CODA_OSS_VERSION_PATCH 23 // a.k.a. "point," but too similar to "patch."
#define CODA_OSS_VERSION_BUILD 0 // a.k.a. "patch," but too similar to "point."
#define CODA_OSS_VERSION CODA_OSS_MAKE_VERSION_MMPB(CODA_OSS_VERSION_MAJOR, CODA_OSS_VERSION_MINOR, CODA_OSS_VERSION_PATCH, CODA_OSS_VERSION_BUILD)

Expand Down
78 changes: 29 additions & 49 deletions externals/nitro/.gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -7,62 +7,35 @@ CMakeLists.txt text eol=lf

# Modern tools on Windows can handle Linux LF
# See https://stackoverflow.com/a/13154031/8877 for details
* text=auto eol=lf
.git?* text
* text=auto eol=lf
*.* text=auto eol=lf
.git?* text=auto eol=lf

# Leave known Windows-only text files as CR/LF
*.sln text eol=crlf
*.vcxproj text eol=crlf
*.vcxproj.filters text eol=crlf
*.ruleset text eol=crlf

# Text file formats
*.txt text eol=lf
*.text text eol=lf
*.md text eol=lf
*.tex text eol=lf
*.?ml text eol=lf
*.kmz binary
*.log text eol=lf

# Programming languages
*.htm? text eol=lf
*.css text eol=lf
*.c text eol=lf
*.cc text eol=lf
*.c?? text eol=lf
*.c??m text eol=lf
*.ccm text eol=lf
*.C text eol=lf
*.h?? text eol=lf
*.h text eol=lf
*.hh text eol=lf
*.ixx text eol=lf
*.mpp text eol=lf
*.py text eol=lf
*.pyc binary
# .f and .f90
*.f* text eol=lf
*.m text eol=lf
*.java text eol=lf
*.cs text eol=lf
*.vb text eol=lf
*.js text eol=lf
*.ts text eol=lf
*.pl text eol=lf
*.sh text eol=lf
*.csh text eol=lf
*.sln text eol=crlf
*.dsw text eol=crlf
*.dsp text eol=crlf
*.vcproj text eol=crlf
*.vcxproj text eol=crlf
*.vcxproj.filters text eol=crlf
*.ruleset text eol=crlf
*.bat text eol=crlf

######################
# Known binary files

# Python builds with WAF
waf binary

# executables, libraries; yes, sometimes they're part of a repository
*.exe binary
*.out binary
lib*.so* binary
*.dll binary
lib*.a* binary
*.lib binary
*.mex binary
*.pyc binary

# from various unit_test/ directories
*.dat binary
Expand All @@ -82,9 +55,10 @@ lib*.a* binary
*.jpeg binary
*.png binary
# SVG images are XML
*.svg text eol=lf
*.svg text
*.raw binary
*.hei* binary
*.hei? binary
*.kmz binary

# music
*.mp3 binary
Expand All @@ -101,15 +75,21 @@ lib*.a* binary
# documents
*.pdf binary
*.dvi binary
*.doc* binary
*.xls* binary
*.ppt* binary
*.doc binary
*.docx binary
*.xls binary
*.xlsx binary
*.ppt binary
*.pptx binary

# SAR
*.h5 binary
*.sio binary
*.hdr binary
*.ntf binary
*.nitf binary
*.si?d binary
*.sidd binary
*.sicd? binary

# containers
*.zip binary
Expand Down
Loading

0 comments on commit afb8300

Please sign in to comment.