-
Notifications
You must be signed in to change notification settings - Fork 10
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
Mods to support spectra file IO out of fortran #34
Draft
hbivens
wants to merge
103
commits into
master
Choose a base branch
from
issue/31-spectra-io-out-of-fortran
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 1 commit
Commits
Show all changes
103 commits
Select commit
Hold shift + click to select a range
ba53a82
Add install stuff and support for Finding Specutils in CMake
hbivens ab9e951
Merge branch 'master' into issue/31-spectra-io-out-of-fortran
wcjohns cc1b35f
remove install interface thing that doesn't seem to matter.
hbivens 0334e4d
fortran integration mods
hbivens aed541f
add extension that accesses a count at a given channel
hbivens aca0c47
make the *_at extensions 1-based, since calling from fortran
hbivens 4b8bdc9
enable testing at the topmost cmakefile
hbivens aefc329
cherry pick boost test removal
hbivens fd24efd
syntax highlighting getting confused
hbivens 17cc031
Make API a little easier
hbivens 48421d9
add round trip test
hbivens 0c59d47
use seconds precision
hbivens 8af3a3b
add deviation pairs to test
hbivens 358b706
check neutrons
hbivens c89674c
use vax string
hbivens 4aef394
Yeah!!! Figured out fortran array to c++ typemap.
hbivens fb679da
add a few more extensions and include filesystem stuff
hbivens 45bed0e
call correct method
hbivens c498e6d
trim the filename and add some error diagnostics
hbivens e6032bb
add realtime check
hbivens 738cd14
merge master
hbivens 6d8371f
Fix issue compiling with fast_float
wcjohns 80d3ce5
fix windows build error
hbivens 7f4a595
update wrapper
hbivens 2b03814
start some tests to map dev pairs
hbivens ae3c9a3
make strtod default
hbivens 31cb465
Merge remote-tracking branch 'origin/master' into issue/31-spectra-io…
hbivens af3631d
checkpoint
hbivens f39635e
pcf spectra file mods
hbivens 0e27b16
updates - add fortran round trip test
hbivens 62e653c
checkpoint
hbivens 46dbbc5
lose the pcf namespace
hbivens 936b7af
figured out deviation pairs
hbivens 48a3268
update fortran wrapper
hbivens 8d547a3
more dev pair mapping
hbivens 9b195e4
cherrypick Will's tag support
hbivens a96f242
merge master and fix conflicts
hbivens e0391ad
revert back to default
hbivens 854b836
update test to show Will
hbivens 431c65c
Fix issues with writing and reading deviation pairs to PCF files.
wcjohns 2f35d06
Make compiling the bindings optional (defaulting to off).
wcjohns e29f078
Promote measurement source and descriptions to be member variables of…
wcjohns 20c6e55
Remove PcfExtensions.
wcjohns 1b77e69
Fix compile issue.
wcjohns 882b503
Fix some function not always returning values in c-interface.
wcjohns a1e4396
Fix `SpecUtils_Measurement_set_start_time_str` not returning a value.
wcjohns 68babc7
update fortran bindings
hbivens 6a07a20
add ctest args
hbivens d6e44d7
rename this, I was getting compiler warning:
hbivens 74d4418
add debug print for CICD
hbivens 13bb819
mas debug
hbivens 0caf7ca
add index, size to exception message
hbivens 3981033
add size
hbivens cdc7ecd
add build script to aid in cicd debug
hbivens 0f58916
up minimum to avoid cmake warning
hbivens a80f9af
uri spectra causes fortran test to fail
hbivens 074926e
wrong line
hbivens 1047d13
First try at adding an automated release of shared libraries for windows
wcjohns 9c6163e
Merge branch 'issue/31-spectra-io-out-of-fortran' of github.com:sandi…
wcjohns 9451d07
Add package command to CMake, and bring out option for Windows runtim…
wcjohns fee1904
Merge branch 'issue/31-spectra-io-out-of-fortran' of github.com:sandi…
wcjohns 02c71ab
Merge branch 'master' into issue/31-spectra-io-out-of-fortran
wcjohns a22e940
Fix a few things up that I think got messed up during various merges.
wcjohns 61f3224
Maybe fix compile error on Windows
wcjohns 65621cb
Add another missing include
wcjohns 3018b0d
Add another missing include
wcjohns 2ce11ec
Ad UTF-8 BOM to test_utf8_limit_str_size.cpp
wcjohns dccb2e4
Update ci.yml to upload Windows artifact, maybe
wcjohns ee04054
Update ci.yml to upload Windows artifact, now a little closer maybe
wcjohns 5e97ccc
Update ci.yml to upload Windows artifact, try again
wcjohns 5408630
Update ci.yml to upload Windows artifact, try again
wcjohns 79d81cb
Update ci.yml to upload Windows artifact, try again
wcjohns ba26b47
Update ci.yml to upload Windows artifact, try again
wcjohns 03d8889
Minor change
wcjohns 960c637
Fix issue when converting to a VAX string.
wcjohns 6f55a3b
Debug windows automated build of shared libraries a bit
wcjohns 4e6c62b
Maybe fix syntax error in ci.yml
wcjohns 6310f65
Maybe fix syntax error in ci.yml
wcjohns caab293
Maybe fix syntax error in ci.yml
wcjohns 06fcc6e
Try to improve CI install targets
wcjohns 56d8b78
Debugging chany ci.yml
wcjohns 679bf4e
Remove trying to install export file
wcjohns 53b5039
Turn building C bindings on for CI build
wcjohns 160b5bd
Add exporting classes/structs/functions for Windows DLLs.
wcjohns 16643d3
Trye having CMake generate export header.
wcjohns 1359228
Fix missed export
wcjohns e3ffee4
Temporarily re-include `pcf_det_name_to_dev_pair_index` so fortran bi…
wcjohns 9adcc44
Fix infinite recursion
wcjohns 902074e
add script
hbivens bb9fb76
Merge remote-tracking branch 'origin/issue/31-spectra-io-out-of-fortr…
hbivens f1c5e48
add install
hbivens bf77e65
Turn off c-bindings
hbivens a93c8c8
add -fPic
hbivens 5b47ea2
Revert "Turn building C bindings on for CI build"
hbivens 301ee76
Revert "Add exporting classes/structs/functions for Windows DLLs."
hbivens ae11b15
update swig-gen
hbivens 7de1a45
Revert "Fix missed export"
hbivens 2cceea1
make it work
hbivens 874d8a5
keep the swig generated files in repo
hbivens cbfc685
update interface
hbivens 1cd879c
update test
hbivens 0e9ebde
Add method to update detector name
hbivens 9ca9f3c
cmake mods to enable valgrind memcheck with ctest
hbivens File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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 |
---|---|---|
@@ -0,0 +1,11 @@ | ||
@PACKAGE_INIT@ | ||
|
||
include(CMakeFindDependencyMacro) | ||
|
||
# Add any dependencies here, e.g., | ||
# find_dependency(SomeOtherLibrary) | ||
|
||
include("${CMAKE_CURRENT_LIST_DIR}/SpecUtilsTargets.cmake") | ||
|
||
set(SpecUtils_INCLUDE_DIRS "@PACKAGE_INCLUDE_INSTALL_DIR@") | ||
set(SpecUtils_LIBRARIES SpecUtils) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If
SpecUtils_FLT_PARSE_METHOD
is left as 'default_value' here, there is some logic below to hopefully pick the most reasonable float parsing method. Like for MSVC ≥2019, it should pick 'FromChars'.Is there is reason to default to the slowest common denominator, or was it giving you an issue?