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.

Sign up for GitHub

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

Jump to bottom

WIP: Better matrix support #426

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
Open

WIP: Better matrix support #426

wants to merge 32 commits into from

Conversation

zbeekman
Copy link
Contributor

DO NOT MERGE THIS, WIP!

I just wanted to have a place to look at the diff and discuss implementation details while I work on wrapping this up.

Goals:

  • Natively read ragged edge 2D arrays into native array objects when appropriate
    • Integer kinds
    • Real kinds
    • more? (e.g., complex etc.)
  • Query by path and detect native object
  • Write out 2D native arrays as matrices
  • A mechanism for dealing with 3D arrays It's unclear how to implement this best, it may need to be client side in the application.

Thoughts @jacobwilliams & @porteri?

porteri and others added 27 commits August 13, 2018 22:27
@porteri
WIP: Interface for matrix calls
ac0c9a4
@porteri
WIP: matrix test
a94db82
@porteri
Can get 2d matrix and array of matrices
0b570b5
@porteri
Removed write statement
2e6c559
@porteri
Added ability to determine supplied array lengths
2d81c1b 
An optional argument was added that provides the # of values from the
json file for each row within the matrix. This allows the user to more
easily know if not all of the rows had the same number of columns.
@zbeekman
Print test output on failure with check target
8ac9898
@porteri
WIP: Found issue with new logic
80a1d1d
@porteri
Write format issue fix
1b60c8d
@zbeekman
Fix bad JSON in test
5e9cebb
@zbeekman
Merge branch 'master' into add_matrix_support
c1e5bd3
@zbeekman
Merge branch 'master' into add_matrix_support
2760dfb 
 - Update with latest upstream enhancements 6.9.0 --> 6.10.0
Fix for undefined variable in test#26
f4d7edc 
Fixes the undefined variable error_cnt for test jacobwilliams#26 when the json%validate returns a true is_valid statement.
@porteri
Merge pull request #2 from nrc-fuels/fix_failing_test
d0a9718 
Fix for undefined variable in test#26
Merge branch 'master' into add_matrix_support
d99c2ae
Merge fix
20f7059
@zbeekman
Merge branch 'master' of github.com:jacobwilliams/json-fortran into a…
34a446e 
…dd_matrix_support
@zbeekman
Only install module files, not config dir with IDE
0bf4831 
 - MSVS will install, e.g., `$<prefix>/include/Debug/json_file_module.mod`
 - We should strip the build config directory that IDEs like MSVS add when doing an installation
@zbeekman
Merge branch 'module_install_w_IDEs' of github.com:zbeekman/json-fort…
ce9c43b 
…ran into add_matrix_support
@zbeekman
Revert "Merge branch 'module_install_w_IDEs' of github.com:zbeekman/j…
f582c41 
…son-fortran into add_matrix_support"

This reverts commit ce9c43b, reversing
changes made to 34a446e.
@zbeekman
Merge branch 'module_install_w_IDEs' into add_matrix_support
cb0838d
@zbeekman
Add option to build and link against OpenCoarrays
d3de9dd
@zbeekman
Merge tag '7.1.0' of github.com:jacobwilliams/json-fortran into add_m…
1a478b7 
…atrix_support
@zbeekman
Move matrix test (40.f90) to 41.F90
414003e
@zbeekman
Testing: Use CTest fixtures to manipulate files
acf4659 
 - Fixes jacobwilliams#413
 - Use fixtures to delete old json outputs before re-running tests, then copy
   pristine inputs back into the build directory
@zbeekman
Merge branch 'master' of github.com:jacobwilliams/json-fortran into a…
64f1fea 
…dd_matrix_support
@zbeekman
Fix matrix test name clashes
2f4354b
@zbeekman
CMake: Remove extra instance of OC linking option
c80d070
@jacobwilliams jacobwilliams mentioned this pull request Jul 29, 2019
Open
zbeekman added 2 commits August 1, 2019 19:23
@zbeekman
Allow ragged edge matrices in matrix_infos
1c46747 
 - Add additional optional, intent out parameter, `is_uniform`
   - `.true.` for regular matrices
   - `.false.` for ragged edge matrices
 - The idea is to allow trailing zeros to be compressed/elided (eventually)
 - The `set_size` dummy argument was renamed to `mx_set_size` and records the
   largest column size, assuming __*row* major order__
@zbeekman
WIP: Transfering from laptop to work machine
0a12758
@JorgeG94
Copy link

this PR seems very out of date @jacobwilliams I need the functionality that this PR would provide, would I be better off implementing it from scratch following what is done here or should we bring this branch up to date with current main?

@jacobwilliams
Copy link
Owner

I haven't really had a chance to look at it, and don't really have time right now. If you (or anybody) want to take a look and let me know which you think would be best that would be great. Looks like a lot of work was done, it would be nice to get it merged in.

@JorgeG94
Copy link

JorgeG94 commented Feb 3, 2025

I haven't really had a chance to look at it, and don't really have time right now. If you (or anybody) want to take a look and let me know which you think would be best that would be great. Looks like a lot of work was done, it would be nice to get it merged in.

I have begun replicating it and adding the necessary things, I will probably open a PR soon :) no worries

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@zbeekman @JorgeG94 @jacobwilliams @porteri @dcolameco